From c91112cb7570e31a3757973ba65e518f49ff9f02 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Wed, 8 Sep 2021 18:12:52 +0200 Subject: [PATCH] Workaround helm template bug when testing for APIVersions (#1533) Signed-off-by: Mathieu Parent Co-authored-by: Rita Zhang --- cmd/build/helmify/main.go | 2 +- .../gatekeeper-controller-manager-poddisruptionbudget.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/build/helmify/main.go b/cmd/build/helmify/main.go index b78053a492e..9726002eba5 100644 --- 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/manifest_staging/charts/gatekeeper/templates/gatekeeper-controller-manager-poddisruptionbudget.yaml b/manifest_staging/charts/gatekeeper/templates/gatekeeper-controller-manager-poddisruptionbudget.yaml index 4bece56bf53..53e564a74d8 100644 --- a/manifest_staging/charts/gatekeeper/templates/gatekeeper-controller-manager-poddisruptionbudget.yaml +++ b/manifest_staging/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