fix

terraform-modules · Aug 10, 2023 · de2d4e0 · de2d4e0
1 parent 46b5cf1
commit de2d4e0
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 86 deletions.
diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/main.tf b/examples/full-cluster-tf-upgrade/1.25/common-services/main.tf
@@ -1,29 +1,3 @@
-locals {
-  charts = var.chart_details
-  ##   charts = {
-  ##     "cert-manager" = {
-  ##       name       = "cert-manager"
-  ##       repository = "https://charts.jetstack.io"
-  ##       version    = "v1.4.3"
-  ##       use_remote = true
-  ##     }
-  ## 
-  ##     "metrics-server" = {
-  ##       name       = "metrics-server"
-  ##       repository = "https://charts.bitnami.com/bitnami"
-  ##       version    = "6.2.6"
-  ##       use_remote = true
-  ##     }
-  ## 
-  ##     # a standard chart that is downloaded as part of the istio-bundle.  It's not
-  ##     # available standalone in a repository
-  ##     #  name       = "istio-operator"
-  ##     # these are all custom
-  ##     #  name       = "certificate-issuer"
-  ##     #  name       = "istio-profile"
-  ##   }
-}
-
 resource "kubernetes_namespace" "cert-manager" {
   metadata {
     name = "cert-manager"
@@ -96,7 +70,8 @@ resource "helm_release" "cluster-autoscaler" {
   name       = "cluster-autoscaler"
   namespace  = "kube-system"
   repository = "${path.module}/charts/"
-  depends_on = [null_resource.copy_images]
+  #  depends_on = [null_resource.copy_images]
+  depends_on = [module.images]
   set {
     name = "image.repository"
     #    value = local.image_repos["cluster-autoscaler"]
@@ -129,7 +104,8 @@ resource "helm_release" "cert-manager" {
   repository = local.charts["cert-manager"].use_remote ? local.charts["cert-manager"].repository : "${path.module}/charts"
   version    = local.charts["cert-manager"].use_remote ? local.charts["cert-manager"].version : null
 
-  depends_on = [null_resource.copy_images]
+  #  depends_on = [null_resource.copy_images]
+  depends_on = [module.images]
 
   set {
     name  = "installCRDs"
@@ -332,8 +308,9 @@ resource "helm_release" "istio-operator" {
   depends_on = [helm_release.cert-manager]
 
   set {
-    name  = "hub"
-    value = format("%v/%v", local.account_ecr, "istio")
+    name = "hub"
+    #    value = format("%v/%v", local.account_ecr, "istio")
+    value = format("%v/eks/%v/%v", local.image_output["istio"].dest_registry, var.cluster_name, "istio")
   }
   set {
     name = "tag"
@@ -369,8 +346,9 @@ resource "helm_release" "istio-profile" {
   depends_on = [helm_release.istio-operator, null_resource.certificate-issuers]
 
   set {
-    name  = "hub"
-    value = format("%v/%v", local.account_ecr, "istio")
+    name = "hub"
+    #    value = format("%v/%v", local.account_ecr, "istio")
+    value = format("%v/eks/%v/%v", local.image_output["istio"].dest_registry, var.cluster_name, "istio")
   }
   set {
     name  = "tag"

diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/tf-run.data b/examples/full-cluster-tf-upgrade/1.25/common-services/tf-run.data
@@ -1,4 +1,4 @@
-VERSION 1.4.1
+VERSION 1.4.2
 REMOTE-STATE
 COMMAND tf-directory-setup.py -l none -f
 COMMAND setup-new-directory.sh
@@ -29,6 +29,8 @@ LINK variables.vpc.auto.tfvars
 COMMAND tf-init 
 
 module.images
+
+TAG start-certificate
 module.cert
 COMMAND tf-directory-setup.py -l s3
 

diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars
@@ -2,7 +2,7 @@
 #cert_manager_controller_tag    = "v1.4.3"
 #cert_manager_webhook_tag       = "v1.4.3"
 #cluster_autoscaler_tag         = "v1.24.0"
-#istio_tag                      = "1.16.1"
+istio_tag = "1.16.1"
 #metrics_server_tag             = "0.6.2-debian-11-r9"
 tls_crt_b64                    = ""
 tls_crt_contents               = ""
@@ -24,18 +24,18 @@ vault_serviceaccount_sa        = ""
 vault_token                    = ""
 vault_url                      = ""
 
-chart_details = {
-  "cert-manager" = {
-    name       = "cert-manager"
-    repository = "https://charts.jetstack.io"
-    version    = "v1.12.2"
-    use_remote = true
-  }
-
-  "metrics-server" = {
-    name       = "metrics-server"
-    repository = "https://charts.bitnami.com/bitnami"
-    version    = "6.2.6"
-    use_remote = true
-  }
-}
+## chart_details = {
+##   "cert-manager" = {
+##     name       = "cert-manager"
+##     repository = "https://charts.jetstack.io"
+##     version    = "v1.12.2"
+##     use_remote = true
+##   }
+## 
+##   "metrics-server" = {
+##     name       = "metrics-server"
+##     repository = "https://charts.bitnami.com/bitnami"
+##     version    = "6.2.6"
+##     use_remote = true
+##   }
+## }
diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.tf b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.tf
@@ -206,29 +206,3 @@ variable "istio_tag" {
   type        = string
   default     = "1.10.1"
 }
-
-variable "chart_details" {
-  description = "Map of object with details about remote charts"
-  type = map(object(
-    {
-      name       = string
-      repository = string
-      version    = string
-      use_remote = bool
-  }))
-  default = {}
-}
-
-variable "image_details" {
-  description = "Map of object with details about images to obtain from external sources"
-  type = map(object(
-    {
-      name            = string
-      image           = string
-      source_registry = string
-      source_image    = string
-      source_tag      = string
-      enabled         = bool
-  }))
-  default = {}
-}
diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.images.auto.tfvars b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.images.auto.tfvars
@@ -5,7 +5,6 @@ chart_details = {
     version    = "v1.12.2"
     use_remote = true
   }
-
   "metrics-server" = {
     name       = "metrics-server"
     repository = "https://charts.bitnami.com/bitnami"
@@ -60,7 +59,7 @@ image_details = {
     image           = "docker.io/bitnami/metrics-server"
     dest_path       = null
     source_registry = "docker.io"
-    source_iamge    = "bitnami/metrics-server"
+    source_image    = "bitnami/metrics-server"
     source_tag      = null
     tag             = "0.6.2-debian-11-r9"
     enabled         = true
@@ -110,19 +109,19 @@ image_details = {
     image           = "docker.io/bitnami/prometheus"
     dest_path       = null
     source_registry = "docker.io"
-    source_mage     = "bitnami/prometheus"
+    source_image    = "bitnami/prometheus"
     source_tag      = null
     tag             = "2.28.1"
     enabled         = true
   }
   "alertmanager" = {
-    name           = "alertmanager"
-    image          = "docker.io/bitnami/alertmanager"
-    dest_path      = null
-    soure_registry = "docker.io"
-    soure_image    = "bitnami/alertmanager"
-    source_tag     = null
-    tag            = "0.22.2"
-    enabled        = true
+    name            = "alertmanager"
+    image           = "docker.io/bitnami/alertmanager"
+    dest_path       = null
+    source_registry = "docker.io"
+    source_image    = "bitnami/alertmanager"
+    source_tag      = null
+    tag             = "0.22.2"
+    enabled         = true
   }
 }