diff --git a/deployments/helm-chart/README.md b/deployments/helm-chart/README.md index 74a0196f2a..d0ca3f75a6 100644 --- a/deployments/helm-chart/README.md +++ b/deployments/helm-chart/README.md @@ -198,7 +198,7 @@ Parameter | Description | Default `controller.service.httpsPort.nodePort` | The custom NodePort for the HTTPS port. Requires `controller.service.type` set to `NodePort`. | "" `controller.service.httpsPort.targetPort` | The target port of the HTTPS port of the Ingress controller service. | 443 `controller.serviceAccount.name` | The name of the service account of the Ingress controller pods. Used for RBAC. | Autogenerated -`controller.serviceAccount.imagePullSecrets` | The names of the secrets containing docker registry credentials. | [] +`controller.serviceAccount.imagePullSecretName` | The name of the secret containing docker registry credentials. Secret must exist in the same namespace as the helm release. | "" `controller.reportIngressStatus.enable` | Update the address field in the status of Ingresses resources with an external address of the Ingress controller. You must also specify the source of the external address either through an external service via `controller.reportIngressStatus.externalService` or the `external-status-address` entry in the ConfigMap via `controller.config.entries`. **Note:** `controller.config.entries.external-status-address` takes precedence if both are set. | true `controller.reportIngressStatus.externalService` | Specifies the name of the service with the type LoadBalancer through which the Ingress controller is exposed externally. The external address of the service is used when reporting the status of Ingress resources. `controller.reportIngressStatus.enable` must be set to `true`. The default is autogenerated and enabled when `controller.service.create` is set to `true` and `controller.service.type` is set to `LoadBalancer`. | Autogenerated `controller.reportIngressStatus.enableLeaderElection` | Enable Leader election to avoid multiple replicas of the controller reporting the status of Ingress resources. `controller.reportIngressStatus.enable` must be set to `true`. | true diff --git a/deployments/helm-chart/templates/controller-serviceaccount.yaml b/deployments/helm-chart/templates/controller-serviceaccount.yaml index 741c28d000..c03c6a793b 100644 --- a/deployments/helm-chart/templates/controller-serviceaccount.yaml +++ b/deployments/helm-chart/templates/controller-serviceaccount.yaml @@ -6,8 +6,8 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "nginx-ingress.labels" . | nindent 4 }} -{{- if .Values.controller.serviceAccount.imagePullSecrets }} +{{- if .Values.controller.serviceAccount.imagePullSecretName }} imagePullSecrets: -{{ toYaml .Values.controller.serviceAccount.imagePullSecrets }} +- name: {{ .Values.controller.serviceAccount.imagePullSecretName }} {{- end }} {{- end }} diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml index 61cc175089..611fb2d49c 100644 --- a/deployments/helm-chart/values.yaml +++ b/deployments/helm-chart/values.yaml @@ -243,9 +243,9 @@ controller: ## Autogenerated if not set or set to "". # name: nginx-ingress - ## The names of the secrets containing docker registry credentials. - imagePullSecrets: [] - # - name: secret_name + ## The name of the secret containing docker registry credentials. + ## Secret must exist in the same namespace as the helm release. + imagePullSecretName: "" reportIngressStatus: ## Update the address field in the status of Ingresses resources with an external address of the Ingress controller. diff --git a/docs-web/installation/installation-with-helm.md b/docs-web/installation/installation-with-helm.md index fbefa87f38..437a00e92c 100644 --- a/docs-web/installation/installation-with-helm.md +++ b/docs-web/installation/installation-with-helm.md @@ -319,9 +319,9 @@ The following tables lists the configurable parameters of the NGINX Ingress cont * - ``controller.serviceAccount.name`` - The name of the service account of the Ingress controller pods. Used for RBAC. - Autogenerated - * - ``controller.serviceAccount.imagePullSecrets`` - - The names of the secrets containing docker registry credentials. - - [] + * - ``controller.serviceAccount.imagePullSecretName`` + - The name of the secret containing docker registry credentials. Secret must exist in the same namespace as the helm release. + - "" * - ``controller.reportIngressStatus.enable`` - Update the address field in the status of Ingresses resources with an external address of the Ingress controller. You must also specify the source of the external address either through an external service via ``controller.reportIngressStatus.externalService`` or the ``external-status-address`` entry in the ConfigMap via ``controller.config.entries``. **Note:** ``controller.config.entries.external-status-address`` takes precedence if both are set. - true