From a3d019d56055a55e19676a57c4ce261e394f4150 Mon Sep 17 00:00:00 2001
From: Eric Ace <24485843+aceeric@users.noreply.github.com>
Date: Sun, 27 Jul 2025 16:48:12 -0400
Subject: [PATCH] Add guards for empty map in other required areas

---
 charts/external-dns/templates/deployment.yaml     | 2 ++
 charts/external-dns/templates/service.yaml        | 2 ++
 charts/external-dns/templates/servicemonitor.yaml | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/charts/external-dns/templates/deployment.yaml b/charts/external-dns/templates/deployment.yaml
index c57ba4857..42d8dbce8 100644
--- a/charts/external-dns/templates/deployment.yaml
+++ b/charts/external-dns/templates/deployment.yaml
@@ -184,6 +184,7 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
         {{- if eq $providerName "webhook" }}
+        {{- if kindIs "map" .Values.provider }}
         {{- if .Values.provider.webhook.sidecar }}
         {{- with .Values.provider.webhook.sidecar }}
         - name: webhook
@@ -222,6 +223,7 @@ spec:
         {{- end }}
         {{- end }}
         {{- end }}
+        {{- end }}
       {{- if or .Values.secretConfiguration.enabled .Values.extraVolumes }}
       volumes:
         {{- if .Values.secretConfiguration.enabled }}
diff --git a/charts/external-dns/templates/service.yaml b/charts/external-dns/templates/service.yaml
index bb8bf4f32..c7a8d0b75 100644
--- a/charts/external-dns/templates/service.yaml
+++ b/charts/external-dns/templates/service.yaml
@@ -27,6 +27,7 @@ spec:
       targetPort: http
       protocol: TCP
     {{- if eq $providerName "webhook" }}
+    {{- if kindIs "map" .Values.provider }}
     {{- if .Values.provider.webhook.sidecar }}
     {{- with .Values.provider.webhook.sidecar.service }}
     - name: http-webhook
@@ -36,3 +37,4 @@ spec:
     {{- end }}
     {{- end }}
     {{- end }}
+    {{- end }}
diff --git a/charts/external-dns/templates/servicemonitor.yaml b/charts/external-dns/templates/servicemonitor.yaml
index d75d54549..7b1e27d51 100644
--- a/charts/external-dns/templates/servicemonitor.yaml
+++ b/charts/external-dns/templates/servicemonitor.yaml
@@ -50,6 +50,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
     {{- if eq $providerName "webhook" }}
+    {{- if kindIs "map" .Values.provider }}
     {{- if .Values.provider.webhook.sidecar }}
     {{- with .Values.provider.webhook.sidecar.serviceMonitor }}
     - port: http-webhook
@@ -81,6 +82,7 @@ spec:
     {{- end }}
     {{- end }}
     {{- end }}
+    {{- end }}
   {{- with .Values.serviceMonitor.targetLabels }}
   targetLabels:
     {{- toYaml . | nindent 4 }}