Browse Source

fix(charts): remove stale args guard in controller deployment (#6347)

Signed-off-by: Krisztián Kern <krisztian.kern@ericsson.com>
krisztian.kern 2 weeks ago
parent
commit
626207b3aa

+ 0 - 2
deploy/charts/external-secrets/templates/deployment.yaml

@@ -69,7 +69,6 @@ spec:
           {{- end }}
           image: {{ include "external-secrets.image" (dict "chartAppVersion" .Chart.AppVersion "image" .Values.image "context" .) | trim }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- if or (.Values.leaderElect) (.Values.scopedNamespace) (.Values.scopedRBAC) (.Values.processClusterStore) (.Values.processClusterExternalSecret) (.Values.processClusterPushSecret) (.Values.concurrent) (.Values.extraArgs) }}
           args:
           {{- if .Values.leaderElect }}
           - --enable-leader-election=true
@@ -129,7 +128,6 @@ spec:
           - --{{ $key }}
             {{- end }}
           {{- end }}
-          {{- end }}
           - --metrics-addr=:{{ .Values.metrics.listen.port }}
           - --loglevel={{ .Values.log.level }}
           - --zap-time-encoding={{ .Values.log.timeEncoding }}

+ 22 - 0
deploy/charts/external-secrets/tests/controller_test.yaml

@@ -450,3 +450,25 @@ tests:
             httpGet:
               port: live
               path: /readyz
+  - it: should always render args with unconditional entries
+    set:
+      leaderElect: false
+      scopedNamespace: ""
+      scopedRBAC: false
+      processClusterStore: false
+      processClusterExternalSecret: false
+      processClusterPushSecret: false
+      concurrent: 0
+      extraArgs: {}
+    asserts:
+      - exists:
+          path: spec.template.spec.containers[0].args
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--metrics-addr=:8080"
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--loglevel=info"
+      - contains:
+          path: spec.template.spec.containers[0].args
+          content: "--zap-time-encoding=epoch"