Update helm templates to match new chart name

2020-02-28 08:53:24 -06:00 · 2020-02-28 08:53:24 -06:00 · 710f1f2601
commit 710f1f2601
parent cfebfe4c99
41 changed files with 170 additions and 171 deletions
--- a/charts/ingress-nginx/.helmignore
+++ b/charts/ingress-nginx/.helmignore
@ -19,3 +19,4 @@
 .project
 .idea/
 *.tmproj
+.vscode/
--- a/charts/ingress-nginx/Chart.yaml
+++ b/charts/ingress-nginx/Chart.yaml
@ -1,6 +1,6 @@
 apiVersion: v1
 name: ingress-nginx
-version: 1.32.0
+version: 2.0.0
 appVersion: 0.30.0
 home: https://github.com/kubernetes/ingress-nginx
 description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration.
@ -12,7 +12,5 @@ sources:
  - https://github.com/kubernetes/ingress-nginx
 maintainers:
  - name: ChiefAlexander
-  - name: taharah
-    email: Trevor.G.Wood@gmail.com
 engine: gotpl
 kubeVersion: ">=1.10.0-0"
--- a/charts/ingress-nginx/templates/NOTES.txt
+++ b/charts/ingress-nginx/templates/NOTES.txt
@ -1,4 +1,4 @@
-The nginx-ingress controller has been installed.
+The ingress-nginx controller has been installed.

 {{- if contains "NodePort" .Values.controller.service.type }}
 Get the application URL by running these commands:
@ -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 "nginx-ingress.controller.fullname" . }})
+  export HTTP_NODE_PORT=$(kubectl --namespace {{ .Release.Namespace }} get services -o jsonpath="{.spec.ports[0].nodePort}" {{ template "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 "nginx-ingress.controller.fullname" . }})
+  export HTTPS_NODE_PORT=$(kubectl --namespace {{ .Release.Namespace }} get services -o jsonpath="{.spec.ports[1].nodePort}" {{ template "ingress-nginx.controller.fullname" . }})
 {{- end }}
  export NODE_IP=$(kubectl --namespace {{ .Release.Namespace }} get nodes -o jsonpath="{.items[0].status.addresses[1].address}")

@ -19,10 +19,10 @@ 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 "nginx-ingress.controller.fullname" . }}'
+You can watch the status by running 'kubectl --namespace {{ .Release.Namespace }} get services -o wide -w {{ template "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 "nginx-ingress.name" . }},component={{ .Values.controller.name }},release={{ .Release.Name }}")
+  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 }}")
  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
  echo "Visit http://127.0.0.1:8080 to access your application."
 {{- end }}
