Cherry pick #3031 (#3046)

adding automountServiceAccountToken to helm chart (#3031) Co-authored-by: Jason Williams <[email protected]>
nginx · Sep 16, 2022 · 398c32e · 398c32e
1 parent 7274fe4
commit 398c32e
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 1 deletion.
diff --git a/deployments/common/ns-and-sa.yaml b/deployments/common/ns-and-sa.yaml
@@ -7,4 +7,5 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: nginx-ingress 
-  namespace: nginx-ingress
+  namespace: nginx-ingress
+#automountServiceAccountToken: false
diff --git a/deployments/daemon-set/nginx-ingress.yaml b/deployments/daemon-set/nginx-ingress.yaml
@@ -17,6 +17,7 @@ spec:
        #prometheus.io/scheme: http
     spec:
       serviceAccountName: nginx-ingress
+      automountServiceAccountToken: true
       containers:
       - image: nginx/nginx-ingress:2.3.0
         imagePullPolicy: IfNotPresent

diff --git a/deployments/daemon-set/nginx-plus-ingress.yaml b/deployments/daemon-set/nginx-plus-ingress.yaml
@@ -17,6 +17,7 @@ spec:
        #prometheus.io/scheme: http
     spec:
       serviceAccountName: nginx-ingress
+      automountServiceAccountToken: true
       containers:
       - image: nginx-plus-ingress:2.3.0
         imagePullPolicy: IfNotPresent

diff --git a/deployments/deployment/nginx-ingress.yaml b/deployments/deployment/nginx-ingress.yaml
@@ -18,6 +18,7 @@ spec:
        #prometheus.io/scheme: http
     spec:
       serviceAccountName: nginx-ingress
+      automountServiceAccountToken: true
       containers:
       - image: nginx/nginx-ingress:2.3.0
         imagePullPolicy: IfNotPresent

diff --git a/deployments/deployment/nginx-plus-ingress.yaml b/deployments/deployment/nginx-plus-ingress.yaml
@@ -18,6 +18,7 @@ spec:
        #prometheus.io/scheme: http
     spec:
       serviceAccountName: nginx-ingress
+      automountServiceAccountToken: true
       containers:
       - image: nginx-plus-ingress:2.3.0
         imagePullPolicy: IfNotPresent

diff --git a/deployments/helm-chart/templates/controller-daemonset.yaml b/deployments/helm-chart/templates/controller-daemonset.yaml
@@ -38,6 +38,7 @@ spec:
 {{- end }}
     spec:
       serviceAccountName: {{ include "nginx-ingress.serviceAccountName" . }}
+      automountServiceAccountToken: true
       terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
 {{- if .Values.controller.nodeSelector }}
       nodeSelector:

diff --git a/deployments/helm-chart/templates/controller-deployment.yaml b/deployments/helm-chart/templates/controller-deployment.yaml
@@ -70,6 +70,7 @@ spec:
       priorityClassName: {{ .Values.controller.priorityClassName }}
 {{- end }}
       serviceAccountName: {{ include "nginx-ingress.serviceAccountName" . }}
+      automountServiceAccountToken: true
       terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
       hostNetwork: {{ .Values.controller.hostNetwork }}
       containers: