merge with master, reapply patch to do signoff (#7351)

Signed-off-by: David J. M. Karlsen <david@davidkarlsen.com>

stable/nginx-ingress/Chart.yaml

@@ -1,5 +1,5 @@
 name: nginx-ingress
-version: 0.28.0
+version: 0.28.1
 appVersion: 0.19.0
 home: https://github.com/kubernetes/ingress-nginx
 description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration.

stable/nginx-ingress/README.md

@@ -174,6 +174,10 @@ as described [here](https://github.com/kubernetes/ingress-nginx/blob/master/docs
 $ helm install stable/nginx-ingress --set controller.extraArgs.v=2
 ```
 
+## PodDisruptionBudget
+Note that the PodDisruptionBudget resource will only be defined if the replicaCount is greater than one,
+else it would make it impossible to evacuate a node. See [gh issue #7127](https://github.com/helm/charts/issues/7127) for more info.
+
 ## Prometheus Metrics
 
 The Nginx ingress controller can export Prometheus metrics. In order for this to work, the VTS dashboard must be enabled as well.

stable/nginx-ingress/templates/controller-poddisruptionbudget.yaml

@@ -1,3 +1,4 @@
+{{- if gt .Values.controller.replicaCount 1.0 }}
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
@@ -15,3 +16,4 @@ spec:
       release: {{ .Release.Name }}
       component: "{{ .Values.controller.name }}"
   minAvailable: {{ .Values.controller.minAvailable }}
+{{- end }}

stable/nginx-ingress/templates/default-backend-poddisruptionbudget.yaml

@@ -1,3 +1,4 @@
+{{- if gt .Values.defaultBackend.replicaCount 1.0 }}
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
@@ -15,3 +16,4 @@ spec:
       release: {{ .Release.Name }}
       component: "{{ .Values.defaultBackend.name }}"
   minAvailable: {{ .Values.defaultBackend.minAvailable }}
+{{- end }}