Create unique lease obj for each NIC installed via Helm (#6372)

nginxinc · Sep 10, 2024 · e6b9db3 · e6b9db3
1 parent e3e0b33
commit e6b9db3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/charts/nginx-ingress/templates/controller-lease.yaml b/charts/nginx-ingress/templates/controller-lease.yaml
@@ -0,0 +1,13 @@
+{{ if .Values.controller.reportIngressStatus.enableLeaderElection }}
+apiVersion: coordination.k8s.io/v1
+kind: Lease
+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 }}
+{{- end }}
diff --git a/charts/nginx-ingress/templates/controller-role.yaml b/charts/nginx-ingress/templates/controller-role.yaml
@@ -43,7 +43,7 @@ rules:
   resources:
   - leases
   resourceNames:
-  - {{ .Values.controller.reportIngressStatus.leaderElectionLockName }}
+  - {{ include "nginx-ingress.leaderElectionName" . }}
   verbs:
   - get
   - update

diff --git a/charts/nginx-ingress/values.yaml b/charts/nginx-ingress/values.yaml
@@ -496,7 +496,8 @@ controller:
     enableLeaderElection: true
 
     ## Specifies the name to be used as the lock for leader election. controller.reportIngressStatus.enableLeaderElection must be set to true.
-    leaderElectionLockName: "nginx-ingress-leader"
+    ## The default is autogenerated.
+    leaderElectionLockName: ""
 
     ## The annotations of the leader election configmap.
     annotations: {}