Merge pull request #6203 from aledbf/false

Refactor key/value parsing

Author: k8s-ci-robot

charts/ingress-nginx/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: ingress-nginx
-version: 3.2.0
+version: 3.3.0
 appVersion: 0.35.0
 home: https://github.com/kubernetes/ingress-nginx
 description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer

charts/ingress-nginx/templates/controller-daemonset.yaml

@@ -102,10 +102,11 @@ spec:
             - --health-check-path={{ .Values.controller.healthCheckPath }}
           {{- end }}
           {{- range $key, $value := .Values.controller.extraArgs }}
-            {{- if $value }}
-            - --{{ $key }}={{ $value }}
-            {{- else }}
+            {{- /* Accept keys without values or with false as value */}}
+            {{- if eq ($value | quote | len) 2 }}
             - --{{ $key }}
+            {{- else }}
+            - --{{ $key }}={{ $value }}
             {{- end }}
           {{- end }}
           securityContext:

charts/ingress-nginx/templates/controller-deployment.yaml

@@ -106,10 +106,11 @@ spec:
             - --health-check-path={{ .Values.controller.healthCheckPath }}
           {{- end }}
           {{- range $key, $value := .Values.controller.extraArgs }}
-            {{- if $value }}
-            - --{{ $key }}={{ $value }}
-            {{- else }}
+            {{- /* Accept keys without values or with false as value */}}
+            {{- if eq ($value | quote | len) 2 }}
             - --{{ $key }}
+            {{- else }}
+            - --{{ $key }}={{ $value }}
             {{- end }}
           {{- end }}
           securityContext:

charts/ingress-nginx/templates/default-backend-deployment.yaml

@@ -43,10 +43,11 @@ spec:
         {{- if .Values.defaultBackend.extraArgs }}
           args:
           {{- range $key, $value := .Values.defaultBackend.extraArgs }}
-            {{- if $value }}
-            - --{{ $key }}={{ $value }}
-            {{- else }}
+            {{- /* Accept keys without values or with false as value */}}
+            {{- if eq ($value | quote | len) 2 }}
             - --{{ $key }}
+            {{- else }}
+            - --{{ $key }}={{ $value }}
             {{- end }}
           {{- end }}
         {{- end }}