ading provider.tf and other minor updates

SCT-Engineering · Jun 26, 2024 · 359a5d8 · 359a5d8
1 parent 1968b8f
commit 359a5d8
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 9 deletions.
diff --git a/lab/us-gov-east-1/vpc/cluster/eks-cert-mgr-ns/cert-mgr.tf b/lab/us-gov-east-1/vpc/cluster/eks-cert-mgr-ns/cert-mgr.tf
@@ -34,25 +34,33 @@ resource "helm_release" "cert-manager" {
 
   set {
     name  = "image.repository"
-    value = module.images.images[local.cert_manager_control_key].dest_full_path
+    value = module.images.images[local.cert-manager_control_key].dest_repository
   }
   set {
     name  = "image.tag"
     value = var.cert_manager_controller_tag
   }
+  
+  set {
+    name  = "global.hub"
+    value = module.images.images[local.cert-manager-cainjector_key].dest_registry
+  }
 
   set {
-    name  = "cainjector.image.repository"
+    name  = "cainjector.image"
     value = module.images.images[local.cert-manager-cainjector_key].dest_full_path
   }
-  set {
+
+
+    set {
     name  = "cainjector.image.tag"
     value = var.cert_manager_cainjector_tag
   }
 
   set {
     name  = "webhook.image.repository"
-    value = module.images.images[local.cert-manager-webhook_key].dest_full_path
+    #value = module.images.images[local.cert-manager-webhook_key].dest_repository
+    value = "224384469011.dkr.ecr.us-gov-east-1.amazonaws.com/platform-eng-eks-test/jetstack/cert-manager-webhook"
   }
   set {
     name  = "webhook.image.tag"
@@ -61,12 +69,17 @@ resource "helm_release" "cert-manager" {
 
   set {
     name  = "startupapicheck.image.repository"
-    value = module.images.images[local.cert-manager-ctl_key].dest_full_path
+    #value = module.images.images[local.cert-manager-ctl_key].dest_repository
+    value = "224384469011.dkr.ecr.us-gov-east-1.amazonaws.com/platform-eng-eks-test/jetstack/cert-manager-ctl"
   }
   set {
     name  = "startupapicheck.image.tag"
     value = var.cert_manager_ctl_tag
   }
 
   timeout = 180
+}
+
+output "cert_manager_control_key" {
+   value = module.images.images[local.cert-manager-cainjector_key].dest_registry
 }
diff --git a/lab/us-gov-east-1/vpc/cluster/eks-cert-mgr-ns/copy_images.tf b/lab/us-gov-east-1/vpc/cluster/eks-cert-mgr-ns/copy_images.tf
@@ -3,10 +3,10 @@ data "aws_ecr_authorization_token" "token" {}
 
 
 locals {
-  cert_manager_control_key    = format("%v#%v", "cert-manager-controller", var.cert_manager_controller_tag)
-  cert-manager-cainjector_key = format("%v#%v", "cert-manager-cainjector", var.cert_manager_cainjector_tag)
-  cert-manager-webhook_key = format("%v#%v", "cert-manager-webhook", var.cert_manager_webhook_tag)
-  cert-manager-ctl_key = format("%v#%v", "cert-manager-ctl", var.cert_manager_ctl_tag)
+  cert-manager_control_key    = format("%v#%v", "jetstack/cert-manager-controller", var.cert_manager_controller_tag)
+  cert-manager-cainjector_key = format("%v#%v", "jetstack/cert-manager-cainjector", var.cert_manager_cainjector_tag)
+  cert-manager-webhook_key = format("%v#%v", "jetstack/cert-manager-webhook", var.cert_manager_webhook_tag)
+  cert-manager-ctl_key = format("%v#%v", "jetstack/cert-manager-ctl", var.cert_manager_ctl_tag)
 
   #account_id       = data.aws_caller_identity.current.account_id
   repo_parent_name = format("eks/%v", var.cluster_name)
@@ -71,4 +71,8 @@ module "images" {
   region = var.region
   ##  source_password      = ""
   ##  source_username      = ""
+}
+
+output "image-config-output" {
+  value = local.image_config
 }
diff --git a/lab/us-gov-east-1/vpc/cluster/eks-cert-mgr-ns/provider.tf b/lab/us-gov-east-1/vpc/cluster/eks-cert-mgr-ns/provider.tf
@@ -0,0 +1,16 @@
+provider "aws" {
+  region  = "us-gov-east-1"
+  profile = "224384469011-lab-dev-gov.inf-admin-t3"
+}
+
+provider "kubernetes" {
+  config_path    = "~/.kube/config"
+  config_context = "arn:aws-us-gov:eks:us-gov-east-1:224384469011:cluster/platform-eng-eks-test"
+}
+
+provider "helm" {
+  kubernetes {
+      config_path = "~/.kube/config"
+      config_context = "arn:aws-us-gov:eks:us-gov-east-1:224384469011:cluster/platform-eng-eks-test"
+    }
+}