From f14be6e8ebfa77db9d513b2a0a0decde51a03660 Mon Sep 17 00:00:00 2001
From: badra001 <donald.e.badrak.ii@census.gov>
Date: Fri, 3 Jan 2025 10:21:18 -0500
Subject: [PATCH] rmeove cert-manager-ctl, add cert-manager-startupapicheck and
 update cert-manager helm

---
 examples/full-cluster-tf-upgrade/1.31/charts.yml     |  3 ++-
 .../1.31/common-services/main.tf                     |  4 ++--
 examples/full-cluster-tf-upgrade/1.31/images.yml     | 12 +++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/examples/full-cluster-tf-upgrade/1.31/charts.yml b/examples/full-cluster-tf-upgrade/1.31/charts.yml
index d5ea7ac..999e9e6 100644
--- a/examples/full-cluster-tf-upgrade/1.31/charts.yml
+++ b/examples/full-cluster-tf-upgrade/1.31/charts.yml
@@ -13,6 +13,7 @@ cert-manager:
 metrics-server:
   documentation: "https://artifacthub.io/packages/helm/bitnami/metrics-server"
   name: "metrics-server"
-  repository: "https://charts.bitnami.com/bitnami"
+#  repository: "https://charts.bitnami.com/bitnami"
+  repository: "oci://registry-1.docker.io/bitnamicharts"
   version: "7.3.0"
   use_remote: true
diff --git a/examples/full-cluster-tf-upgrade/1.31/common-services/main.tf b/examples/full-cluster-tf-upgrade/1.31/common-services/main.tf
index 708ae3d..085983a 100644
--- a/examples/full-cluster-tf-upgrade/1.31/common-services/main.tf
+++ b/examples/full-cluster-tf-upgrade/1.31/common-services/main.tf
@@ -166,11 +166,11 @@ resource "helm_release" "cert-manager" {
   #  }
   set {
     name  = "startupapicheck.image.repository"
-    value = split(":", local.image_output["cert-manager-ctl"].dest_full_path)[0]
+    value = split(":", local.image_output["cert-manager-startupapicheck"].dest_full_path)[0]
   }
   set {
     name  = "startupapicheck.image.tag"
-    value = local.image_output["cert-manager-ctl"].tag
+    value = local.image_output["cert-manager-startupapicheck"].tag
   }
 
   #  timeout = 180
diff --git a/examples/full-cluster-tf-upgrade/1.31/images.yml b/examples/full-cluster-tf-upgrade/1.31/images.yml
index c70ba26..55574a6 100644
--- a/examples/full-cluster-tf-upgrade/1.31/images.yml
+++ b/examples/full-cluster-tf-upgrade/1.31/images.yml
@@ -46,9 +46,19 @@ cert-manager-ctl:
   source_registry: "quay.io"
   source_image: "jetstack/cert-manager-ctl"
   source_tag: null
-  enabled: true
+  enabled: false
 #  tag: "v1.16.2"
   tag: "v1.14.7"
+cert-manager-startupapicheck:
+  documentation: "https://cert-manager.io/docs/releases/"
+  name: "cert-manager-startupapicheck"
+  image: "quay.io/jetstack/cert-manager-startupapicheck"
+  dest_path: null
+  source_registry: "quay.io"
+  source_image: "jetstack/cert-manager-startupapicheck"
+  source_tag: null
+  enabled: true
+  tag: "v1.16.2"
 metrics-server:
   documentation: "https://hub.docker.com/r/bitnami/metrics-server/tags"
   name: "metrics-server"