fixed name for sidecar + doc update + externalVolumeMounts

kubernetes-sigs · Nov 27, 2023 · 9109597 · 9109597
1 parent 10601c9
commit 9109597
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/charts/external-dns/CHANGELOG.md b/charts/external-dns/CHANGELOG.md
@@ -24,8 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added the option to explicitly enable or disable service account token automounting. ([#3983](https://github.com/kubernetes-sigs/external-dns/pull/3983)) [@gilles-gosuin](https://github.com/gilles-gosuin)
 - Added the option to configure revisionHistoryLimit on the K8s Deployment resource. ([#4008](https://github.com/kubernetes-sigs/external-dns/pull/4008)) [@arnisoph](https://github.com/arnisoph)
-- BREAKING CHANGE: Added support for webhook providers: IONOS, AdGuard and Stackit
-  - Providers are now accepting parameters. When using _in-tree_ provider, one have to set `provider.name` instead of now deprecated `provider`.
+- Added support for webhook providers, as a sidecar. ([#4032](https://github.com/kubernetes-sigs/external-dns/pull/4032) [@mloiseleur](https://github.com/mloiseleur)
 
 ## [v1.13.1] - 2023-09-07
 

diff --git a/charts/external-dns/templates/deployment.yaml b/charts/external-dns/templates/deployment.yaml
@@ -1,6 +1,5 @@
 ---
 {{- $providername := include "external-dns.providername" . }}
-{{- $provider := (hasKey .Values.provider.images $providername) | ternary "webhook" $providername }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -106,7 +105,7 @@ spec:
             {{- range .Values.domainFilters }}
             - --domain-filter={{ . }}
             {{- end }}
-            - --provider={{ $provider }}
+            - --provider={{ $providername }}
           {{- range .Values.extraArgs }}
             - {{ tpl . $ }}
           {{- end }}
@@ -135,11 +134,16 @@ spec:
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-        {{- if eq $provider "webhook" }}
-        {{- with .Values.provider }}
-        - name: {{ $providername }}
-          image: {{ get .images .name }}:{{- .version }}
+        {{- if eq $providername "webhook" }}
+        {{- with .Values.provider.webhook }}
+        - name: webhook
+          {{- with .image }}
+          {{- if or (empty .repository) (empty .version) }}
+            {{- fail "ERROR: webhook provider needs an image repository and a version" }}
+          {{- end }}
+          image: {{ .repository }}:{{- .version }}
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
+          {{- end }}
           {{- with .env }}
           env:
             {{- toYaml . | nindent 12 }}
@@ -148,15 +152,11 @@ spec:
           args:
             - {{ toYaml . | nindent 12 }}
           {{- end }}
-          ports:
-            - name: http
-              protocol: TCP
-              containerPort: 8888
           livenessProbe:
             {{- toYaml $.Values.livenessProbe | nindent 12 }}
           readinessProbe:
             {{- toYaml $.Values.readinessProbe | nindent 12 }}
-          {{- if or $.Values.secretConfiguration.enabled $.Values.extraVolumeMounts }}
+          {{- if or $.Values.secretConfiguration.enabled .extraVolumeMounts }}
           volumeMounts:
             {{- if $.Values.secretConfiguration.enabled }}
             - name: secrets
@@ -165,7 +165,7 @@ spec:
               subPath: {{ tpl . $ }}
             {{- end }}
             {{- end }}
-            {{- with $.Values.extraVolumeMounts }}
+            {{- with .extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
           {{- end }}

diff --git a/charts/external-dns/values.yaml b/charts/external-dns/values.yaml
@@ -183,14 +183,14 @@ domainFilters: []
 provider:
   # When the provider is not in-tree, it will add a sidecar using the webhook values
   name: aws
-
   webhook:
     image:
       repository:
       tag:
       pullPolicy: IfNotPresent
     env: []
     args: []
+    extraVolumeMounts: []
     resources: {}
     securityContext: {}