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

@@ -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 }}

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 }}

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: {{ . }}

charts/external-dns/values.yaml

@@ -281,6 +281,8 @@ provider:
       scrapeTimeout:
       metricRelabelings: []
       relabelings: []
+    service:
+      metricsPort: 8080
 
 # -- Extra arguments to provide to _ExternalDNS_.
 extraArgs: []