Merge branch 'master' of github.e.it.census.gov:terraform-modules/aws…

…-eks
terraform-modules · Aug 10, 2022 · d92a36b · d92a36b
2 parents b58b56f + 9a5e5db
commit d92a36b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/examples/full-cluster/common-services/copy_images.tf b/examples/full-cluster/common-services/copy_images.tf
@@ -72,6 +72,10 @@ locals {
 
 resource "null_resource" "copy_images" {
   for_each = { for image in local.images : image.name => image if image.enabled }
+  triggers = {
+    name = each.key
+    image = format("%v:%v",each.value.image,each.value.tag)
+  }
 
   provisioner "local-exec" {
     command = "${path.module}/copy_image.sh"

diff --git a/examples/full-cluster/common-services/main.tf b/examples/full-cluster/common-services/main.tf
@@ -10,7 +10,8 @@ locals {
     "metrics-server" = {
       name       = "metrics-server"
       repository = "https://charts.bitnami.com/bitnami"
-      version    = "5.10.4"
+#      version    = "5.10.4"
+      version    = "5.11.9"
       use_remote = true
     }
     # a standard chart that is downloaded as part of the istio-bundle.  It's not
@@ -83,7 +84,7 @@ resource "helm_release" "metrics-server" {
     value = var.metrics_server_tag
   }
 
-  timeout = 180
+  timeout = 300
 }
 
 resource "helm_release" "cluster-autoscaler" {

diff --git a/examples/full-cluster/common-services/variables.common-services.auto.tfvars b/examples/full-cluster/common-services/variables.common-services.auto.tfvars
@@ -0,0 +1,25 @@
+cert_manager_cainjector_tag    = "v1.4.3"
+cert_manager_controller_tag    = "v1.4.3"
+cert_manager_webhook_tag       = "v1.4.3"
+cluster_autoscaler_tag         = "v1.21.0"
+istio_tag                      = "1.10.1"
+metrics_server_tag             = "0.6.1-debian-11-r9"
+tls_crt_b64                    = ""
+tls_crt_contents               = ""
+tls_crt_file                   = ""
+tls_key_b64                    = ""
+tls_key_contents               = ""
+tls_key_file                   = ""
+vault_approle_role_id          = ""
+vault_approle_role_path        = ""
+vault_approle_secret_id        = ""
+vault_authentication           = ""
+vault_ca_bundle_pem            = ""
+vault_ca_bundle_pem_b64        = ""
+vault_ca_bundle_pem_file       = ""
+vault_path                     = ""
+vault_serviceaccount_mountpath = ""
+vault_serviceaccount_role      = ""
+vault_serviceaccount_sa        = ""
+vault_token                    = ""
+vault_url                      = ""