From 7a35938c88c2cba6124c9865184e366a204f2800 Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Wed, 20 Apr 2022 16:29:03 -0400
Subject: [PATCH] update some files

---
 .../sample-istio/copy_images.tf                      |  3 ++-
 .../sample-istio/main.tf                             |  2 +-
 .../full-cluster/common-services/README.certs.md     |  5 -----
 examples/full-cluster/common-services/tf-run.data    | 12 ++----------
 .../irsa-roles/variables.irsa.auto.tfvars            |  1 +
 5 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 examples/full-cluster/common-services/README.certs.md

diff --git a/examples/established-cluster-examples/sample-istio/copy_images.tf b/examples/established-cluster-examples/sample-istio/copy_images.tf
index 7bfa0df..79d9558 100644
--- a/examples/established-cluster-examples/sample-istio/copy_images.tf
+++ b/examples/established-cluster-examples/sample-istio/copy_images.tf
@@ -11,9 +11,10 @@ locals {
     {
       name  = "nginx"
       full_name  = "nginx/nginx"
-#      image = "public.ecr.aws/nginx/nginx"
+      image = "public.ecr.aws/nginx/nginx"
 #      tag   = var.nginx_tag
       tag   = "1.21"
+      enabled = true
     },
   ]
   image_repos = { for image in local.images : image.name => format("%v/%v", local.account_ecr, image.name) }
diff --git a/examples/established-cluster-examples/sample-istio/main.tf b/examples/established-cluster-examples/sample-istio/main.tf
index 947f0f3..b1baccb 100644
--- a/examples/established-cluster-examples/sample-istio/main.tf
+++ b/examples/established-cluster-examples/sample-istio/main.tf
@@ -44,6 +44,6 @@ resource "helm_release" "app" {
   }
   set {
     name  = "istio.publicDomain"
-    value = local.domain
+    value = format("%v.%v",var.cluster_name,local.domain)
   }
 }
diff --git a/examples/full-cluster/common-services/README.certs.md b/examples/full-cluster/common-services/README.certs.md
deleted file mode 100644
index 14fb411..0000000
--- a/examples/full-cluster/common-services/README.certs.md
+++ /dev/null
@@ -1,5 +0,0 @@
-this is a special CA certificate
-
-command to sign the certificate:
-./sign-subordinate-ca-cert.sh pki.adsd-cumulus-dev.dev.dice.census.gov.csr "c=US,o=U.S. Census Bureau,OU=PKI,ou=EKS,ou=vpc2-dice-dev,ou=adsd-cumulus-dev,cn=pki.adsd-cumulus-dev.dev.dice.census.gov"  1825
-
diff --git a/examples/full-cluster/common-services/tf-run.data b/examples/full-cluster/common-services/tf-run.data
index d3cdac0..b5748b2 100644
--- a/examples/full-cluster/common-services/tf-run.data
+++ b/examples/full-cluster/common-services/tf-run.data
@@ -1,4 +1,4 @@
-VERSION 1.1.2
+VERSION 1.1.3
 REMOTE-STATE
 COMMAND tf-directory-setup.py -l none -f
 COMMAND setup-new-directory.sh
@@ -6,22 +6,14 @@ COMMAND tf-init -upgrade
 COMMAND ln -sf ../settings.auto.tfvars
 COMMAND ln -sf ../variables.vpc.auto.tfvars .
 COMMAND ln -sf ../variables.vpc.tf
-# tls_private_key.ca tls_cert_request.ca null_resource.ca_root_cert null_resource.ca_files
-# null_resource.ca_cert
-# local_file.ca_bundle_cert
 module.cert
 COMMAND tf-directory-setup.py -l s3
 
 COMMENT submit certs/*csr using command ouptut listed in apply to TCO for signing
-STOP once that is availabile, change cert_download to true
+STOP once that is available, change cert_download to true
 
-# COMMAND terraform taint null_resource.ca_cert
-# null_resource.ca_root_cert null_resource.ca_files null_resource.ca_cert
-# COMMENT second run is to complete the steps
-# null_resource.ca_root_cert null_resource.ca_files null_resource.ca_cert
 module.cert
 module.cert
-
 ALL
 
 COMMENT run: git-secret add certs/*.key; git-secret hide
diff --git a/examples/full-cluster/irsa-roles/variables.irsa.auto.tfvars b/examples/full-cluster/irsa-roles/variables.irsa.auto.tfvars
index 89c477f..66613f7 100644
--- a/examples/full-cluster/irsa-roles/variables.irsa.auto.tfvars
+++ b/examples/full-cluster/irsa-roles/variables.irsa.auto.tfvars
@@ -1,2 +1,3 @@
 name      = "unknown"
 namespace = "unknown"
+namespace_short = ""