From fcbc3659b805247685558b84a33ff98d51c2a13b Mon Sep 17 00:00:00 2001
From: Anton Wolkov <7001904+phntom@users.noreply.github.com>
Date: Mon, 31 Aug 2020 23:14:44 +0300
Subject: [PATCH] Misc fixes for nginx-ingress chart for better keel and
 prometheus-operator integration Update: allow values.yaml without labels to
 pass

---
 charts/ingress-nginx/templates/controller-daemonset.yaml  | 4 +++-
 charts/ingress-nginx/templates/controller-deployment.yaml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/charts/ingress-nginx/templates/controller-daemonset.yaml b/charts/ingress-nginx/templates/controller-daemonset.yaml
index 8765835dc..3eac1f8b0 100644
--- a/charts/ingress-nginx/templates/controller-daemonset.yaml
+++ b/charts/ingress-nginx/templates/controller-daemonset.yaml
@@ -6,7 +6,9 @@ metadata:
   labels:
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
-    {{- toYaml .Values.controller.labels | nindent 4 }}
+    {{- with .Values.controller.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: {{ include "ingress-nginx.controller.fullname" . }}
   {{- if .Values.controller.annotations }}
   annotations: {{ toYaml .Values.controller.annotations | nindent 4 }}
diff --git a/charts/ingress-nginx/templates/controller-deployment.yaml b/charts/ingress-nginx/templates/controller-deployment.yaml
index c63d51fb9..cec2ab8f4 100644
--- a/charts/ingress-nginx/templates/controller-deployment.yaml
+++ b/charts/ingress-nginx/templates/controller-deployment.yaml
@@ -6,7 +6,9 @@ metadata:
   labels:
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
-    {{- toYaml .Values.controller.labels | nindent 4 }}
+    {{- with .Values.controller.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   name: {{ include "ingress-nginx.controller.fullname" . }}
   {{- if .Values.controller.annotations }}
   annotations: {{ toYaml .Values.controller.annotations | nindent 4 }}