Updated automounttoken setting for helm chart

nginx · Sep 14, 2022 · cfa058d · cfa058d
1 parent 6746a05
commit cfa058d
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 7 deletions.
diff --git a/deployments/helm-chart/README.md b/deployments/helm-chart/README.md
@@ -169,7 +169,6 @@ Parameter | Description | Default
 `controller.wildcardTLS.cert` | The base64-encoded TLS certificate for every Ingress/VirtualServer host that has TLS enabled but no secret specified. If the parameter is not set, for such Ingress/VirtualServer hosts NGINX will break any attempt to establish a TLS connection. | None
 `controller.wildcardTLS.key` | The base64-encoded TLS key for every Ingress/VirtualServer host that has TLS enabled but no secret specified. If the parameter is not set, for such Ingress/VirtualServer hosts NGINX will break any attempt to establish a TLS connection. | None
 `controller.wildcardTLS.secret` | The secret with a TLS certificate and key for every Ingress/VirtualServer host that has TLS enabled but no secret specified. The value must follow the following format: `<namespace>/<name>`. Used as an alternative to specifying a certificate and key using `controller.wildcardTLS.cert` and `controller.wildcardTLS.key` parameters. | None
-`controller.automountServiceAccountToken` | The toggle for automountServiceAccountToken for the Ingress Controller. | true
 `controller.nodeSelector` | The node selector for pod assignment for the Ingress Controller pods. | {}
 `controller.terminationGracePeriodSeconds` | The termination grace period of the Ingress Controller pod. | 30
 `controller.tolerations` | The tolerations of the Ingress Controller pods. | []

diff --git a/deployments/helm-chart/templates/controller-daemonset.yaml b/deployments/helm-chart/templates/controller-daemonset.yaml
@@ -38,7 +38,7 @@ spec:
 {{- end }}
     spec:
       serviceAccountName: {{ include "nginx-ingress.serviceAccountName" . }}
-      automountServiceAccountToken: {{ .Values.controller.automountServiceAccountToken }}
+      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,7 +70,7 @@ spec:
       priorityClassName: {{ .Values.controller.priorityClassName }}
 {{- end }}
       serviceAccountName: {{ include "nginx-ingress.serviceAccountName" . }}
-      automountServiceAccountToken: {{ .Values.controller.automountServiceAccountToken }}
+      automountServiceAccountToken: true
       terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
       hostNetwork: {{ .Values.controller.hostNetwork }}
       containers:

diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml
@@ -100,9 +100,6 @@ controller:
     ## Format: <namespace>/<secret_name>
     secret:
 
-  ## The option to toggle automountServiceAccountToken at the pod level. 
-  automountServiceAccountToken: true 
-
   ## The node selector for pod assignment for the Ingress Controller pods.
   nodeSelector: {}
 

diff --git a/docs/content/installation/installation-with-helm.md b/docs/content/installation/installation-with-helm.md
@@ -172,7 +172,6 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont
 |``controller.wildcardTLS.cert`` | The base64-encoded TLS certificate for every Ingress/VirtualServer host that has TLS enabled but no secret specified. If the parameter is not set, for such Ingress/VirtualServer hosts NGINX will break any attempt to establish a TLS connection. | None |
 |``controller.wildcardTLS.key`` | The base64-encoded TLS key for every Ingress/VirtualServer host that has TLS enabled but no secret specified. If the parameter is not set, for such Ingress/VirtualServer hosts NGINX will break any attempt to establish a TLS connection. | None |
 |``controller.wildcardTLS.secret`` | The secret with a TLS certificate and key for every Ingress/VirtualServer host that has TLS enabled but no secret specified. The value must follow the following format: ``<namespace>/<name>``. Used as an alternative to specifying a certificate and key using ``controller.wildcardTLS.cert`` and ``controller.wildcardTLS.key`` parameters. | None |
-|``controller.automountServiceAccountToken`` | Setting automountServiceAccountToken at the pod level | true
 |``controller.nodeSelector`` | The node selector for pod assignment for the Ingress Controller pods. | {} |
 |``controller.terminationGracePeriodSeconds`` | The termination grace period of the Ingress Controller pod. | 30 |
 |``controller.tolerations`` | The tolerations of the Ingress Controller pods. | [] |