Apply suggestions from code review

Co-authored-by: Marco Ebert <[email protected]>

Author: DerekTBrown

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

@@ -41,7 +41,7 @@ spec:
         {{- include "ingress-nginx.labels" . | nindent 8 }}
         app.kubernetes.io/component: controller
         {{- if not .Values.controller.disableLeaderElection }}
-        nginx.ingress.kubernetes.io/electionID: {{ include "ingress-nginx.controller.electionID" . }}
+        nginx.ingress.kubernetes.io/election-id: {{ include "ingress-nginx.controller.electionID" . }}
         {{- end }}
         {{- with .Values.controller.labels }}
         {{- toYaml . | nindent 8 }}

charts/ingress-nginx/tests/controller-daemonset_test.yaml

@@ -209,29 +209,29 @@ tests:
           path: spec.template.spec.runtimeClassName
           value: myClass
 
-  - it: should create a DaemonSet with the electionID label on the pod template when leader election is enabled
+  - it: should create a DaemonSet with election ID label
     set:
       controller.kind: DaemonSet
       controller.disableLeaderElection: false
     asserts:
       - equal:
-          path: spec.template.metadata.labels['nginx.ingress.kubernetes.io/electionID']
+          path: spec.template.metadata.labels["nginx.ingress.kubernetes.io/election-id"]
           value: RELEASE-NAME-ingress-nginx-leader
 
-  - it: should create a DaemonSet with the custom electionID label on the pod template when controller.electionID is set and leader election is enabled
+  - it: should create a DaemonSet with custom election ID label if `controller.electionID` is set
     set:
       controller.kind: DaemonSet
       controller.disableLeaderElection: false
       controller.electionID: custom-election-id
     asserts:
       - equal:
-          path: spec.template.metadata.labels['nginx.ingress.kubernetes.io/electionID']
+          path: spec.template.metadata.labels["nginx.ingress.kubernetes.io/election-id"]
           value: custom-election-id
 
-  - it: should create a DaemonSet without the electionID label on the pod template when leader election is disabled
+  - it: should create a DaemonSet without election ID label if `controller.disableLeaderElection` is true
     set:
       controller.kind: DaemonSet
       controller.disableLeaderElection: true
     asserts:
       - notExists:
-          path: spec.template.metadata.labels['nginx.ingress.kubernetes.io/electionID']
+          path: spec.template.metadata.labels["nginx.ingress.kubernetes.io/election-id"]