From c10dd592a0ab6bcfa3a7d1cf6063229e4affdd77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Picot?= <fpicot@users.noreply.github.com>
Date: Sat, 15 Feb 2020 12:07:27 +0100
Subject: [PATCH] [stable/nginx-ingress] fix psp for daemonsets with
 userHostPort (#20764)

Signed-off-by: fpicot <francois.picot@homesend.com>
---
 stable/nginx-ingress/Chart.yaml                    |  2 +-
 stable/nginx-ingress/templates/controller-psp.yaml | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml
index 2fbc325738..efc5ec26a4 100644
--- a/stable/nginx-ingress/Chart.yaml
+++ b/stable/nginx-ingress/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nginx-ingress
-version: 1.30.2
+version: 1.30.3
 appVersion: 0.28.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-psp.yaml b/stable/nginx-ingress/templates/controller-psp.yaml
index 9615468678..b91ecba22d 100644
--- a/stable/nginx-ingress/templates/controller-psp.yaml
+++ b/stable/nginx-ingress/templates/controller-psp.yaml
@@ -21,13 +21,21 @@ spec:
     - 'secret'
     #- 'downwardAPI'
   hostNetwork: {{ .Values.controller.hostNetwork }}
-{{- if .Values.controller.hostNetwork }}
+{{- if or .Values.controller.hostNetwork .Values.controller.daemonset.useHostPort }}
   hostPorts:
+{{- if .Values.controller.hostNetwork }}
 {{- range $key, $value := .Values.controller.containerPort }}
   # {{ $key }}
   - min: {{ $value }}
     max: {{ $value }}
 {{- end }}
+{{- else if .Values.controller.daemonset.useHostPort }}
+{{- range $key, $value := .Values.controller.daemonset.hostPorts }}
+  # {{ $key }}
+  - min: {{ $value }}
+    max: {{ $value }}
+{{- end }}
+{{- end }}
 {{- if .Values.controller.metrics.enabled }}
   # metrics
   - min: {{ .Values.controller.metrics.port }}