You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by my...@apache.org on 2020/11/10 07:06:48 UTC
[incubator-datalab] 01/01: [DLAB-2102]: GKE, Google, Helm,
k8s versions specified
This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DATALAB-k8s-GKE
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit f4a97c85fd11131f4d5a66be5c55b2fd48a86ec6
Author: bodnarmykola <bo...@gmail.com>
AuthorDate: Tue Nov 10 09:06:17 2020 +0200
[DLAB-2102]: GKE, Google, Helm, k8s versions specified
---
infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf | 1 +
.../terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf | 2 ++
infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
index 6521774..5d8ed9b 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/main.tf
@@ -20,6 +20,7 @@
# ******************************************************************************
provider "google" {
+ version = "3.3.0"
credentials = file(var.credentials_file_path)
project = var.project_id
region = var.region
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
index 555dc53..878ea36 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/modules/helm_charts/main.tf
@@ -28,6 +28,7 @@ data "google_container_cluster" "ssn_k8s_gke_cluster" {
data "google_client_config" "current" {}
provider "helm" {
+ version = "0.10"
kubernetes {
host = data.google_container_cluster.ssn_k8s_gke_cluster.endpoint
@@ -41,6 +42,7 @@ provider "helm" {
}
provider "kubernetes" {
+ version = "1.10.0"
host = data.google_container_cluster.ssn_k8s_gke_cluster.endpoint
client_certificate = base64decode(data.google_container_cluster.ssn_k8s_gke_cluster.master_auth.0.client_certificate)
diff --git a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
index bc56f53..81dbed8 100644
--- a/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
+++ b/infrastructure-provisioning/terraform/gcp/ssn-gke/main/variables.tf
@@ -64,7 +64,7 @@ variable "ssn_k8s_workers_count" {
}
variable "gke_cluster_version" {
- default = "1.14.8-gke.12"
+ default = "1.14.10-gke.50"
}
// Couldn't assign in GCP
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org