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 index 93d68e7..4174af2 100644 --- 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,52 +34,47 @@ resource "helm_release" "cert-manager" { set { name = "image.repository" - value = module.images.images[local.cert-manager_control_key].dest_repository + value = split(":", module.images.images[local.cert-manager_control_key].dest_full_path)[0] } + 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 + value = split(":", module.images.images[local.cert-manager_control_key].dest_full_path)[1] } set { - name = "cainjector.image" - value = module.images.images[local.cert-manager-cainjector_key].dest_full_path + name = "cainjector.image.repository" + #value = module.images.images[local.cert-manager-cainjector_key].dest_full_path + value = split(":", module.images.images[local.cert-manager-cainjector_key].dest_full_path)[0] } - - set { + set { name = "cainjector.image.tag" - value = var.cert_manager_cainjector_tag + value = split(":", module.images.images[local.cert-manager-cainjector_key].dest_full_path)[1] } set { name = "webhook.image.repository" - #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" + value = split(":", module.images.images[local.cert-manager-webhook_key].dest_full_path)[0] } + set { name = "webhook.image.tag" - value = var.cert_manager_webhook_tag + value = split(":", module.images.images[local.cert-manager-webhook_key].dest_full_path)[1] } set { name = "startupapicheck.image.repository" - #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" + value = split(":", module.images.images[local.cert-manager-ctl_key].dest_full_path)[0] } + set { name = "startupapicheck.image.tag" - value = var.cert_manager_ctl_tag + value = split(":", module.images.images[local.cert-manager-ctl_key].dest_full_path)[1] } - timeout = 180 } -output "cert_manager_control_key" { - value = module.images.images[local.cert-manager-cainjector_key].dest_registry -} \ No newline at end of file +# output "cert_manager_control_key" { +# value = module.images.images[local.cert-manager-cainjector_key].dest_registry +# } \ No newline at end of file