Workaround helm template bug when testing for APIVersions (#1533)

Signed-off-by: Mathieu Parent <math.parent@gmail.com> Co-authored-by: Rita Zhang <rita.z.zhang@gmail.com>
open-policy-agent · Sep 8, 2021 · c91112c · c91112c
1 parent 45fd0c4
commit c91112c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/build/helmify/main.go b/cmd/build/helmify/main.go
@@ -118,7 +118,7 @@ func (ks *kindSet) Write() error {
 			}
 
 			if name == "gatekeeper-controller-manager" && kind == "PodDisruptionBudget" {
-				obj = strings.Replace(obj, "apiVersion: policy/v1beta1", "{{- if .Capabilities.APIVersions.Has \"policy/v1\" }}\napiVersion: policy/v1\n{{ else }}\napiVersion: policy/v1beta1\n{{ end -}}", 1)
+				obj = strings.Replace(obj, "apiVersion: policy/v1beta1", "{{- if .Capabilities.APIVersions.Has \"policy/v1/PodDisruptionBudget\" }}\napiVersion: policy/v1\n{{ else }}\napiVersion: policy/v1beta1\n{{ end -}}", 1)
 			}
 
 			if err := os.WriteFile(destFile, []byte(obj), 0600); err != nil {

diff --git a/...taging/charts/gatekeeper/templates/gatekeeper-controller-manager-poddisruptionbudget.yaml b/...taging/charts/gatekeeper/templates/gatekeeper-controller-manager-poddisruptionbudget.yaml
@@ -1,4 +1,4 @@
-{{- if .Capabilities.APIVersions.Has "policy/v1" }}
+{{- if .Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" }}
 apiVersion: policy/v1
 {{ else }}
 apiVersion: policy/v1beta1