From b84c1a7bfc24756304b400cd955241288913ce5d Mon Sep 17 00:00:00 2001 From: Todd Baert Date: Wed, 5 Jun 2024 17:19:17 -0400 Subject: [PATCH] fixup: use ___ instead of -- Signed-off-by: Todd Baert --- .github/scripts/strip-kustomize-helm.sh | 12 ++++++------ config/overlays/helm/manager.yaml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/scripts/strip-kustomize-helm.sh b/.github/scripts/strip-kustomize-helm.sh index dc69fc0b2..7647a83f0 100755 --- a/.github/scripts/strip-kustomize-helm.sh +++ b/.github/scripts/strip-kustomize-helm.sh @@ -2,17 +2,17 @@ # This script is a hack to support helm flow control in kustomize overlays, which would otherwise break them. # It allows us to render helm template bindings and add newlines. -# For instance, it transforms "__{{ .Value.myValue }}__" to {{ .Value.myValue }}. -# It also adds newlines wherever __newline__ is found. +# For instance, it transforms "___{{ .Value.myValue }}___" to {{ .Value.myValue }}. +# It also adds newlines wherever ___newline___ is found. CHARTS_DIR='./chart/open-feature-operator/templates'; echo 'Running strip-kustomize-helm.sh script' filenames=`find $CHARTS_DIR -name "*.yaml"` for file in $filenames; do - sed -i "s/__newline__/\\n/g" $file - sed -i "s/\"__//g" $file - sed -i "s/__\"//g" $file - sed -i "s/__//g" $file + sed -i "s/___newline___/\\n/g" $file + sed -i "s/\"___//g" $file + sed -i "s/___\"//g" $file + sed -i "s/___//g" $file done echo 'Done running strip-kustomize-helm.sh script' \ No newline at end of file diff --git a/config/overlays/helm/manager.yaml b/config/overlays/helm/manager.yaml index f7d80549d..ee92bbbd0 100644 --- a/config/overlays/helm/manager.yaml +++ b/config/overlays/helm/manager.yaml @@ -8,7 +8,7 @@ spec: template: spec: # this is transformed by .github/scripts/strip-kustomize-helm.sh - __imagePullSecrets__: "__ __newline__{{ toYaml .Values.imagePullSecrets | indent 8 }}__" + ___imagePullSecrets___: "___ ___newline___{{ toYaml .Values.imagePullSecrets | indent 8 }}___" containers: - name: manager image: "{{ .Values.controllerManager.manager.image.repository }}:{{ .Values.controllerManager.manager.image.tag }}"