--- a/charts/ingress-nginx/templates/_helpers.tpl
+++ b/charts/ingress-nginx/templates/_helpers.tpl
@ -2,14 +2,14 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "nginx-ingress.name" -}}
+{{- define "ingress-nginx.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "nginx-ingress.chart" -}}
+{{- define "ingress-nginx.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

@ -17,7 +17,7 @@ Create chart name and version as used by the chart label.
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "nginx-ingress.fullname" -}}
+{{- define "ingress-nginx.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@ -34,8 +34,8 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 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 "nginx-ingress.controller.fullname" -}}
-{{- printf "%s-%s" (include "nginx-ingress.fullname" .) .Values.controller.name | trunc 63 | trimSuffix "-" -}}
+{{- define "ingress-nginx.controller.fullname" -}}
+{{- printf "%s-%s" (include "ingress-nginx.fullname" .) .Values.controller.name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

 {{/*
@ -47,8 +47,8 @@ service generated.
 Users can provide an override for an explicit service they want bound via `.Values.controller.publishService.pathOverride`

 */}}
-{{- define "nginx-ingress.controller.publishServicePath" -}}
-{{- $defServiceName := printf "%s/%s" .Release.Namespace (include "nginx-ingress.controller.fullname" .) -}}
+{{- define "ingress-nginx.controller.publishServicePath" -}}
+{{- $defServiceName := printf "%s/%s" .Release.Namespace (include "ingress-nginx.controller.fullname" .) -}}
 {{- $servicePath := default $defServiceName .Values.controller.publishService.pathOverride }}
 {{- print $servicePath | trimSuffix "-" -}}
 {{- end -}}
@ -57,16 +57,16 @@ Users can provide an override for an explicit service they want bound via `.Valu
 Create a default fully qualified default backend name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "nginx-ingress.defaultBackend.fullname" -}}
-{{- printf "%s-%s" (include "nginx-ingress.fullname" .) .Values.defaultBackend.name | trunc 63 | trimSuffix "-" -}}
+{{- define "ingress-nginx.defaultBackend.fullname" -}}
+{{- printf "%s-%s" (include "ingress-nginx.fullname" .) .Values.defaultBackend.name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

 {{/*
 Common labels
 */}}
-{{- define "nginx-ingress.labels" -}}
-helm.sh/chart: {{ include "nginx-ingress.chart" . }}
-{{ include "nginx-ingress.selectorLabels" . }}
+{{- define "ingress-nginx.labels" -}}
+helm.sh/chart: {{ include "ingress-nginx.chart" . }}
+{{ include "ingress-nginx.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@ -76,17 +76,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "nginx-ingress.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "nginx-ingress.name" . }}
+{{- define "ingress-nginx.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "ingress-nginx.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}

 {{/*
 Create the name of the controller service account to use
 */}}
-{{- define "nginx-ingress.serviceAccountName" -}}
+{{- define "ingress-nginx.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
-    {{ default (include "nginx-ingress.fullname" .) .Values.serviceAccount.name }}
+    {{ default (include "ingress-nginx.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
    {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
@ -95,9 +95,9 @@ Create the name of the controller service account to use
 {{/*
 Create the name of the backend service account to use - only used when podsecuritypolicy is also enabled
 */}}
-{{- define "nginx-ingress.defaultBackend.serviceAccountName" -}}
+{{- define "ingress-nginx.defaultBackend.serviceAccountName" -}}
 {{- if .Values.defaultBackend.serviceAccount.create -}}
-    {{ default (printf "%s-backend" (include "nginx-ingress.fullname" .)) .Values.defaultBackend.serviceAccount.name }}
+    {{ default (printf "%s-backend" (include "ingress-nginx.fullname" .)) .Values.defaultBackend.serviceAccount.name }}
 {{- else -}}
    {{ default "default-backend" .Values.defaultBackend.serviceAccount.name }}
 {{- end -}}
--- a/charts/ingress-nginx/templates/addheaders-configmap.yaml
+++ b/charts/ingress-nginx/templates/addheaders-configmap.yaml
@ -3,9 +3,9 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
-  name: {{ include "nginx-ingress.fullname" . }}-custom-add-headers
+  name: {{ include "ingress-nginx.fullname" . }}-custom-add-headers
 data:
 {{ toYaml .Values.controller.addHeaders | indent 2 }}
 {{- end }}
--- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml
+++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml
@ -2,13 +2,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name:  {{ include "nginx-ingress.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
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
-    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
+    app.kubernetes.io/component: admission-webhook
 rules:
  - apiGroups:
      - admissionregistration.k8s.io
@ -22,6 +22,6 @@ rules:
    resources: ['podsecuritypolicies']
    verbs:     ['use']
    resourceNames:
-    - {{ include "nginx-ingress.fullname" . }}-admission
+    - {{ include "ingress-nginx.fullname" . }}-admission
 {{- end }}
 {{- end }}
--- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml
+++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml
@ -2,19 +2,19 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name:  {{ include "nginx-ingress.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
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
-    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
+    app.kubernetes.io/component: admission-webhook
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: ClusterRole
-  name: {{ include "nginx-ingress.fullname" . }}-admission
+  name: {{ include "ingress-nginx.fullname" . }}-admission
 subjects:
  - kind: ServiceAccount
-    name: {{ include "nginx-ingress.fullname" . }}-admission
+    name: {{ include "ingress-nginx.fullname" . }}-admission
    namespace: {{ .Release.Namespace }}
 {{- end }}
--- 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,13 +2,13 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "nginx-ingress.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
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
-    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
+    app.kubernetes.io/component: admission-webhook
 spec:
  {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }}
  # Alpha feature since k8s 1.12
@ -16,14 +16,14 @@ spec:
  {{- end }}
  template:
    metadata:
-      name: {{ include "nginx-ingress.fullname" . }}-admission-create
+      name: {{ include "ingress-nginx.fullname" . }}-admission-create
 {{- with .Values.controller.admissionWebhooks.patch.podAnnotations }}
      annotations:
 {{ toYaml .  | indent 8 }}
 {{- end }}
      labels:
-        {{- include "nginx-ingress.labels" . | nindent 8 }}
-        app.kubernetes.io/component: {{ .Values.controller.name | quote }}
+        {{- include "ingress-nginx.labels" . | nindent 8 }}
+        app.kubernetes.io/component: admission-webhook
    spec:
      {{- if .Values.controller.admissionWebhooks.patch.priorityClassName }}
      priorityClassName: {{ .Values.controller.admissionWebhooks.patch.priorityClassName }}
@ -34,11 +34,11 @@ spec:
          imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.image.pullPolicy }}
          args:
            - create
-            - --host={{ template "nginx-ingress.controller.fullname" . }}-admission,{{ template "nginx-ingress.controller.fullname" . }}-admission.{{ .Release.Namespace }}.svc
+            - --host={{ template "ingress-nginx.controller.fullname" . }}-admission,{{ template "ingress-nginx.controller.fullname" . }}-admission.{{ .Release.Namespace }}.svc
            - --namespace={{ .Release.Namespace }}
-            - --secret-name={{ template "nginx-ingress.fullname". }}-admission
+            - --secret-name={{ template "ingress-nginx.fullname". }}-admission
      restartPolicy: OnFailure
-      serviceAccountName: {{ include "nginx-ingress.fullname" . }}-admission
+      serviceAccountName: {{ include "ingress-nginx.fullname" . }}-admission
      {{- with .Values.controller.admissionWebhooks.patch.nodeSelector }}
      nodeSelector:
 {{ toYaml . | indent 8 }}
--- 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,13 +2,13 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "nginx-ingress.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
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
-    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
+    app.kubernetes.io/component: admission-webhook
 spec:
  {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }}
  # Alpha feature since k8s 1.12
@ -16,14 +16,14 @@ spec:
  {{- end }}
  template:
    metadata:
-      name:   {{ include "nginx-ingress.fullname" . }}-admission-patch
+      name:   {{ include "ingress-nginx.fullname" . }}-admission-patch
 {{- with .Values.controller.admissionWebhooks.patch.podAnnotations }}
      annotations:
 {{ toYaml .  | indent 8 }}
 {{- end }}
      labels:
-        {{- include "nginx-ingress.labels" . | nindent 8 }}
-        app.kubernetes.io/component: {{ .Values.controller.name | quote }}
+        {{- include "ingress-nginx.labels" . | nindent 8 }}
+        app.kubernetes.io/component: admission-webhook
    spec:
      {{- if .Values.controller.admissionWebhooks.patch.priorityClassName }}
      priorityClassName: {{ .Values.controller.admissionWebhooks.patch.priorityClassName }}
@ -34,13 +34,13 @@ spec:
          imagePullPolicy: {{ .Values.controller.admissionWebhooks.patch.pullPolicy }}
          args:
            - patch
-            - --webhook-name={{ include "nginx-ingress.fullname" . }}-admission
+            - --webhook-name={{ include "ingress-nginx.fullname" . }}-admission
            - --namespace={{ .Release.Namespace }}
            - --patch-mutating=false
-            - --secret-name={{ template "nginx-ingress.fullname". }}-admission
+            - --secret-name={{ template "ingress-nginx.fullname". }}-admission
            - --patch-failure-policy={{ .Values.controller.admissionWebhooks.failurePolicy }}
      restartPolicy: OnFailure
-      serviceAccountName: {{ include "nginx-ingress.fullname" . }}-admission
+      serviceAccountName: {{ include "ingress-nginx.fullname" . }}-admission
      {{- with .Values.controller.admissionWebhooks.patch.nodeSelector }}
      nodeSelector:
 {{ toYaml . | indent 8 }}
--- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml
+++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml
@ -2,13 +2,13 @@
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
-  name: {{ include "nginx-ingress.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
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
-    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
+    app.kubernetes.io/component: admission-webhook
 spec:
  allowPrivilegeEscalation: false
  fsGroup:
--- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml
+++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml
@ -2,13 +2,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name:  {{ include "nginx-ingress.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
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
-    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
+    app.kubernetes.io/component: admission-webhook
 rules:
  - apiGroups:
      - ""
--- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml
+++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml
@ -2,19 +2,19 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name:  {{ include "nginx-ingress.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
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
-    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
+    app.kubernetes.io/component: admission-webhook
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
-  name: {{ include "nginx-ingress.fullname" . }}-admission
+  name: {{ include "ingress-nginx.fullname" . }}-admission
 subjects:
  - kind: ServiceAccount
-    name: {{ include "nginx-ingress.fullname" . }}-admission
+    name: {{ include "ingress-nginx.fullname" . }}-admission
    namespace: {{ .Release.Namespace }}
 {{- end }}
--- a/charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
+++ b/charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
@ -2,11 +2,11 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name:  {{ include "nginx-ingress.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
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
-    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
+    app.kubernetes.io/component: admission-webhook
 {{- end }}
--- a/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
+++ b/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
@ -3,9 +3,9 @@ apiVersion: admissionregistration.k8s.io/v1beta1
 kind: ValidatingWebhookConfiguration
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: admission-webhook
-  name: {{ include "nginx-ingress.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 "nginx-ingress.controller.fullname" . }}-admission
+        name: {{ template "ingress-nginx.controller.fullname" . }}-admission
        path: /extensions/v1beta1/ingresses
 {{- end }}
--- a/charts/ingress-nginx/templates/clusterrole.yaml
+++ b/charts/ingress-nginx/templates/clusterrole.yaml
@ -3,8 +3,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
-  name: {{ include "nginx-ingress.fullname" . }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
+  name: {{ include "ingress-nginx.fullname" . }}
 rules:
  - apiGroups:
      - ""
--- a/charts/ingress-nginx/templates/clusterrolebinding.yaml
+++ b/charts/ingress-nginx/templates/clusterrolebinding.yaml
@ -3,14 +3,14 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
-  name: {{ include "nginx-ingress.fullname" . }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
+  name: {{ include "ingress-nginx.fullname" . }}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: ClusterRole
-  name: {{ include "nginx-ingress.fullname" . }}
+  name: {{ include "ingress-nginx.fullname" . }}
 subjects:
  - kind: ServiceAccount
-    name: {{ template "nginx-ingress.serviceAccountName" . }}
+    name: {{ template "ingress-nginx.serviceAccountName" . }}
    namespace: {{ .Release.Namespace }}
 {{- end -}}
--- a/charts/ingress-nginx/templates/controller-configmap.yaml
+++ b/charts/ingress-nginx/templates/controller-configmap.yaml
@ -3,17 +3,17 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
  annotations:
 {{ toYaml .Values.controller.configAnnotations | indent 4}}
-  name: {{ template "nginx-ingress.controller.fullname" . }}
+  name: {{ template "ingress-nginx.controller.fullname" . }}
 data:
 {{- if .Values.controller.addHeaders }}
-  add-headers: {{ .Release.Namespace }}/{{ include "nginx-ingress.fullname" . }}-custom-add-headers
+  add-headers: {{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-custom-add-headers
 {{- end }}
 {{- if or .Values.controller.proxySetHeaders .Values.controller.headers }}
-  proxy-set-headers: {{ .Release.Namespace }}/{{ include "nginx-ingress.fullname" . }}-custom-proxy-headers
+  proxy-set-headers: {{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-custom-proxy-headers
 {{- end }}
 {{- if .Values.controller.config }}
 {{ toYaml .Values.controller.config | indent 2 }}
--- a/charts/ingress-nginx/templates/controller-daemonset.yaml
+++ b/charts/ingress-nginx/templates/controller-daemonset.yaml
@ -5,15 +5,15 @@ apiVersion: {{ template "deployment.apiVersion" . }}
 kind: DaemonSet
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
-  name: {{ template "nginx-ingress.controller.fullname" . }}
+  name: {{ template "ingress-nginx.controller.fullname" . }}
  annotations:
 {{ toYaml .Values.controller.deploymentAnnotations | indent 4}}
 spec:
  selector:
    matchLabels:
-      {{- include "nginx-ingress.selectorLabels" . | nindent 6 }}
+      {{- include "ingress-nginx.selectorLabels" . | nindent 6 }}
      app.kubernetes.io/component: {{ .Values.controller.name | quote }}
  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
  updateStrategy:
@ -28,7 +28,7 @@ spec:
      {{- end }}
      {{- end }}
      labels:
-        {{- include "nginx-ingress.selectorLabels" . | nindent 8 }}
+        {{- include "ingress-nginx.selectorLabels" . | nindent 8 }}
        app.kubernetes.io/component: {{ .Values.controller.name | quote }}
        {{- if .Values.controller.podLabels }}
 {{ toYaml .Values.controller.podLabels | indent 8}}
@ -51,7 +51,7 @@ spec:
 {{ toYaml .Values.controller.podSecurityContext | indent 8 }}
      {{- end }}
      containers:
-        - name: {{ template "nginx-ingress.name" . }}-{{ .Values.controller.name }}
+        - name: {{ template "ingress-nginx.name" . }}-{{ .Values.controller.name }}
          image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"
          imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
          {{- if .Values.controller.lifecycle }}
@ -61,7 +61,7 @@ spec:
          args:
            - /nginx-ingress-controller
          {{- if .Values.defaultBackend.enabled }}
-            - --default-backend-service={{ .Release.Namespace }}/{{ template "nginx-ingress.defaultBackend.fullname" . }}
+            - --default-backend-service={{ .Release.Namespace }}/{{ template "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 }}
@ -70,7 +70,7 @@ spec:
            {{- end }}
          {{- end }}
          {{- if and (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) .Values.controller.publishService.enabled }}
-            - --publish-service={{ template "nginx-ingress.controller.publishServicePath" . }}
+            - --publish-service={{ template "ingress-nginx.controller.publishServicePath" . }}
          {{- end }}
          {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }}
            - --election-id={{ .Values.controller.electionID }}
@ -79,15 +79,15 @@ spec:
            - --ingress-class={{ .Values.controller.ingressClass }}
          {{- end }}
          {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }}
-            - --configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.controller.fullname" . }}
+            - --configmap={{ .Release.Namespace }}/{{ template "ingress-nginx.controller.fullname" . }}
          {{- else }}
-            - --nginx-configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.controller.fullname" . }}
+            - --nginx-configmap={{ .Release.Namespace }}/{{ template "ingress-nginx.controller.fullname" . }}
          {{- end }}
          {{- if .Values.tcp }}
-            - --tcp-services-configmap={{ .Release.Namespace }}/{{ include "nginx-ingress.fullname" . }}-tcp
+            - --tcp-services-configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-tcp
          {{- end }}
          {{- if .Values.udp }}
-            - --udp-services-configmap={{ .Release.Namespace }}/{{ include "nginx-ingress.fullname" . }}-udp
+            - --udp-services-configmap={{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-udp
          {{- end }}
          {{- if .Values.controller.scope.enabled }}
            - --watch-namespace={{ default .Release.Namespace .Values.controller.scope.namespace }}
@ -225,7 +225,7 @@ spec:
      affinity:
 {{ toYaml .Values.controller.affinity | indent 8 }}
    {{- end }}
-      serviceAccountName: {{ template "nginx-ingress.serviceAccountName" . }}
+      serviceAccountName: {{ template "ingress-nginx.serviceAccountName" . }}
      terminationGracePeriodSeconds: 60
 {{- if (or .Values.controller.customTemplate.configMapName .Values.controller.extraVolumeMounts .Values.controller.admissionWebhooks.enabled .Values.controller.extraVolumes) }}
      volumes:
@ -241,7 +241,7 @@ spec:
 {{- if .Values.controller.admissionWebhooks.enabled }}
        - name: webhook-cert
          secret:
-            secretName: {{ template "nginx-ingress.fullname". }}-admission
+            secretName: {{ template "ingress-nginx.fullname". }}-admission
 {{- end }}
 {{- if .Values.controller.extraVolumes }}
 {{ toYaml .Values.controller.extraVolumes | indent 8}}
--- a/charts/ingress-nginx/templates/controller-deployment.yaml
+++ b/charts/ingress-nginx/templates/controller-deployment.yaml
@ -3,15 +3,15 @@ apiVersion: {{ template "deployment.apiVersion" . }}
 kind: Deployment
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
-  name: {{ template "nginx-ingress.controller.fullname" . }}
+  name: {{ template "ingress-nginx.controller.fullname" . }}
  annotations:
 {{ toYaml .Values.controller.deploymentAnnotations | indent 4}}
 spec:
  selector:
    matchLabels:
-      {{- include "nginx-ingress.selectorLabels" . | nindent 6 }}
+      {{- include "ingress-nginx.selectorLabels" . | nindent 6 }}
      app.kubernetes.io/component: {{ .Values.controller.name | quote }}
 {{- if not .Values.controller.autoscaling.enabled }}
  replicas: {{ .Values.controller.replicaCount }}
@ -29,7 +29,7 @@ spec:
      {{- end }}
      {{- end }}
      labels:
-        {{- include "nginx-ingress.selectorLabels" . | nindent 8 }}
+        {{- include "ingress-nginx.selectorLabels" . | nindent 8 }}
        app.kubernetes.io/component: {{ .Values.controller.name | quote }}
        {{- if .Values.controller.podLabels }}
 {{ toYaml .Values.controller.podLabels | indent 8 }}
@ -52,7 +52,7 @@ spec:
 {{ toYaml .Values.controller.podSecurityContext | indent 8 }}
      {{- end }}
      containers:
-        - name: {{ template "nginx-ingress.name" . }}-{{ .Values.controller.name }}
+        - name: {{ template "ingress-nginx.name" . }}-{{ .Values.controller.name }}
          image: "{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag }}"
          imagePullPolicy: "{{ .Values.controller.image.pullPolicy }}"
          {{- if .Values.controller.lifecycle }}
@ -62,7 +62,7 @@ spec:
          args:
            - /nginx-ingress-controller
          {{- if .Values.defaultBackend.enabled }}
-            - --default-backend-service={{ .Release.Namespace }}/{{ template "nginx-ingress.defaultBackend.fullname" . }}
+            - --default-backend-service={{ .Release.Namespace }}/{{ template "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 }}
@ -71,7 +71,7 @@ spec:
            {{- end }}
          {{- end }}
          {{- if and (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) .Values.controller.publishService.enabled }}
-            - --publish-service={{ template "nginx-ingress.controller.publishServicePath" . }}
+            - --publish-service={{ template "ingress-nginx.controller.publishServicePath" . }}
          {{- end }}
          {{- if (semverCompare ">=0.9.0-beta.1" .Values.controller.image.tag) }}
            - --election-id={{ .Values.controller.electionID }}
@ -80,15 +80,15 @@ 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 "nginx-ingress.controller.fullname" . }}
+            - --configmap={{ default .Release.Namespace .Values.controller.configMapNamespace }}/{{ template "ingress-nginx.controller.fullname" . }}
          {{- else }}
-            - --nginx-configmap={{ default .Release.Namespace .Values.controller.configMapNamespace }}/{{ template "nginx-ingress.controller.fullname" . }}
+            - --nginx-configmap={{ default .Release.Namespace .Values.controller.configMapNamespace }}/{{ template "ingress-nginx.controller.fullname" . }}
          {{- end }}
          {{- if .Values.tcp }}
-            - --tcp-services-configmap={{ default .Release.Namespace .Values.controller.tcp.configMapNamespace }}/{{ include "nginx-ingress.fullname" . }}-tcp
+            - --tcp-services-configmap={{ default .Release.Namespace .Values.controller.tcp.configMapNamespace }}/{{ include "ingress-nginx.fullname" . }}-tcp
          {{- end }}
          {{- if .Values.udp }}
-            - --udp-services-configmap={{ default .Release.Namespace .Values.controller.udp.configMapNamespace }}/{{ include "nginx-ingress.fullname" . }}-udp
+            - --udp-services-configmap={{ default .Release.Namespace .Values.controller.udp.configMapNamespace }}/{{ include "ingress-nginx.fullname" . }}-udp
          {{- end }}
          {{- if .Values.controller.scope.enabled }}
            - --watch-namespace={{ default .Release.Namespace .Values.controller.scope.namespace }}
@ -217,7 +217,7 @@ spec:
      affinity:
 {{ toYaml .Values.controller.affinity | indent 8 }}
    {{- end }}
-      serviceAccountName: {{ template "nginx-ingress.serviceAccountName" . }}
+      serviceAccountName: {{ template "ingress-nginx.serviceAccountName" . }}
      terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
 {{- if (or .Values.controller.customTemplate.configMapName .Values.controller.extraVolumeMounts .Values.controller.admissionWebhooks.enabled .Values.controller.extraVolumes) }}
      volumes:
@ -233,7 +233,7 @@ spec:
 {{- if .Values.controller.admissionWebhooks.enabled }}
        - name: webhook-cert
          secret:
-            secretName: {{ template "nginx-ingress.fullname". }}-admission
+            secretName: {{ template "ingress-nginx.fullname". }}-admission
 {{- end }}
 {{- if .Values.controller.extraVolumes }}
 {{ toYaml .Values.controller.extraVolumes | indent 8}}
--- a/charts/ingress-nginx/templates/controller-hpa.yaml
+++ b/charts/ingress-nginx/templates/controller-hpa.yaml
@ -4,14 +4,14 @@ apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
-  name: {{ template "nginx-ingress.controller.fullname" . }}
+  name: {{ template "ingress-nginx.controller.fullname" . }}
 spec:
  scaleTargetRef:
    apiVersion: {{ template "deployment.apiVersion" . }}
    kind: Deployment
-    name: {{ template "nginx-ingress.controller.fullname" . }}
+    name: {{ template "ingress-nginx.controller.fullname" . }}
  minReplicas: {{ .Values.controller.autoscaling.minReplicas }}
  maxReplicas: {{ .Values.controller.autoscaling.maxReplicas }}
  metrics:
--- a/charts/ingress-nginx/templates/controller-metrics-service.yaml
+++ b/charts/ingress-nginx/templates/controller-metrics-service.yaml
@ -12,9 +12,9 @@ metadata:
 {{- if .Values.controller.metrics.service.labels }}
 {{ toYaml .Values.controller.metrics.service.labels | indent 4 }}
 {{- end }}
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
-  name: {{ template "nginx-ingress.controller.fullname" . }}-metrics
+  name: {{ template "ingress-nginx.controller.fullname" . }}-metrics
 spec:
 {{- if not .Values.controller.metrics.service.omitClusterIP }}
  {{- with .Values.controller.metrics.service.clusterIP }}
@ -37,7 +37,7 @@ spec:
      port: {{ .Values.controller.metrics.service.servicePort }}
      targetPort: metrics
  selector:
-    {{- include "nginx-ingress.selectorLabels" . | nindent 4 }}
+    {{- include "ingress-nginx.selectorLabels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
  type: "{{ .Values.controller.metrics.service.type }}"
 {{- end }}
--- a/charts/ingress-nginx/templates/controller-poddisruptionbudget.yaml
+++ b/charts/ingress-nginx/templates/controller-poddisruptionbudget.yaml
@ -3,13 +3,13 @@ apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
-  name: {{ template "nginx-ingress.controller.fullname" . }}
+  name: {{ template "ingress-nginx.controller.fullname" . }}
 spec:
  selector:
    matchLabels:
-      {{- include "nginx-ingress.selectorLabels" . | nindent 6 }}
+      {{- include "ingress-nginx.selectorLabels" . | nindent 6 }}
      app.kubernetes.io/component: {{ .Values.controller.name | quote }}
  minAvailable: {{ .Values.controller.minAvailable }}
 {{- end }}
--- a/charts/ingress-nginx/templates/controller-prometheusrules.yaml
+++ b/charts/ingress-nginx/templates/controller-prometheusrules.yaml
@ -2,12 +2,12 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  name: {{ template "nginx-ingress.controller.fullname" . }}
+  name: {{ template "ingress-nginx.controller.fullname" . }}
  {{- if .Values.controller.metrics.prometheusRule.namespace }}
  namespace: {{ .Values.controller.metrics.prometheusRule.namespace }}
  {{- end }}
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
    {{- if .Values.controller.metrics.prometheusRule.additionalLabels }}
 {{ toYaml .Values.controller.metrics.prometheusRule.additionalLabels | indent 4 }}
@ -15,7 +15,7 @@ metadata:
 spec:
  {{- with .Values.controller.metrics.prometheusRule.rules }}
  groups:
-  - name: {{ template "nginx-ingress.name" $ }}
+  - name: {{ template "ingress-nginx.name" $ }}
    rules: {{- toYaml . | nindent 4 }}
  {{- end }}
 {{- end }}
--- a/charts/ingress-nginx/templates/controller-psp.yaml
+++ b/charts/ingress-nginx/templates/controller-psp.yaml
@ -2,9 +2,9 @@
 apiVersion: {{ template "podSecurityPolicy.apiVersion" . }}
 kind: PodSecurityPolicy
 metadata:
-  name: {{ include "nginx-ingress.fullname" . }}
+  name: {{ include "ingress-nginx.fullname" . }}
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
 spec:
  allowedCapabilities:
--- a/charts/ingress-nginx/templates/controller-role.yaml
+++ b/charts/ingress-nginx/templates/controller-role.yaml
@ -3,9 +3,9 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
-  name: {{ include "nginx-ingress.fullname" . }}
+  name: {{ include "ingress-nginx.fullname" . }}
 rules:
  - apiGroups:
      - ""
@ -83,7 +83,7 @@ rules:
  - apiGroups:      ['{{ template "podSecurityPolicy.apiGroup" . }}']
    resources:      ['podsecuritypolicies']
    verbs:          ['use']
-    resourceNames:  [{{ include "nginx-ingress.fullname" . }}]
+    resourceNames:  [{{ include "ingress-nginx.fullname" . }}]
 {{- end }}

 {{- end -}}
--- a/charts/ingress-nginx/templates/controller-rolebinding.yaml
+++ b/charts/ingress-nginx/templates/controller-rolebinding.yaml
@ -3,15 +3,15 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
-  name: {{ include "nginx-ingress.fullname" . }}
+  name: {{ include "ingress-nginx.fullname" . }}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
-  name: {{ include "nginx-ingress.fullname" . }}
+  name: {{ include "ingress-nginx.fullname" . }}
 subjects:
  - kind: ServiceAccount
-    name: {{ template "nginx-ingress.serviceAccountName" . }}
+    name: {{ template "ingress-nginx.serviceAccountName" . }}
    namespace: {{ .Release.Namespace }}
 {{- end -}}
--- a/charts/ingress-nginx/templates/controller-service.yaml
+++ b/charts/ingress-nginx/templates/controller-service.yaml
@ -12,9 +12,9 @@ metadata:
 {{- if .Values.controller.service.labels }}
 {{ toYaml .Values.controller.service.labels | indent 4 }}
 {{- end }}
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
-  name: {{ template "nginx-ingress.controller.fullname" . }}
+  name: {{ template "ingress-nginx.controller.fullname" . }}
 spec:
 {{- if not .Values.controller.service.omitClusterIP }}
  {{- with .Values.controller.service.clusterIP }}
@ -84,7 +84,7 @@ spec:
     {{- end }}
  {{- end }}
  selector:
-    {{- include "nginx-ingress.selectorLabels" . | nindent 4 }}
+    {{- include "ingress-nginx.selectorLabels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
  type: "{{ .Values.controller.service.type }}"
 {{- end }}
--- a/charts/ingress-nginx/templates/controller-serviceaccount.yaml
+++ b/charts/ingress-nginx/templates/controller-serviceaccount.yaml
@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
-  name: {{ template "nginx-ingress.serviceAccountName" . }}
+  name: {{ template "ingress-nginx.serviceAccountName" . }}
 {{- end -}}
--- a/charts/ingress-nginx/templates/controller-servicemonitor.yaml
+++ b/charts/ingress-nginx/templates/controller-servicemonitor.yaml
@ -2,12 +2,12 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ template "nginx-ingress.controller.fullname" . }}
+  name: {{ template "ingress-nginx.controller.fullname" . }}
  {{- if .Values.controller.metrics.serviceMonitor.namespace }}
  namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }}
  {{- end }}
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
    {{- if .Values.controller.metrics.serviceMonitor.additionalLabels }}
 {{ toYaml .Values.controller.metrics.serviceMonitor.additionalLabels | indent 4 }}
@ -29,6 +29,6 @@ spec:
  {{- end }}
  selector:
    matchLabels:
-      {{- include "nginx-ingress.selectorLabels" . | nindent 6 }}
+      {{- include "ingress-nginx.selectorLabels" . | nindent 6 }}
      app.kubernetes.io/component: {{ .Values.controller.name | quote }}
 {{- end }}
--- a/charts/ingress-nginx/templates/controller-webhook-service.yaml
+++ b/charts/ingress-nginx/templates/controller-webhook-service.yaml
@ -9,9 +9,9 @@ metadata:
  {{- end }}
 {{- end }}
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
-  name: {{ template "nginx-ingress.controller.fullname" . }}-admission
+  name: {{ template "ingress-nginx.controller.fullname" . }}-admission
 spec:
 {{- if not .Values.controller.admissionWebhooks.service.omitClusterIP }}
  {{- with .Values.controller.admissionWebhooks.service.clusterIP }}
@ -34,7 +34,7 @@ spec:
      port: 443
      targetPort: webhook
  selector:
-    {{- include "nginx-ingress.selectorLabels" . | nindent 4 }}
+    {{- include "ingress-nginx.selectorLabels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
  type: "{{ .Values.controller.admissionWebhooks.service.type }}"
 {{- end }}
--- a/charts/ingress-nginx/templates/default-backend-deployment.yaml
+++ b/charts/ingress-nginx/templates/default-backend-deployment.yaml
@ -3,13 +3,13 @@ apiVersion: {{ template "deployment.apiVersion" . }}
 kind: Deployment
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
-  name: {{ template "nginx-ingress.defaultBackend.fullname" . }}
+  name: {{ template "ingress-nginx.defaultBackend.fullname" . }}
 spec:
  selector:
    matchLabels:
-      {{- include "nginx-ingress.selectorLabels" . | nindent 6 }}
+      {{- include "ingress-nginx.selectorLabels" . | nindent 6 }}
      app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
  replicas: {{ .Values.defaultBackend.replicaCount }}
  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
@ -22,7 +22,7 @@ spec:
      {{- end }}
    {{- end }}
      labels:
-        {{- include "nginx-ingress.selectorLabels" . | nindent 8 }}
+        {{- include "ingress-nginx.selectorLabels" . | nindent 8 }}
        app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
        {{- if .Values.defaultBackend.podLabels }}
 {{ toYaml .Values.defaultBackend.podLabels | indent 8 }}
@ -40,7 +40,7 @@ spec:
 {{ toYaml .Values.defaultBackend.podSecurityContext | indent 8 }}
      {{- end }}
      containers:
-        - name: {{ template "nginx-ingress.name" . }}-{{ .Values.defaultBackend.name }}
+        - name: {{ template "ingress-nginx.name" . }}-{{ .Values.defaultBackend.name }}
          image: "{{ .Values.defaultBackend.image.repository }}:{{ .Values.defaultBackend.image.tag }}"
          imagePullPolicy: "{{ .Values.defaultBackend.image.pullPolicy }}"
          args:
@ -87,7 +87,7 @@ spec:
      nodeSelector:
 {{ toYaml .Values.defaultBackend.nodeSelector | indent 8 }}
    {{- end }}
-      serviceAccountName: {{ template "nginx-ingress.defaultBackend.serviceAccountName" . }}
+      serviceAccountName: {{ template "ingress-nginx.defaultBackend.serviceAccountName" . }}
    {{- if .Values.defaultBackend.tolerations }}
      tolerations:
 {{ toYaml .Values.defaultBackend.tolerations | indent 8 }}
--- a/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml
+++ b/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml
@ -3,13 +3,13 @@ apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
-  name: {{ template "nginx-ingress.defaultBackend.fullname" . }}
+  name: {{ template "ingress-nginx.defaultBackend.fullname" . }}
 spec:
  selector:
    matchLabels:
-      {{- include "nginx-ingress.selectorLabels" . | nindent 6 }}
+      {{- include "ingress-nginx.selectorLabels" . | nindent 6 }}
      app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
  minAvailable: {{ .Values.defaultBackend.minAvailable }}
 {{- end }}
--- a/charts/ingress-nginx/templates/default-backend-psp.yaml
+++ b/charts/ingress-nginx/templates/default-backend-psp.yaml
@ -2,9 +2,9 @@
 apiVersion: {{ template "podSecurityPolicy.apiVersion" . }}
 kind: PodSecurityPolicy
 metadata:
-  name: {{ include "nginx-ingress.fullname" . }}-backend
+  name: {{ include "ingress-nginx.fullname" . }}-backend
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
 spec:
  allowPrivilegeEscalation: false
--- a/charts/ingress-nginx/templates/default-backend-role.yaml
+++ b/charts/ingress-nginx/templates/default-backend-role.yaml
@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
-  name: {{ include "nginx-ingress.fullname" . }}-backend
+  name: {{ include "ingress-nginx.fullname" . }}-backend
 rules:
  - apiGroups:      ['{{ template "podSecurityPolicy.apiGroup" . }}']
    resources:      ['podsecuritypolicies']
    verbs:          ['use']
-    resourceNames:  [{{ include "nginx-ingress.fullname" . }}-backend]
+    resourceNames:  [{{ include "ingress-nginx.fullname" . }}-backend]
 {{- end -}}
--- a/charts/ingress-nginx/templates/default-backend-rolebinding.yaml
+++ b/charts/ingress-nginx/templates/default-backend-rolebinding.yaml
@ -3,15 +3,15 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
-  name: {{ include "nginx-ingress.fullname" . }}-backend
+  name: {{ include "ingress-nginx.fullname" . }}-backend
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
-  name: {{ include "nginx-ingress.fullname" . }}-backend
+  name: {{ include "ingress-nginx.fullname" . }}-backend
 subjects:
  - kind: ServiceAccount
-    name: {{ template "nginx-ingress.defaultBackend.serviceAccountName" . }}
+    name: {{ template "ingress-nginx.defaultBackend.serviceAccountName" . }}
    namespace: {{ .Release.Namespace }}
 {{- end -}}
--- a/charts/ingress-nginx/templates/default-backend-service.yaml
+++ b/charts/ingress-nginx/templates/default-backend-service.yaml
@ -9,9 +9,9 @@ metadata:
  {{- end }}
 {{- end }}
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
-  name: {{ template "nginx-ingress.defaultBackend.fullname" . }}
+  name: {{ template "ingress-nginx.defaultBackend.fullname" . }}
 spec:
 {{- if not .Values.defaultBackend.service.omitClusterIP }}
  {{- with .Values.defaultBackend.service.clusterIP }}
@ -35,7 +35,7 @@ spec:
      protocol: TCP
      targetPort: http
  selector:
-    {{- include "nginx-ingress.selectorLabels" . | nindent 4 }}
+    {{- include "ingress-nginx.selectorLabels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
  type: "{{ .Values.defaultBackend.service.type }}"
 {{- end }}
--- a/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml
+++ b/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml
@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.defaultBackend.name | quote }}
-  name: {{ template "nginx-ingress.defaultBackend.serviceAccountName" . }}
+  name: {{ template "ingress-nginx.defaultBackend.serviceAccountName" . }}
 {{- end }}
--- a/charts/ingress-nginx/templates/proxyheaders-configmap.yaml
+++ b/charts/ingress-nginx/templates/proxyheaders-configmap.yaml
@ -3,9 +3,9 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
-  name: {{ include "nginx-ingress.fullname" . }}-custom-proxy-headers
+  name: {{ include "ingress-nginx.fullname" . }}-custom-proxy-headers
 data:
 {{- if .Values.controller.proxySetHeaders }}
 {{ toYaml .Values.controller.proxySetHeaders | indent 2 }}
--- a/charts/ingress-nginx/templates/tcp-configmap.yaml
+++ b/charts/ingress-nginx/templates/tcp-configmap.yaml
@ -3,11 +3,11 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
  annotations:
 {{ toYaml .Values.controller.tcp.annotations | indent 4}}
-  name: {{ include "nginx-ingress.fullname" . }}-tcp
+  name: {{ include "ingress-nginx.fullname" . }}-tcp
 data:
 {{ tpl (toYaml .Values.tcp) . | indent 2 }}
 {{- end }}
--- a/charts/ingress-nginx/templates/udp-configmap.yaml
+++ b/charts/ingress-nginx/templates/udp-configmap.yaml
@ -3,11 +3,11 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  labels:
-    {{- include "nginx-ingress.labels" . | nindent 4 }}
+    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: {{ .Values.controller.name | quote }}
  annotations:
 {{ toYaml .Values.controller.udp.annotations | indent 4}}
-  name: {{ include "nginx-ingress.fullname" . }}-udp
+  name: {{ include "ingress-nginx.fullname" . }}-udp
 data:
 {{ tpl (toYaml .Values.udp) . | indent 2 }}
 {{- end }}
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@ -168,7 +168,7 @@ controller:
    #         - key: app
    #           operator: In
    #           values:
-    #           - nginx-ingress
+    #           - ingress-nginx
    #       topologyKey: kubernetes.io/hostname

    # # An example of required pod anti-affinity
@ -179,7 +179,7 @@ controller:
    #       - key: app
    #         operator: In
    #         values:
-    #         - nginx-ingress
+    #         - ingress-nginx
    #     topologyKey: "kubernetes.io/hostname"

  ## terminationGracePeriodSeconds