fix(base-cluster): upgrade lookup functions to look for v2beta2

teutonet · Feb 27, 2024 · bc45db4 · bc45db4
1 parent f56e58f
commit bc45db4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/charts/base-cluster/templates/backup/migrations/velero-4-to-5.yaml b/charts/base-cluster/templates/backup/migrations/velero-4-to-5.yaml
@@ -1,4 +1,8 @@
+<<<<<<< Updated upstream
 {{- if and .Values.backup.backupStorageLocations (hasPrefix "4." (dig "spec" "chart" "spec" "version" "" (lookup "helm.toolkit.fluxcd.io/v2beta1" "HelmRelease" "backup" "velero"))) }}
+=======
+{{- if and .Values.backup.enabled (hasPrefix "4." (dig "spec" "chart" "spec" "version" "" (lookup "helm.toolkit.fluxcd.io/v2beta2" "HelmRelease" "backup" "velero"))) }}
+>>>>>>> Stashed changes
 apiVersion: batch/v1
 kind: Job
 metadata:

diff --git a/charts/base-cluster/templates/kyverno/validation.tpl b/charts/base-cluster/templates/kyverno/validation.tpl
@@ -1,4 +1,4 @@
-{{- $existingKyverno := lookup "helm.toolkit.fluxcd.io/v2beta1" "HelmRelease" "kyverno" "kyverno" -}}
+{{- $existingKyverno := lookup "helm.toolkit.fluxcd.io/v2beta2" "HelmRelease" "kyverno" "kyverno" -}}
 {{- $lastAttemptedRevision := dig "status" "lastAttemptedRevision" "" $existingKyverno }}
 {{- $lastAppliedRevision := dig "status" "lastAppliedRevision" "" $existingKyverno }}
 {{- if or $lastAppliedRevision $lastAttemptedRevision -}}