From cfcf87ac254dcbb2d4aa1c866e20dd7e8e55b8e5 Mon Sep 17 00:00:00 2001
From: Luke Reed <luke@lreed.net>
Date: Tue, 21 Apr 2020 15:39:52 -0400
Subject: [PATCH] fixing pdb label selectors to match the labels on pods
 (#21950)

Signed-off-by: Luke Reed <luke@lreed.net>
---
 stable/nginx-ingress/Chart.yaml                               | 2 +-
 .../templates/controller-poddisruptionbudget.yaml             | 2 --
 .../templates/default-backend-poddisruptionbudget.yaml        | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml
index c147d9bfe2..8ac2db5550 100644
--- a/stable/nginx-ingress/Chart.yaml
+++ b/stable/nginx-ingress/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nginx-ingress
-version: 1.36.2
+version: 1.36.3
 appVersion: 0.30.0
 home: https://github.com/kubernetes/ingress-nginx
 description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration.
diff --git a/stable/nginx-ingress/templates/controller-poddisruptionbudget.yaml b/stable/nginx-ingress/templates/controller-poddisruptionbudget.yaml
index d1dab8fba3..888515a25a 100644
--- a/stable/nginx-ingress/templates/controller-poddisruptionbudget.yaml
+++ b/stable/nginx-ingress/templates/controller-poddisruptionbudget.yaml
@@ -14,8 +14,6 @@ spec:
     matchLabels:
       app: {{ template "nginx-ingress.name" . }}
       release: {{ template "nginx-ingress.releaseLabel" . }}
-      {{- if .Values.controller.useComponentLabel }}
       app.kubernetes.io/component: controller
-      {{- end }}
   minAvailable: {{ .Values.controller.minAvailable }}
 {{- end }}
diff --git a/stable/nginx-ingress/templates/default-backend-poddisruptionbudget.yaml b/stable/nginx-ingress/templates/default-backend-poddisruptionbudget.yaml
index 5719fd9169..0713c012ed 100644
--- a/stable/nginx-ingress/templates/default-backend-poddisruptionbudget.yaml
+++ b/stable/nginx-ingress/templates/default-backend-poddisruptionbudget.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: {{ template "nginx-ingress.name" . }}
     chart: {{ template "nginx-ingress.chart" . }}
-    component: "{{ .Values.defaultBackend.name }}"
+    app.kubernetes.io/component: default-backend
     heritage: {{ .Release.Service }}
     release: {{ template "nginx-ingress.releaseLabel" . }}
   name: {{ template "nginx-ingress.defaultBackend.fullname" . }}
@@ -14,6 +14,6 @@ spec:
     matchLabels:
       app: {{ template "nginx-ingress.name" . }}
       release: {{ template "nginx-ingress.releaseLabel" . }}
-      component: "{{ .Values.defaultBackend.name }}"
+      app.kubernetes.io/component: default-backend
   minAvailable: {{ .Values.defaultBackend.minAvailable }}
 {{- end }}