Update quickstarts to configure provider outside cluster modules

kbst · Jun 26, 2022 · 66873b2 · 66873b2
1 parent 00f1985
commit 66873b2
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 16 deletions.
diff --git a/quickstart/src/configurations/eks/eks_zero_cluster.tf b/quickstart/src/configurations/eks/eks_zero_cluster.tf
@@ -1,6 +1,7 @@
 module "eks_zero" {
   providers = {
-    aws = aws.eks_zero
+    aws        = aws.eks_zero
+    kubernetes = kubernetes.eks_zero
   }
 
   source = "github.com/kbst/terraform-kubestack//aws/cluster?ref={{version}}"

diff --git a/quickstart/src/configurations/eks/eks_zero_providers.tf b/quickstart/src/configurations/eks/eks_zero_providers.tf
@@ -21,10 +21,5 @@ provider "kubernetes" {
 
   host                   = local.eks_zero_kubeconfig["clusters"][0]["cluster"]["server"]
   cluster_ca_certificate = base64decode(local.eks_zero_kubeconfig["clusters"][0]["cluster"]["certificate-authority-data"])
-
-  exec {
-    api_version = local.eks_zero_kubeconfig["users"][0]["user"]["exec"]["apiVersion"]
-    args        = local.eks_zero_kubeconfig["users"][0]["user"]["exec"]["args"]
-    command     = local.eks_zero_kubeconfig["users"][0]["user"]["exec"]["command"]
-  }
+  token                  = local.eks_zero_kubeconfig["users"][0]["user"]["token"]
 }
diff --git a/quickstart/src/configurations/gke/gke_zero_cluster.tf b/quickstart/src/configurations/gke/gke_zero_cluster.tf
@@ -1,4 +1,8 @@
 module "gke_zero" {
+  providers = {
+    kubernetes = kubernetes.gke_zero
+  }
+
   source = "github.com/kbst/terraform-kubestack//google/cluster?ref={{version}}"
 
   configuration = {
@@ -20,7 +24,7 @@ module "gke_zero" {
       base_domain = ""
 
       # Initial desired K8s version, will be upgraded automatically
-      cluster_min_master_version = "1.16"
+      cluster_min_master_version = "1.22"
 
       # Initial number of desired nodes per zone
       cluster_initial_node_count = 1

diff --git a/quickstart/src/configurations/gke/gke_zero_providers.tf b/quickstart/src/configurations/gke/gke_zero_providers.tf
@@ -2,3 +2,15 @@ provider "kustomization" {
   alias          = "gke_zero"
   kubeconfig_raw = module.gke_zero.kubeconfig
 }
+
+locals {
+  gke_zero_kubeconfig = yamldecode(module.gke_zero.kubeconfig)
+}
+
+provider "kubernetes" {
+  alias = "gke_zero"
+
+  host                   = local.gke_zero_kubeconfig["clusters"][0]["cluster"]["server"]
+  cluster_ca_certificate = base64decode(local.gke_zero_kubeconfig["clusters"][0]["cluster"]["certificate-authority-data"])
+  token                  = local.gke_zero_kubeconfig["users"][0]["user"]["token"]
+}
diff --git a/quickstart/src/configurations/multi-cloud/eks_zero_cluster.tf b/quickstart/src/configurations/multi-cloud/eks_zero_cluster.tf
@@ -1,6 +1,7 @@
 module "eks_zero" {
   providers = {
-    aws = aws.eks_zero
+    aws        = aws.eks_zero
+    kubernetes = kubernetes.eks_zero
   }
 
   source = "github.com/kbst/terraform-kubestack//aws/cluster?ref={{version}}"

diff --git a/quickstart/src/configurations/multi-cloud/eks_zero_providers.tf b/quickstart/src/configurations/multi-cloud/eks_zero_providers.tf
@@ -22,10 +22,5 @@ provider "kubernetes" {
 
   host                   = local.eks_zero_kubeconfig["clusters"][0]["cluster"]["server"]
   cluster_ca_certificate = base64decode(local.eks_zero_kubeconfig["clusters"][0]["cluster"]["certificate-authority-data"])
-
-  exec {
-    api_version = local.eks_zero_kubeconfig["users"][0]["user"]["exec"]["apiVersion"]
-    args        = local.eks_zero_kubeconfig["users"][0]["user"]["exec"]["args"]
-    command     = local.eks_zero_kubeconfig["users"][0]["user"]["exec"]["command"]
-  }
+  token                  = local.eks_zero_kubeconfig["users"][0]["user"]["token"]
 }
diff --git a/quickstart/src/configurations/multi-cloud/gke_zero_cluster.tf b/quickstart/src/configurations/multi-cloud/gke_zero_cluster.tf
@@ -1,4 +1,8 @@
 module "gke_zero" {
+  providers = {
+    kubernetes = kubernetes.eks_zero
+  }
+
   source = "github.com/kbst/terraform-kubestack//google/cluster?ref={{version}}"
 
   configuration = {
@@ -20,7 +24,7 @@ module "gke_zero" {
       base_domain = ""
 
       # Initial desired K8s version, will be upgraded automatically
-      cluster_min_master_version = "1.15"
+      cluster_min_master_version = "1.22"
 
       # Initial number of desired nodes per zone
       cluster_initial_node_count = 1

diff --git a/quickstart/src/configurations/multi-cloud/gke_zero_providers.tf b/quickstart/src/configurations/multi-cloud/gke_zero_providers.tf
@@ -2,3 +2,15 @@ provider "kustomization" {
   alias          = "gke_zero"
   kubeconfig_raw = module.gke_zero.kubeconfig
 }
+
+locals {
+  gke_zero_kubeconfig = yamldecode(module.gke_zero.kubeconfig)
+}
+
+provider "kubernetes" {
+  alias = "gke_zero"
+
+  host                   = local.gke_zero_kubeconfig["clusters"][0]["cluster"]["server"]
+  cluster_ca_certificate = base64decode(local.gke_zero_kubeconfig["clusters"][0]["cluster"]["certificate-authority-data"])
+  token                  = local.gke_zero_kubeconfig["users"][0]["user"]["token"]
+}