Skip to content

Commit 398c32e

Browse files
Cherry pick #3031 (#3046)
adding automountServiceAccountToken to helm chart (#3031) Co-authored-by: Jason Williams <[email protected]>
1 parent 7274fe4 commit 398c32e

File tree

7 files changed

+8
-1
lines changed

7 files changed

+8
-1
lines changed

deployments/common/ns-and-sa.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ apiVersion: v1
77
kind: ServiceAccount
88
metadata:
99
name: nginx-ingress
10-
namespace: nginx-ingress
10+
namespace: nginx-ingress
11+
#automountServiceAccountToken: false

deployments/daemon-set/nginx-ingress.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ spec:
1717
#prometheus.io/scheme: http
1818
spec:
1919
serviceAccountName: nginx-ingress
20+
automountServiceAccountToken: true
2021
containers:
2122
- image: nginx/nginx-ingress:2.3.0
2223
imagePullPolicy: IfNotPresent

deployments/daemon-set/nginx-plus-ingress.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ spec:
1717
#prometheus.io/scheme: http
1818
spec:
1919
serviceAccountName: nginx-ingress
20+
automountServiceAccountToken: true
2021
containers:
2122
- image: nginx-plus-ingress:2.3.0
2223
imagePullPolicy: IfNotPresent

deployments/deployment/nginx-ingress.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ spec:
1818
#prometheus.io/scheme: http
1919
spec:
2020
serviceAccountName: nginx-ingress
21+
automountServiceAccountToken: true
2122
containers:
2223
- image: nginx/nginx-ingress:2.3.0
2324
imagePullPolicy: IfNotPresent

deployments/deployment/nginx-plus-ingress.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ spec:
1818
#prometheus.io/scheme: http
1919
spec:
2020
serviceAccountName: nginx-ingress
21+
automountServiceAccountToken: true
2122
containers:
2223
- image: nginx-plus-ingress:2.3.0
2324
imagePullPolicy: IfNotPresent

deployments/helm-chart/templates/controller-daemonset.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ spec:
3838
{{- end }}
3939
spec:
4040
serviceAccountName: {{ include "nginx-ingress.serviceAccountName" . }}
41+
automountServiceAccountToken: true
4142
terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
4243
{{- if .Values.controller.nodeSelector }}
4344
nodeSelector:

deployments/helm-chart/templates/controller-deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ spec:
7070
priorityClassName: {{ .Values.controller.priorityClassName }}
7171
{{- end }}
7272
serviceAccountName: {{ include "nginx-ingress.serviceAccountName" . }}
73+
automountServiceAccountToken: true
7374
terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
7475
hostNetwork: {{ .Values.controller.hostNetwork }}
7576
containers:

0 commit comments

Comments
 (0)