Move logic for -enable-leader-election flag in helm templates (#3475)

* Move logic for -enable-leader-election flag * Ensure -leader-election-lock-name is only set when leader election is enabled. * Fix formatting * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Co-authored-by: Venktesh Shivam Patel <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
nginx · Jan 24, 2023 · ae5caa5 · ae5caa5
1 parent d443d3a
commit ae5caa5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/deployments/helm-chart/templates/controller-daemonset.yaml b/deployments/helm-chart/templates/controller-daemonset.yaml
@@ -194,10 +194,12 @@ spec:
           - -external-service={{ .Values.controller.reportIngressStatus.externalService }}
 {{- else if and (.Values.controller.service.create) (eq .Values.controller.service.type "LoadBalancer") }}
           - -external-service={{ include "nginx-ingress.serviceName" . }}
+{{- end }}
 {{- end }}
           - -enable-leader-election={{ .Values.controller.reportIngressStatus.enableLeaderElection }}
+  {{- if .Values.controller.reportIngressStatus.enableLeaderElection }}
           - -leader-election-lock-name={{ include "nginx-ingress.leaderElectionName" . }}
-{{- end }}
+  {{- end }}
 {{- if .Values.controller.wildcardTLS.secret }}
           - -wildcard-tls-secret={{ .Values.controller.wildcardTLS.secret }}
 {{- else if and .Values.controller.wildcardTLS.cert .Values.controller.wildcardTLS.key }}

diff --git a/deployments/helm-chart/templates/controller-deployment.yaml b/deployments/helm-chart/templates/controller-deployment.yaml
@@ -197,8 +197,10 @@ spec:
           - -external-service={{ .Values.controller.reportIngressStatus.externalService }}
 {{- else if and (.Values.controller.service.create) (eq .Values.controller.service.type "LoadBalancer") }}
           - -external-service={{ include "nginx-ingress.serviceName" . }}
+{{- end }}
 {{- end }}
           - -enable-leader-election={{ .Values.controller.reportIngressStatus.enableLeaderElection }}
+{{- if .Values.controller.reportIngressStatus.enableLeaderElection }}
           - -leader-election-lock-name={{ include "nginx-ingress.leaderElectionName" . }}
 {{- end }}
 {{- if .Values.controller.wildcardTLS.secret }}

diff --git a/deployments/helm-chart/templates/controller-leader-election-configmap.yaml b/deployments/helm-chart/templates/controller-leader-election-configmap.yaml
@@ -1,11 +1,13 @@
+{{- if .Values.controller.reportIngressStatus.enableLeaderElection }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "nginx-ingress.leaderElectionName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "nginx-ingress.labels" . | nindent 4 }}
-{{- if .Values.controller.reportIngressStatus.annotations }}
-  annotations:
-{{ toYaml .Values.controller.reportIngressStatus.annotations | indent 4 }}
-{{- end }}
+  {{- if .Values.controller.reportIngressStatus.annotations }}
+annotations:
+  {{ toYaml .Values.controller.reportIngressStatus.annotations | indent 4 }}
+  {{- end }}
+  {{- end }}