8000 Replace deprecated imagePullSecrets helm setting · nginx/kubernetes-ingress@95623b6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 95623b6

Browse files
Dean-CoakleyDean-Coakley
authored
Replace deprecated imagePullSecrets helm setting
* Remove deprecated imagePullSecrets setting * Add imagePullSecretName setting Rancher App Catalog requires this change in order to be able to set imagePullSecret which is required for pull images from private docker registries.
2 parents 92d0362 + a2465c8 commit 95623b6

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

‎deployments/helm-chart/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ Parameter | Description | Default
198198
`controller.service.httpsPort.nodePort` | The custom NodePort for the HTTPS port. Requires `controller.service.type` set to `NodePort`. | ""
199199
`controller.service.httpsPort.targetPort` | The target port of the HTTPS port of the Ingress controller service. | 443
200200
`controller.serviceAccount.name` | The name of the service account of the Ingress controller pods. Used for RBAC. | Autogenerated
201-
`controller.serviceAccount.imagePullSecrets` | The names of the secrets containing docker registry credentials. | []
201+
`controller.serviceAccount.imagePullSecretName` | The name of the secret containing docker registry credentials. Secret must exist in the same namespace as the helm release. | ""
202202
`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
203203
`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
204204
`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

‎deployments/helm-chart/templates/controller-serviceaccount.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
{{- include "nginx-ingress.labels" . | nindent 4 }}
9-
{{- if .Values.controller.serviceAccount.imagePullSecrets }}
9+
{{- if .Values.controller.serviceAccount.imagePullSecretName }}
1010
imagePullSecrets:
11-
{{ toYaml .Values.controller.serviceAccount.imagePullSecrets }}
11+
- name: {{ .Values.controller.serviceAccount.imagePullSecretName }}
1212
{{- end }}
1313
{{- end }}

‎deployments/helm-chart/values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ controller:
243243
## Autogenerated if not set or set to "".
244244
# name: nginx-ingress
245245

246-
## The names of the secrets containing docker registry credentials.
247-
imagePullSecrets: []
248-
# - name: secret_name
246+
## The name of the secret containing docker registry credentials.
247+
## Secret must exist in the same namespace as the helm release.
248+
imagePullSecretName: ""
249249

250250
reportIngressStatus:
251251
## Update the address field in the status of Ingresses resources with an external address of the Ingress controller.

‎docs-web/installation/installation-with-helm.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,9 @@ The following tables lists the configurable parameters of the NGINX Ingress cont
319319
* - ``controller.serviceAccount.name``
320320
- The name of the service account of the Ingress controller pods. Used for RBAC.
321321
- Autogenerated
322-
* - ``controller.serviceAccount.imagePullSecrets``
323-
- The names of the secrets containing docker registry credentials.
324-
- []
322+
* - ``controller.serviceAccount.imagePullSecretName``
323+
- The name of the secret containing docker registry credentials. Secret must exist in the same namespace as the helm release.
324+
- ""
325325
* - ``controller.reportIngressStatus.enable``
326326
- 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.
327327
- true

0 commit comments

Comments
 (0)
0