From ce57e08695b33b00cb684044b0026aac6894b504 Mon Sep 17 00:00:00 2001
From: Kim Sondrup <kim@sondrup.io>
Date: Mon, 29 Jul 2024 16:15:52 +0200
Subject: [PATCH] Webhook provider helm chart fixes

- Add webhook resources values to deployment
- Add webhook metrics port to service
- Correct webhook metric port in servicemonitor
- Use correct imagePullPolicy value for webhook container
---
 charts/external-dns/templates/deployment.yaml     | 8 ++++++--
 charts/external-dns/templates/service.yaml        | 9 +++++++++
 charts/external-dns/templates/servicemonitor.yaml | 2 +-
 charts/external-dns/values.yaml                   | 2 ++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/charts/external-dns/templates/deployment.yaml b/charts/external-dns/templates/deployment.yaml
index d7003684b6..30edb421f9 100644
--- a/charts/external-dns/templates/deployment.yaml
+++ b/charts/external-dns/templates/deployment.yaml
@@ -152,7 +152,7 @@ spec:
         {{- with .Values.provider.webhook }}
         - name: webhook
           image: {{ include "external-dns.webhookImage" . }}
-          imagePullPolicy: {{ $.Values.image.pullPolicy }}
+          imagePullPolicy: {{ .image.pullPolicy }}
           {{- with .env }}
           env:
             {{- toYaml . | nindent 12 }}
@@ -162,7 +162,7 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           ports:
-            - name: http-wh-metrics
+            - name: http-wh
               protocol: TCP
               containerPort: 8080
           livenessProbe:
@@ -179,6 +179,10 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with .resources }}
+          resources:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
         {{- end }}
         {{- end }}
       {{- if or .Values.secretConfiguration.enabled .Values.extraVolumes }}
diff --git a/charts/external-dns/templates/service.yaml b/charts/external-dns/templates/service.yaml
index d3cc1941d5..a17784579f 100644
--- a/charts/external-dns/templates/service.yaml
+++ b/charts/external-dns/templates/service.yaml
@@ -1,3 +1,4 @@
+{{- $providerName := include "external-dns.providerName" . }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -25,3 +26,11 @@ spec:
       port: {{ .Values.service.port }}
       targetPort: http
       protocol: TCP
+    {{- if eq $providerName "webhook" }}
+    {{- with .Values.provider.webhook.service }}
+    - name: http-wh
+      port: {{ .metricsPort }}
+      targetPort: http-wh
+      protocol: TCP
+    {{- end }}
+    {{- end }}
diff --git a/charts/external-dns/templates/servicemonitor.yaml b/charts/external-dns/templates/servicemonitor.yaml
index 95ff2f0fa3..309b196b1c 100644
--- a/charts/external-dns/templates/servicemonitor.yaml
+++ b/charts/external-dns/templates/servicemonitor.yaml
@@ -51,7 +51,7 @@ spec:
       {{- end }}
     {{- if eq $providerName "webhook" }}
     {{- with .Values.provider.webhook.serviceMonitor }}
-    - port: webhook-metrics
+    - port: http-wh
       path: /metrics
       {{- with .interval }}
       interval: {{ . }}
diff --git a/charts/external-dns/values.yaml b/charts/external-dns/values.yaml
index 8df733177d..3702534476 100644
--- a/charts/external-dns/values.yaml
+++ b/charts/external-dns/values.yaml
@@ -281,6 +281,8 @@ provider:
       scrapeTimeout:
       metricRelabelings: []
       relabelings: []
+    service:
+      metricsPort: 8080
 
 # -- Extra arguments to provide to _ExternalDNS_.
 extraArgs: []