From 2969e2ddcd242d0825e89d70944f23e47c696a3e Mon Sep 17 00:00:00 2001
From: Alex Harder <13860012+ChiefAlexander@users.noreply.github.com>
Date: Thu, 23 May 2019 01:20:25 -0500
Subject: [PATCH] Add if block to daemonset annotations to not include field if
 nil (#14079)

Signed-off-by: ChiefAlexander <alex.harder@fishtech.group>
---
 stable/nginx-ingress/Chart.yaml                          | 2 +-
 stable/nginx-ingress/templates/controller-daemonset.yaml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml
index ac44672e09..15d4abf992 100644
--- a/stable/nginx-ingress/Chart.yaml
+++ b/stable/nginx-ingress/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nginx-ingress
-version: 1.6.12
+version: 1.6.13
 appVersion: 0.24.1
 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-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml
index dc190788b1..6db675c37d 100644
--- a/stable/nginx-ingress/templates/controller-daemonset.yaml
+++ b/stable/nginx-ingress/templates/controller-daemonset.yaml
@@ -16,10 +16,12 @@ spec:
   minReadySeconds: {{ .Values.controller.minReadySeconds }}
   template:
     metadata:
+      {{- if .Values.controller.podAnnotations }}
       annotations:
       {{- range $key, $value := .Values.controller.podAnnotations }}
         {{ $key }}: {{ $value | quote }}
       {{- end }}
+      {{- end }}
       labels:
         app: {{ template "nginx-ingress.name" . }}
         component: "{{ .Values.controller.name }}"