From e3689a59fe2bf0a2a74c9c9e385201a6c2de1fed Mon Sep 17 00:00:00 2001
From: Eric Ace <24485843+aceeric@users.noreply.github.com>
Date: Wed, 23 Jul 2025 17:38:54 -0400
Subject: [PATCH] wip2 cant helm template

---
 charts/external-dns/templates/deployment.yaml |  2 +-
 charts/external-dns/templates/service.yaml    |  2 +-
 .../templates/servicemonitor.yaml             |  2 +-
 charts/external-dns/values.yaml               | 23 ++++++-------------
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/charts/external-dns/templates/deployment.yaml b/charts/external-dns/templates/deployment.yaml
index 2229616fd..2f49f3cb6 100644
--- a/charts/external-dns/templates/deployment.yaml
+++ b/charts/external-dns/templates/deployment.yaml
@@ -174,7 +174,7 @@ spec:
           {{- end }}
         {{- if eq $providerName "webhook" }}
         {{- if .Values.provider.webhook.sidecar }}
-        {{- with .Values.provider.webhook }}
+        {{- with .Values.provider.webhook.sidecar }}
         - name: webhook
           image: {{ include "external-dns.webhookImage" . }}
           imagePullPolicy: {{ .image.pullPolicy }}
diff --git a/charts/external-dns/templates/service.yaml b/charts/external-dns/templates/service.yaml
index e55e2a368..882cdeb00 100644
--- a/charts/external-dns/templates/service.yaml
+++ b/charts/external-dns/templates/service.yaml
@@ -27,7 +27,7 @@ spec:
       targetPort: http
       protocol: TCP
     {{- if eq $providerName "webhook" }}
-    {{- with .Values.provider.webhook.service }}
+    {{- with .Values.provider.webhook.sidecar.service }}
     - name: http-webhook
       port: {{ .port }}
       targetPort: http-webhook
diff --git a/charts/external-dns/templates/servicemonitor.yaml b/charts/external-dns/templates/servicemonitor.yaml
index 004756c7b..af2d69d51 100644
--- a/charts/external-dns/templates/servicemonitor.yaml
+++ b/charts/external-dns/templates/servicemonitor.yaml
@@ -50,7 +50,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
     {{- if eq $providerName "webhook" }}
-    {{- with .Values.provider.webhook.serviceMonitor }}
+    {{- with .Values.provider.webhook.sidecar.serviceMonitor }}
     - port: http-webhook
       path: /metrics
       {{- with .interval }}
diff --git a/charts/external-dns/values.yaml b/charts/external-dns/values.yaml
index c3c103233..48ebac6d7 100644
--- a/charts/external-dns/values.yaml
+++ b/charts/external-dns/values.yaml
@@ -248,22 +248,13 @@ provider:  # @schema type: [object, string];
     readTimeout:
     writeTimeout:
     sidecar:
-      image:  # @schema additionalProperties: false
-        # -- Image repository for the `webhook` container.
-        repository: registry.k8s.io/external-dns/external-dns
-        # -- Image tag for the `external-dns` container, this will default to `.Chart.AppVersion` if not set.
-        tag:  # @schema type:[string, null]
-        # -- Image pull policy for the `external-dns` container.
-        pullPolicy: IfNotPresent  # @schema enum:[IfNotPresent, Always];
-
-
-      #image:
-      #  # -- (string) Image repository for the `webhook` container.
-      #  repository:  # @schema type:[string, null]; default: null
-      #  # -- (string) Image tag for the `webhook` container.
-      #  tag:  # @schema type:[string, null]; default: null
-      #  # -- Image pull policy for the `webhook` container.
-      #  pullPolicy: IfNotPresent
+      image:
+        # -- (string) Image repository for the `webhook` container.
+        repository:  # @schema type:[string, null]; default: null
+        # -- (string) Image tag for the `webhook` container.
+        tag:  # @schema type:[string, null]; default: null
+        # -- Image pull policy for the `webhook` container.
+        pullPolicy: IfNotPresent
       # -- [Environment variables](https://kubernetes.io/docs/tasks/inject-data-application/define-environment-variable-container/) for the `webhook` container.
       env: []
       # -- Extra arguments to provide for the `webhook` container.