Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace deprecated imagePullSecrets helm setting #1232

Merged
merged 1 commit into from
Nov 20, 2020
Merged

Replace deprecated imagePullSecrets helm setting #1232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deployments/helm-chart/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,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
Expand Down
4 changes: 2 additions & 2 deletions deployments/helm-chart/templates/controller-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
6 changes: 3 additions & 3 deletions deployments/helm-chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions docs-web/installation/installation-with-helm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,9 +362,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
Expand Down