diff --git a/charts/ingress-nginx/Chart.yaml b/charts/ingress-nginx/Chart.yaml index 1bd30b31d..fcd1db0bd 100644 --- a/charts/ingress-nginx/Chart.yaml +++ b/charts/ingress-nginx/Chart.yaml @@ -1,6 +1,6 @@ annotations: artifacthub.io/changes: |- - - "Update Ingress-Nginx version controller-v1.10.0" + - "Adds option to turn off automount of service account token" artifacthub.io/prerelease: "false" apiVersion: v2 appVersion: 1.10.0 @@ -19,4 +19,4 @@ maintainers: name: ingress-nginx sources: - https://github.com/kubernetes/ingress-nginx -version: 4.10.0 +version: 4.10.1 diff --git a/charts/ingress-nginx/templates/controller-deployment.yaml b/charts/ingress-nginx/templates/controller-deployment.yaml index 5ff45585b..e02b8c651 100644 --- a/charts/ingress-nginx/templates/controller-deployment.yaml +++ b/charts/ingress-nginx/templates/controller-deployment.yaml @@ -45,6 +45,7 @@ spec: {{- toYaml .Values.controller.podLabels | nindent 8 }} {{- end }} spec: + automountServiceAccountToken: {{ .Values.automountServiceAccountToken }} {{- if .Values.controller.dnsConfig }} dnsConfig: {{ toYaml .Values.controller.dnsConfig | nindent 8 }} {{- end }} diff --git a/charts/ingress-nginx/templates/default-backend-deployment.yaml b/charts/ingress-nginx/templates/default-backend-deployment.yaml index d342c8c35..64cc4d5c1 100644 --- a/charts/ingress-nginx/templates/default-backend-deployment.yaml +++ b/charts/ingress-nginx/templates/default-backend-deployment.yaml @@ -39,6 +39,7 @@ spec: {{- toYaml .Values.defaultBackend.podLabels | nindent 8 }} {{- end }} spec: + automountServiceAccountToken: {{ .Values.defaultBackend.automountServiceAccountToken }} {{- if .Values.imagePullSecrets }} imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 8 }} {{- end }} diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml index 71c3240fb..7f694df8f 100644 --- a/charts/ingress-nginx/values.yaml +++ b/charts/ingress-nginx/values.yaml @@ -939,6 +939,9 @@ defaultBackend: create: true name: "" automountServiceAccountToken: true + # -- Automount service account token on controller deployment + ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ + automountServiceAccountToken: true # -- Additional environment variables to set for defaultBackend pods extraEnvs: [] port: 8080 @@ -1068,6 +1071,9 @@ serviceAccount: automountServiceAccountToken: true # -- Annotations for the controller service account annotations: {} +# -- Automount service account token on controller deployment +## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ +automountServiceAccountToken: true # -- Optional array of imagePullSecrets containing private registry credentials ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ imagePullSecrets: []