fix health checks

Signed-off-by: Austin Abro <[email protected]>
zarf-dev · Sep 19, 2024 · d93eeda · d93eeda
1 parent 7be99b9
commit d93eeda
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 38 deletions.
diff --git a/src/internal/bigbang/bigbang.go b/src/internal/bigbang/bigbang.go
@@ -193,8 +193,8 @@ func Create(ctx context.Context, bbOpts Opts) error {
 		}
 
 		healthCheck := v1alpha1.NamespacedObjectKindReference{
-			APIVersion: "v1",
-			Kind:       "HelmRelease",
+			APIVersion: hr.typeMeta.APIVersion,
+			Kind:       hr.typeMeta.Kind,
 			Name:       hr.metadata.Name,
 			Namespace:  hr.metadata.Namespace,
 		}

diff --git a/src/internal/bigbang/testdata/create/default.yaml b/src/internal/bigbang/testdata/create/default.yaml
@@ -82,51 +82,51 @@ components:
       - cmd: ./zarf tools kubectl patch helmrelease -n bigbang bigbang --type=merge -p '{"spec":{"suspend":true}}'
         description: Suspend Big Bang HelmReleases to prevent reconciliation during removal.
   healthChecks:
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: grafana
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: istio
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: istio-operator
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: kiali
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: kyverno
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: kyverno-policies
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: kyverno-reporter
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: loki
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: monitoring
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: neuvector
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: promtail
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: tempo
diff --git a/src/internal/bigbang/testdata/create/not_airgap.yaml b/src/internal/bigbang/testdata/create/not_airgap.yaml
@@ -25,51 +25,51 @@ components:
       - cmd: ./zarf tools kubectl patch helmrelease -n bigbang bigbang --type=merge -p '{"spec":{"suspend":true}}'
         description: Suspend Big Bang HelmReleases to prevent reconciliation during removal.
   healthChecks:
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: grafana
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: istio
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: istio-operator
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: kiali
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: kyverno
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: kyverno-policies
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: kyverno-reporter
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: loki
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: monitoring
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: neuvector
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: promtail
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: tempo
diff --git a/src/internal/bigbang/testdata/create/skip_flux.yaml b/src/internal/bigbang/testdata/create/skip_flux.yaml
@@ -70,51 +70,51 @@ components:
       - cmd: ./zarf tools kubectl patch helmrelease -n bigbang bigbang --type=merge -p '{"spec":{"suspend":true}}'
         description: Suspend Big Bang HelmReleases to prevent reconciliation during removal.
   healthChecks:
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: grafana
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: istio
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: istio-operator
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: kiali
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: kyverno
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: kyverno-policies
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: kyverno-reporter
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: loki
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: monitoring
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: neuvector
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: promtail
-  - apiVersion: v1
+  - apiVersion: helm.toolkit.fluxcd.io/v2
     kind: HelmRelease
     namespace: bigbang
     name: tempo