diff --git a/charts/ingress-nginx/README.md b/charts/ingress-nginx/README.md index 1fd9e302c..4a3bbbd48 100644 --- a/charts/ingress-nginx/README.md +++ b/charts/ingress-nginx/README.md @@ -50,7 +50,6 @@ The following table lists the configurable parameters of the ingress-nginx chart Parameter | Description | Default --- | --- | --- -`controller.name` | name of the controller component | `controller` `controller.image.repository` | controller container image repository | `quay.io/kubernetes-ingress-controller/nginx-ingress-controller` `controller.image.tag` | controller container image tag | `0.30.0` `controller.image.pullPolicy` | controller container image pull policy | `IfNotPresent` @@ -184,7 +183,6 @@ Parameter | Description | Default `controller.udp.configMapNamespace` | The udp-services-configmap namespace name | `""` `controller.udp.annotations` | annotations to be added to udp configmap | `{}` `defaultBackend.enabled` | Use default backend component | `true` -`defaultBackend.name` | name of the default backend component | `default-backend` `defaultBackend.image.repository` | default backend container image repository | `k8s.gcr.io/defaultbackend-amd64` `defaultBackend.image.tag` | default backend container image tag | `1.5` `defaultBackend.image.pullPolicy` | default backend container image pull policy | `IfNotPresent` diff --git a/charts/ingress-nginx/templates/NOTES.txt b/charts/ingress-nginx/templates/NOTES.txt index 63def1a6d..2e5c6e0c2 100644 --- a/charts/ingress-nginx/templates/NOTES.txt +++ b/charts/ingress-nginx/templates/NOTES.txt @@ -6,12 +6,12 @@ Get the application URL by running these commands: {{- if (not (empty .Values.controller.service.nodePorts.http)) }} export HTTP_NODE_PORT={{ .Values.controller.service.nodePorts.http }} {{- else }} - export HTTP_NODE_PORT=$(kubectl --namespace {{ .Release.Namespace }} get services -o jsonpath="{.spec.ports[0].nodePort}" {{ template "ingress-nginx.controller.fullname" . }}) + export HTTP_NODE_PORT=$(kubectl --namespace {{ .Release.Namespace }} get services -o jsonpath="{.spec.ports[0].nodePort}" {{ include "ingress-nginx.controller.fullname" . }}) {{- end }} {{- if (not (empty .Values.controller.service.nodePorts.https)) }} export HTTPS_NODE_PORT={{ .Values.controller.service.nodePorts.https }} {{- else }} - export HTTPS_NODE_PORT=$(kubectl --namespace {{ .Release.Namespace }} get services -o jsonpath="{.spec.ports[1].nodePort}" {{ template "ingress-nginx.controller.fullname" . }}) + export HTTPS_NODE_PORT=$(kubectl --namespace {{ .Release.Namespace }} get services -o jsonpath="{.spec.ports[1].nodePort}" {{ include "ingress-nginx.controller.fullname" . }}) {{- end }} export NODE_IP=$(kubectl --namespace {{ .Release.Namespace }} get nodes -o jsonpath="{.items[0].status.addresses[1].address}") @@ -19,7 +19,7 @@ Get the application URL by running these commands: echo "Visit https://$NODE_IP:$HTTPS_NODE_PORT to access your application via HTTPS." {{- else if contains "LoadBalancer" .Values.controller.service.type }} It may take a few minutes for the LoadBalancer IP to be available. -You can watch the status by running 'kubectl --namespace {{ .Release.Namespace }} get services -o wide -w {{ template "ingress-nginx.controller.fullname" . }}' +You can watch the status by running 'kubectl --namespace {{ .Release.Namespace }} get services -o wide -w {{ include "ingress-nginx.controller.fullname" . }}' {{- else if contains "ClusterIP" .Values.controller.service.type }} Get the application URL by running these commands: export POD_NAME=$(kubectl --namespace {{ .Release.Namespace }} get pods -o jsonpath="{.items[0].metadata.name}" -l "app={{ template "ingress-nginx.name" . }},component={{ .Values.controller.name }},release={{ .Release.Name }}") diff --git a/charts/ingress-nginx/templates/_helpers.tpl b/charts/ingress-nginx/templates/_helpers.tpl index dc7f15564..716587f9a 100644 --- a/charts/ingress-nginx/templates/_helpers.tpl +++ b/charts/ingress-nginx/templates/_helpers.tpl @@ -35,7 +35,7 @@ Create a default fully qualified controller name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "ingress-nginx.controller.fullname" -}} -{{- printf "%s-%s" (include "ingress-nginx.fullname" .) .Values.controller.name | trunc 63 | trimSuffix "-" -}} +{{- printf "%s-%s" (include "ingress-nginx.fullname" .) "controller" | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* diff --git a/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml b/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml index 4aba6bb59..7eb57388d 100644 --- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml +++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ template "ingress-nginx.fullname" . }}-admission + name: {{ include "ingress-nginx.fullname" . }}-admission annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded @@ -22,6 +22,6 @@ rules: resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: - - {{ template "ingress-nginx.fullname" . }}-admission + - {{ include "ingress-nginx.fullname" . }}-admission {{- end }} {{- end }} diff --git a/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml b/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml index 133911f2b..97931250c 100644 --- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml +++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ template "ingress-nginx.fullname" . }}-admission + name: {{ include "ingress-nginx.fullname" . }}-admission annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded @@ -12,9 +12,9 @@ metadata: roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "ingress-nginx.fullname" . }}-admission + name: {{ include "ingress-nginx.fullname" . }}-admission subjects: - kind: ServiceAccount - name: {{ template "ingress-nginx.fullname" . }}-admission + name: {{ include "ingress-nginx.fullname" . }}-admission namespace: {{ .Release.Namespace }} {{- end }} diff --git a/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml b/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml index c3aeebe4a..3e21b7fed 100644 --- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml +++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml @@ -2,7 +2,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ template "ingress-nginx.fullname" . }}-admission-create + name: {{ include "ingress-nginx.fullname" . }}-admission-create annotations: "helm.sh/hook": pre-install,pre-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded @@ -16,7 +16,7 @@ spec: {{- end }} template: metadata: - name: {{ template "ingress-nginx.fullname" . }}-admission-create + name: {{ include "ingress-nginx.fullname" . }}-admission-create {{- if .Values.controller.admissionWebhooks.patch.podAnnotations }} annotations: {{ toYaml .Values.controller.admissionWebhooks.patch.podAnnotations | nindent 8 }} {{- end }} @@ -33,11 +33,11 @@ spec: imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.image.pullPolicy }} args: - create - - --host={{ template "ingress-nginx.controller.fullname" . }}-admission,{{ template "ingress-nginx.controller.fullname" . }}-admission.{{ .Release.Namespace }}.svc + - --host={{ include "ingress-nginx.controller.fullname" . }}-admission,{{ include "ingress-nginx.controller.fullname" . }}-admission.{{ .Release.Namespace }}.svc - --namespace={{ .Release.Namespace }} - - --secret-name={{ template "ingress-nginx.fullname". }}-admission + - --secret-name={{ include "ingress-nginx.fullname" . }}-admission restartPolicy: OnFailure - serviceAccountName: {{ template "ingress-nginx.fullname" . }}-admission + serviceAccountName: {{ include "ingress-nginx.fullname" . }}-admission {{- if .Values.controller.admissionWebhooks.patch.nodeSelector }} nodeSelector: {{ toYaml .Values.controller.admissionWebhooks.patch.nodeSelector | nindent 8 }} {{- end }} diff --git a/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml b/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml index 7daf5f996..79d58a7bd 100644 --- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml +++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml @@ -2,7 +2,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ template "ingress-nginx.fullname" . }}-admission-patch + name: {{ include "ingress-nginx.fullname" . }}-admission-patch annotations: "helm.sh/hook": post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded @@ -16,7 +16,7 @@ spec: {{- end }} template: metadata: - name: {{ template "ingress-nginx.fullname" . }}-admission-patch + name: {{ include "ingress-nginx.fullname" . }}-admission-patch {{- if .Values.controller.admissionWebhooks.patch.podAnnotations }} annotations: {{ toYaml .Values.controller.admissionWebhooks.patch.podAnnotations | nindent 8 }} {{- end }} @@ -33,13 +33,13 @@ spec: imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.pullPolicy }} args: - patch - - --webhook-name={{ template "ingress-nginx.fullname" . }}-admission + - --webhook-name={{ include "ingress-nginx.fullname" . }}-admission - --namespace={{ .Release.Namespace }} - --patch-mutating=false - - --secret-name={{ template "ingress-nginx.fullname". }}-admission + - --secret-name={{ include "ingress-nginx.fullname" . }}-admission - --patch-failure-policy={{ .Values.controller.admissionWebhooks.failurePolicy }} restartPolicy: OnFailure - serviceAccountName: {{ template "ingress-nginx.fullname" . }}-admission + serviceAccountName: {{ include "ingress-nginx.fullname" . }}-admission {{- if .Values.controller.admissionWebhooks.patch.nodeSelector }} nodeSelector: {{ toYaml .Values.controller.admissionWebhooks.patch.nodeSelector | nindent 8 }} {{- end }} diff --git a/charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml b/charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml index 651656067..e8c8da94b 100644 --- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml +++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml @@ -2,7 +2,7 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ template "ingress-nginx.fullname" . }}-admission + name: {{ include "ingress-nginx.fullname" . }}-admission annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded diff --git a/charts/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml b/charts/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml index c42e4588f..fe1c2ee7f 100644 --- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml +++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: {{ template "ingress-nginx.fullname" . }}-admission + name: {{ include "ingress-nginx.fullname" . }}-admission annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded diff --git a/charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml b/charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml index d3dc6f689..391e5e9a3 100644 --- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml +++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ template "ingress-nginx.fullname" . }}-admission + name: {{ include "ingress-nginx.fullname" . }}-admission annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded @@ -12,9 +12,9 @@ metadata: roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: {{ template "ingress-nginx.fullname" . }}-admission + name: {{ include "ingress-nginx.fullname" . }}-admission subjects: - kind: ServiceAccount - name: {{ template "ingress-nginx.fullname" . }}-admission + name: {{ include "ingress-nginx.fullname" . }}-admission namespace: {{ .Release.Namespace }} {{- end }} diff --git a/charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml b/charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml index 280c142b1..5dfdd345a 100644 --- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml +++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ template "ingress-nginx.fullname" . }}-admission + name: {{ include "ingress-nginx.fullname" . }}-admission annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded diff --git a/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml b/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml index 9a408762e..7ee75f64f 100644 --- a/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml +++ b/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml @@ -5,7 +5,7 @@ metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} app.kubernetes.io/component: admission-webhook - name: {{ template "ingress-nginx.fullname" . }}-admission + name: {{ include "ingress-nginx.fullname" . }}-admission webhooks: - name: validate.nginx.ingress.kubernetes.io rules: @@ -23,6 +23,6 @@ webhooks: clientConfig: service: namespace: {{ .Release.Namespace }} - name: {{ template "ingress-nginx.controller.fullname" . }}-admission + name: {{ include "ingress-nginx.controller.fullname" . }}-admission path: /extensions/v1beta1/ingresses {{- end }} diff --git a/charts/ingress-nginx/templates/clusterrolebinding.yaml b/charts/ingress-nginx/templates/clusterrolebinding.yaml index 8ed962e19..a341f5280 100644 --- a/charts/ingress-nginx/templates/clusterrolebinding.yaml +++ b/charts/ingress-nginx/templates/clusterrolebinding.yaml @@ -4,11 +4,11 @@ kind: ClusterRoleBinding metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - name: {{ template "ingress-nginx.fullname" . }} + name: {{ include "ingress-nginx.fullname" . }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "ingress-nginx.fullname" . }} + name: {{ include "ingress-nginx.fullname" . }} subjects: - kind: ServiceAccount name: {{ template "ingress-nginx.serviceAccountName" . }} diff --git a/charts/ingress-nginx/templates/controller-configmap-addheaders.yaml b/charts/ingress-nginx/templates/controller-configmap-addheaders.yaml index 0322cb9c7..c06458958 100644 --- a/charts/ingress-nginx/templates/controller-configmap-addheaders.yaml +++ b/charts/ingress-nginx/templates/controller-configmap-addheaders.yaml @@ -4,7 +4,7 @@ kind: ConfigMap metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller name: {{ include "ingress-nginx.fullname" . }}-custom-add-headers data: {{ toYaml .Values.controller.addHeaders | nindent 2 }} {{- end }} diff --git a/charts/ingress-nginx/templates/controller-configmap-proxyheaders.yaml b/charts/ingress-nginx/templates/controller-configmap-proxyheaders.yaml index 44c2bd23d..5a1b25229 100644 --- a/charts/ingress-nginx/templates/controller-configmap-proxyheaders.yaml +++ b/charts/ingress-nginx/templates/controller-configmap-proxyheaders.yaml @@ -4,7 +4,7 @@ kind: ConfigMap metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller name: {{ include "ingress-nginx.fullname" . }}-custom-proxy-headers data: {{- if .Values.controller.proxySetHeaders }} diff --git a/charts/ingress-nginx/templates/controller-configmap-tcp.yaml b/charts/ingress-nginx/templates/controller-configmap-tcp.yaml index fcfb52941..bc972517c 100644 --- a/charts/ingress-nginx/templates/controller-configmap-tcp.yaml +++ b/charts/ingress-nginx/templates/controller-configmap-tcp.yaml @@ -4,7 +4,7 @@ kind: ConfigMap metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- if .Values.controller.tcp.annotations }} annotations: {{ toYaml .Values.controller.tcp.annotations | nindent 4 }} {{- end }} diff --git a/charts/ingress-nginx/templates/controller-configmap-udp.yaml b/charts/ingress-nginx/templates/controller-configmap-udp.yaml index 0061af60b..a9dc388f1 100644 --- a/charts/ingress-nginx/templates/controller-configmap-udp.yaml +++ b/charts/ingress-nginx/templates/controller-configmap-udp.yaml @@ -4,7 +4,7 @@ kind: ConfigMap metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- if .Values.controller.udp.annotations }} annotations: {{ toYaml .Values.controller.udp.annotations | nindent 4 }} {{- end }} diff --git a/charts/ingress-nginx/templates/controller-configmap.yaml b/charts/ingress-nginx/templates/controller-configmap.yaml index 94f139d10..1170ad6df 100644 --- a/charts/ingress-nginx/templates/controller-configmap.yaml +++ b/charts/ingress-nginx/templates/controller-configmap.yaml @@ -4,11 +4,11 @@ kind: ConfigMap metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- if .Values.controller.configAnnotations }} annotations: {{ toYaml .Values.controller.configAnnotations | nindent 4 }} {{- end }} - name: {{ template "ingress-nginx.controller.fullname" . }} + name: {{ include "ingress-nginx.controller.fullname" . }} data: {{- if .Values.controller.addHeaders }} add-headers: {{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-custom-add-headers diff --git a/charts/ingress-nginx/templates/controller-daemonset.yaml b/charts/ingress-nginx/templates/controller-daemonset.yaml index 4d369dd98..d69e6df9f 100644 --- a/charts/ingress-nginx/templates/controller-daemonset.yaml +++ b/charts/ingress-nginx/templates/controller-daemonset.yaml @@ -4,8 +4,8 @@ kind: DaemonSet metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} - name: {{ template "ingress-nginx.controller.fullname" . }} + app.kubernetes.io/component: controller + name: {{ include "ingress-nginx.controller.fullname" . }} {{- if .Values.controller.daemonsetAnnotations }} annotations: {{ toYaml .Values.controller.daemonsetAnnotations | nindent 4 }} {{- end }} @@ -13,7 +13,7 @@ spec: selector: matchLabels: {{- include "ingress-nginx.selectorLabels" . | nindent 6 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} {{- if .Values.controller.updateStrategy }} updateStrategy: {{ toYaml .Values.controller.updateStrategy | nindent 4 }} @@ -26,7 +26,7 @@ spec: {{- end }} labels: {{- include "ingress-nginx.selectorLabels" . | nindent 8 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- if .Values.controller.podLabels }} {{- toYaml .Values.controller.podLabels | nindent 8 }} {{- end }} @@ -54,7 +54,7 @@ spec: args: - /nginx-ingress-controller {{- if .Values.defaultBackend.enabled }} - - --default-backend-service={{ .Release.Namespace }}/{{ template "ingress-nginx.defaultBackend.fullname" . }} + - --default-backend-service={{ .Release.Namespace }}/{{ include "ingress-nginx.defaultBackend.fullname" . }} {{- else }} {{- if (semverCompare "<0.21.0" .Values.controller.image.tag) }} - --default-backend-service={{ required ".Values.controller.defaultBackendService is required if .Values.defaultBackend.enabled=false and .Values.controller.image.tag < 0.21.0" .Values.controller.defaultBackendService }} @@ -72,9 +72,9 @@ spec: - --ingress-class={{ .Values.controller.ingressClass }} {{- end }} {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }} - - --configmap={{ .Release.Namespace }}/{{ template "ingress-nginx.controller.fullname" . }} + - --configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.controller.fullname" . }} {{- else }} - - --nginx-configmap={{ .Release.Namespace }}/{{ template "ingress-nginx.controller.fullname" . }} + - --nginx-configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.controller.fullname" . }} {{- end }} {{- if .Values.tcp }} - --tcp-services-configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-tcp @@ -232,7 +232,7 @@ spec: {{- if .Values.controller.admissionWebhooks.enabled }} - name: webhook-cert secret: - secretName: {{ template "ingress-nginx.fullname". }}-admission + secretName: {{ include "ingress-nginx.fullname" . }}-admission {{- end }} {{- if .Values.controller.extraVolumes }} {{ toYaml .Values.controller.extraVolumes | nindent 8 }} diff --git a/charts/ingress-nginx/templates/controller-deployment.yaml b/charts/ingress-nginx/templates/controller-deployment.yaml index bbe05097b..8f73b278b 100644 --- a/charts/ingress-nginx/templates/controller-deployment.yaml +++ b/charts/ingress-nginx/templates/controller-deployment.yaml @@ -4,8 +4,8 @@ kind: Deployment metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} - name: {{ template "ingress-nginx.controller.fullname" . }} + app.kubernetes.io/component: controller + name: {{ include "ingress-nginx.controller.fullname" . }} {{- if .Values.controller.deploymentAnnotations }} annotations: {{ toYaml .Values.controller.deploymentAnnotations | nindent 4 }} {{- end }} @@ -13,7 +13,7 @@ spec: selector: matchLabels: {{- include "ingress-nginx.selectorLabels" . | nindent 6 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- if not .Values.controller.autoscaling.enabled }} replicas: {{ .Values.controller.replicaCount }} {{- end }} @@ -29,7 +29,7 @@ spec: {{- end }} labels: {{- include "ingress-nginx.selectorLabels" . | nindent 8 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- if .Values.controller.podLabels }} {{- toYaml .Values.controller.podLabels | nindent 8 }} {{- end }} @@ -57,7 +57,7 @@ spec: args: - /nginx-ingress-controller {{- if .Values.defaultBackend.enabled }} - - --default-backend-service={{ .Release.Namespace }}/{{ template "ingress-nginx.defaultBackend.fullname" . }} + - --default-backend-service={{ .Release.Namespace }}/{{ include "ingress-nginx.defaultBackend.fullname" . }} {{- else }} {{- if (semverCompare "<0.21.0" .Values.controller.image.tag) }} - --default-backend-service={{ required ".Values.controller.defaultBackendService is required if .Values.defaultBackend.enabled=false and .Values.controller.image.tag < 0.21.0" .Values.controller.defaultBackendService }} @@ -75,9 +75,9 @@ spec: - --ingress-class={{ .Values.controller.ingressClass }} {{- end }} {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }} - - --configmap={{ default .Release.Namespace .Values.controller.configMapNamespace }}/{{ template "ingress-nginx.controller.fullname" . }} + - --configmap={{ default .Release.Namespace .Values.controller.configMapNamespace }}/{{ include "ingress-nginx.controller.fullname" . }} {{- else }} - - --nginx-configmap={{ default .Release.Namespace .Values.controller.configMapNamespace }}/{{ template "ingress-nginx.controller.fullname" . }} + - --nginx-configmap={{ default .Release.Namespace .Values.controller.configMapNamespace }}/{{ include "ingress-nginx.controller.fullname" . }} {{- end }} {{- if .Values.tcp }} - --tcp-services-configmap={{ default .Release.Namespace .Values.controller.tcp.configMapNamespace }}/{{ include "ingress-nginx.fullname" . }}-tcp @@ -226,7 +226,7 @@ spec: {{- if .Values.controller.admissionWebhooks.enabled }} - name: webhook-cert secret: - secretName: {{ template "ingress-nginx.fullname". }}-admission + secretName: {{ include "ingress-nginx.fullname" . }}-admission {{- end }} {{- if .Values.controller.extraVolumes }} {{ toYaml .Values.controller.extraVolumes | nindent 8 }} diff --git a/charts/ingress-nginx/templates/controller-hpa.yaml b/charts/ingress-nginx/templates/controller-hpa.yaml index 50e41ac38..4fd2ce744 100644 --- a/charts/ingress-nginx/templates/controller-hpa.yaml +++ b/charts/ingress-nginx/templates/controller-hpa.yaml @@ -4,13 +4,13 @@ kind: HorizontalPodAutoscaler metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} - name: {{ template "ingress-nginx.controller.fullname" . }} + app.kubernetes.io/component: controller + name: {{ include "ingress-nginx.controller.fullname" . }} spec: scaleTargetRef: apiVersion: {{ template "deployment.apiVersion" . }} kind: Deployment - name: {{ template "ingress-nginx.controller.fullname" . }} + name: {{ include "ingress-nginx.controller.fullname" . }} minReplicas: {{ .Values.controller.autoscaling.minReplicas }} maxReplicas: {{ .Values.controller.autoscaling.maxReplicas }} metrics: diff --git a/charts/ingress-nginx/templates/controller-poddisruptionbudget.yaml b/charts/ingress-nginx/templates/controller-poddisruptionbudget.yaml index 0a47a62d3..9dc878911 100644 --- a/charts/ingress-nginx/templates/controller-poddisruptionbudget.yaml +++ b/charts/ingress-nginx/templates/controller-poddisruptionbudget.yaml @@ -4,12 +4,12 @@ kind: PodDisruptionBudget metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} - name: {{ template "ingress-nginx.controller.fullname" . }} + app.kubernetes.io/component: controller + name: {{ include "ingress-nginx.controller.fullname" . }} spec: selector: matchLabels: {{- include "ingress-nginx.selectorLabels" . | nindent 6 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller minAvailable: {{ .Values.controller.minAvailable }} {{- end }} diff --git a/charts/ingress-nginx/templates/controller-prometheusrules.yaml b/charts/ingress-nginx/templates/controller-prometheusrules.yaml index f458992fd..c0b7e89ca 100644 --- a/charts/ingress-nginx/templates/controller-prometheusrules.yaml +++ b/charts/ingress-nginx/templates/controller-prometheusrules.yaml @@ -2,13 +2,13 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ template "ingress-nginx.controller.fullname" . }} + name: {{ include "ingress-nginx.controller.fullname" . }} {{- if .Values.controller.metrics.prometheusRule.namespace }} namespace: {{ .Values.controller.metrics.prometheusRule.namespace }} {{- end }} labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- if .Values.controller.metrics.prometheusRule.additionalLabels }} {{- toYaml .Values.controller.metrics.prometheusRule.additionalLabels | nindent 4 }} {{- end }} diff --git a/charts/ingress-nginx/templates/controller-psp.yaml b/charts/ingress-nginx/templates/controller-psp.yaml index 7d540b315..9929587db 100644 --- a/charts/ingress-nginx/templates/controller-psp.yaml +++ b/charts/ingress-nginx/templates/controller-psp.yaml @@ -2,10 +2,10 @@ apiVersion: {{ template "podSecurityPolicy.apiVersion" . }} kind: PodSecurityPolicy metadata: - name: {{ template "ingress-nginx.fullname" . }} + name: {{ include "ingress-nginx.fullname" . }} labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller spec: allowedCapabilities: - NET_BIND_SERVICE diff --git a/charts/ingress-nginx/templates/controller-role.yaml b/charts/ingress-nginx/templates/controller-role.yaml index 7fd8da43f..4d313a961 100644 --- a/charts/ingress-nginx/templates/controller-role.yaml +++ b/charts/ingress-nginx/templates/controller-role.yaml @@ -4,8 +4,8 @@ kind: Role metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} - name: {{ template "ingress-nginx.fullname" . }} + app.kubernetes.io/component: controller + name: {{ include "ingress-nginx.fullname" . }} rules: - apiGroups: - "" @@ -83,6 +83,6 @@ rules: - apiGroups: [{{ template "podSecurityPolicy.apiGroup" . }}] resources: ['podsecuritypolicies'] verbs: ['use'] - resourceNames: [{{ template "ingress-nginx.fullname" . }}] + resourceNames: [{{ include "ingress-nginx.fullname" . }}] {{- end }} {{- end }} diff --git a/charts/ingress-nginx/templates/controller-rolebinding.yaml b/charts/ingress-nginx/templates/controller-rolebinding.yaml index ed3087a67..503135088 100644 --- a/charts/ingress-nginx/templates/controller-rolebinding.yaml +++ b/charts/ingress-nginx/templates/controller-rolebinding.yaml @@ -4,12 +4,12 @@ kind: RoleBinding metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} - name: {{ template "ingress-nginx.fullname" . }} + app.kubernetes.io/component: controller + name: {{ include "ingress-nginx.fullname" . }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: {{ template "ingress-nginx.fullname" . }} + name: {{ include "ingress-nginx.fullname" . }} subjects: - kind: ServiceAccount name: {{ template "ingress-nginx.serviceAccountName" . }} diff --git a/charts/ingress-nginx/templates/controller-service-metrics.yaml b/charts/ingress-nginx/templates/controller-service-metrics.yaml index 96aa1ce1a..08317a81a 100644 --- a/charts/ingress-nginx/templates/controller-service-metrics.yaml +++ b/charts/ingress-nginx/templates/controller-service-metrics.yaml @@ -7,11 +7,11 @@ metadata: {{- end }} labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- if .Values.controller.metrics.service.labels }} {{- toYaml .Values.controller.metrics.service.labels | nindent 4 }} {{- end }} - name: {{ template "ingress-nginx.controller.fullname" . }}-metrics + name: {{ include "ingress-nginx.controller.fullname" . }}-metrics spec: type: {{ .Values.controller.metrics.service.type }} {{- if .Values.controller.metrics.service.clusterIP }} @@ -32,5 +32,5 @@ spec: targetPort: metrics selector: {{- include "ingress-nginx.selectorLabels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- end }} diff --git a/charts/ingress-nginx/templates/controller-service-webhook.yaml b/charts/ingress-nginx/templates/controller-service-webhook.yaml index 39fd3440b..7a4dd51db 100644 --- a/charts/ingress-nginx/templates/controller-service-webhook.yaml +++ b/charts/ingress-nginx/templates/controller-service-webhook.yaml @@ -7,8 +7,8 @@ metadata: {{- end }} labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} - name: {{ template "ingress-nginx.controller.fullname" . }}-admission + app.kubernetes.io/component: controller + name: {{ include "ingress-nginx.controller.fullname" . }}-admission spec: type: {{ .Values.controller.admissionWebhooks.service.type }} {{- if .Values.controller.admissionWebhooks.service.clusterIP }} @@ -29,5 +29,5 @@ spec: targetPort: webhook selector: {{- include "ingress-nginx.selectorLabels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- end }} diff --git a/charts/ingress-nginx/templates/controller-service.yaml b/charts/ingress-nginx/templates/controller-service.yaml index 77c1dbcbd..a0006bce5 100644 --- a/charts/ingress-nginx/templates/controller-service.yaml +++ b/charts/ingress-nginx/templates/controller-service.yaml @@ -7,11 +7,11 @@ metadata: {{- end }} labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- if .Values.controller.service.labels }} {{- toYaml .Values.controller.service.labels | nindent 4 }} {{- end }} - name: {{ template "ingress-nginx.controller.fullname" . }} + name: {{ include "ingress-nginx.controller.fullname" . }} spec: type: {{ .Values.controller.service.type }} {{- if .Values.controller.service.clusterIP }} @@ -79,5 +79,5 @@ spec: {{- end }} selector: {{- include "ingress-nginx.selectorLabels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- end }} diff --git a/charts/ingress-nginx/templates/controller-serviceaccount.yaml b/charts/ingress-nginx/templates/controller-serviceaccount.yaml index f2d7c2c65..43585076c 100644 --- a/charts/ingress-nginx/templates/controller-serviceaccount.yaml +++ b/charts/ingress-nginx/templates/controller-serviceaccount.yaml @@ -4,6 +4,6 @@ kind: ServiceAccount metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller name: {{ template "ingress-nginx.serviceAccountName" . }} {{- end }} diff --git a/charts/ingress-nginx/templates/controller-servicemonitor.yaml b/charts/ingress-nginx/templates/controller-servicemonitor.yaml index ff71ea06a..c496ab4eb 100644 --- a/charts/ingress-nginx/templates/controller-servicemonitor.yaml +++ b/charts/ingress-nginx/templates/controller-servicemonitor.yaml @@ -2,13 +2,13 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "ingress-nginx.controller.fullname" . }} + name: {{ include "ingress-nginx.controller.fullname" . }} {{- if .Values.controller.metrics.serviceMonitor.namespace }} namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }} {{- end }} labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- if .Values.controller.metrics.serviceMonitor.additionalLabels }} {{- toYaml .Values.controller.metrics.serviceMonitor.additionalLabels | nindent 4 }} {{- end }} @@ -29,5 +29,5 @@ spec: selector: matchLabels: {{- include "ingress-nginx.selectorLabels" . | nindent 6 }} - app.kubernetes.io/component: {{ .Values.controller.name | quote }} + app.kubernetes.io/component: controller {{- end }} diff --git a/charts/ingress-nginx/templates/default-backend-deployment.yaml b/charts/ingress-nginx/templates/default-backend-deployment.yaml index 0c64e5305..3ff0a2c5c 100644 --- a/charts/ingress-nginx/templates/default-backend-deployment.yaml +++ b/charts/ingress-nginx/templates/default-backend-deployment.yaml @@ -4,13 +4,13 @@ kind: Deployment metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} - name: {{ template "ingress-nginx.defaultBackend.fullname" . }} + app.kubernetes.io/component: default-backend + name: {{ include "ingress-nginx.defaultBackend.fullname" . }} spec: selector: matchLabels: {{- include "ingress-nginx.selectorLabels" . | nindent 6 }} - app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} + app.kubernetes.io/component: default-backend replicas: {{ .Values.defaultBackend.replicaCount }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} template: @@ -20,7 +20,7 @@ spec: {{- end }} labels: {{- include "ingress-nginx.selectorLabels" . | nindent 8 }} - app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} + app.kubernetes.io/component: default-backend {{- if .Values.defaultBackend.podLabels }} {{- toYaml .Values.defaultBackend.podLabels | nindent 8 }} {{- end }} diff --git a/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml b/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml index f488b5aa1..b6c9c4499 100644 --- a/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml +++ b/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml @@ -4,12 +4,12 @@ kind: PodDisruptionBudget metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} - name: {{ template "ingress-nginx.defaultBackend.fullname" . }} + app.kubernetes.io/component: default-backend + name: {{ include "ingress-nginx.defaultBackend.fullname" . }} spec: selector: matchLabels: {{- include "ingress-nginx.selectorLabels" . | nindent 6 }} - app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} + app.kubernetes.io/component: default-backend minAvailable: {{ .Values.defaultBackend.minAvailable }} {{- end }} diff --git a/charts/ingress-nginx/templates/default-backend-psp.yaml b/charts/ingress-nginx/templates/default-backend-psp.yaml index a47cd2451..2673bf1f6 100644 --- a/charts/ingress-nginx/templates/default-backend-psp.yaml +++ b/charts/ingress-nginx/templates/default-backend-psp.yaml @@ -2,10 +2,10 @@ apiVersion: {{ template "podSecurityPolicy.apiVersion" . }} kind: PodSecurityPolicy metadata: - name: {{ template "ingress-nginx.fullname" . }}-backend + name: {{ include "ingress-nginx.fullname" . }}-backend labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} + app.kubernetes.io/component: default-backend spec: allowPrivilegeEscalation: false fsGroup: diff --git a/charts/ingress-nginx/templates/default-backend-role.yaml b/charts/ingress-nginx/templates/default-backend-role.yaml index 58179c937..23498de22 100644 --- a/charts/ingress-nginx/templates/default-backend-role.yaml +++ b/charts/ingress-nginx/templates/default-backend-role.yaml @@ -4,11 +4,11 @@ kind: Role metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} - name: {{ template "ingress-nginx.fullname" . }}-backend + app.kubernetes.io/component: default-backend + name: {{ include "ingress-nginx.fullname" . }}-backend rules: - apiGroups: [{{ template "podSecurityPolicy.apiGroup" . }}] resources: ['podsecuritypolicies'] verbs: ['use'] - resourceNames: [{{ template "ingress-nginx.fullname" . }}-backend] + resourceNames: [{{ include "ingress-nginx.fullname" . }}-backend] {{- end }} diff --git a/charts/ingress-nginx/templates/default-backend-rolebinding.yaml b/charts/ingress-nginx/templates/default-backend-rolebinding.yaml index 3639a097e..45558aac1 100644 --- a/charts/ingress-nginx/templates/default-backend-rolebinding.yaml +++ b/charts/ingress-nginx/templates/default-backend-rolebinding.yaml @@ -4,7 +4,7 @@ kind: RoleBinding metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} + app.kubernetes.io/component: default-backend name: {{ include "ingress-nginx.fullname" . }}-backend roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/ingress-nginx/templates/default-backend-service.yaml b/charts/ingress-nginx/templates/default-backend-service.yaml index 1fe015cf9..e74714d92 100644 --- a/charts/ingress-nginx/templates/default-backend-service.yaml +++ b/charts/ingress-nginx/templates/default-backend-service.yaml @@ -7,8 +7,8 @@ metadata: {{- end }} labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} - name: {{ template "ingress-nginx.defaultBackend.fullname" . }} + app.kubernetes.io/component: default-backend + name: {{ include "ingress-nginx.defaultBackend.fullname" . }} spec: type: {{ .Values.defaultBackend.service.type }} {{- if .Values.defaultBackend.service.clusterIP }} @@ -30,5 +30,5 @@ spec: targetPort: http selector: {{- include "ingress-nginx.selectorLabels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} + app.kubernetes.io/component: default-backend {{- end }} diff --git a/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml b/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml index 8a2e9ede3..96419cfa0 100644 --- a/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml +++ b/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml @@ -4,6 +4,6 @@ kind: ServiceAccount metadata: labels: {{- include "ingress-nginx.labels" . | nindent 4 }} - app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }} + app.kubernetes.io/component: default-backend name: {{ template "ingress-nginx.defaultBackend.serviceAccountName" . }} {{- end }} diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml index 5141a63c4..30d9646e7 100644 --- a/charts/ingress-nginx/values.yaml +++ b/charts/ingress-nginx/values.yaml @@ -2,7 +2,6 @@ ## Ref: https://github.com/kubernetes/ingress/blob/master/controllers/nginx/configuration.md ## controller: - name: controller image: repository: quay.io/kubernetes-ingress-controller/nginx-ingress-controller tag: "0.30.0" @@ -435,7 +434,6 @@ defaultBackend: ## enabled: false - name: default-backend image: repository: k8s.gcr.io/defaultbackend-amd64 tag: "1.5"