[stable/external-dns] Support DigitalOcean (Fixes helm#10923). (helm#…

…11257) * [stable/external-dns] Support DigitalOcean (Fixes helm#10923). Signed-off-by: Andrew Starr-Bochicchio <[email protected]> * [stable/external-dns] Bump chart version. Signed-off-by: Andrew Starr-Bochicchio <[email protected]> * [stable/external-dns] Bump chart version again. Signed-off-by: Andrew Starr-Bochicchio <[email protected]>
agolo · Feb 27, 2019 · 2dabf16 · 2dabf16
1 parent bb0fb8e
commit 2dabf16
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/stable/external-dns/Chart.yaml b/stable/external-dns/Chart.yaml
@@ -3,7 +3,7 @@ description: |
   Configure external DNS servers (AWS Route53, Google CloudDNS and others)
   for Kubernetes Ingresses and Services
 name: external-dns
-version: 1.6.1
+version: 1.6.2
 appVersion: 0.5.9
 home: https://github.com/kubernetes-incubator/external-dns
 sources:

diff --git a/stable/external-dns/README.md b/stable/external-dns/README.md
@@ -41,6 +41,7 @@ The following table lists the configurable parameters of the external-dns chart
 | `designate.customCA.directory`     | Directory in which to mount the Designate provider's custom CA                                                             | "/config/designate"                                |
 | `designate.customCA.filename`      | Filename of Designate provider's custom CA                                                                                 | "designate-ca.pem"                                 |
 | `domainFilters`                    | Limit possible target zones by domain suffixes (optional).                                                                 | `[]`                                               |
+| `digitalocean.apiToken`            | When using the DigitalOcean provider, sets `DO_TOKEN` in the environment (optional).                                       | `""`                                               |
 | `dryRun`                           | When enabled, prints DNS record changes rather than actually performing them (optional).                                   | `false`                                            |
 | `extraArgs`                        | Optional object of extra args, as `name`: `value` pairs. Where the name is the command line arg to external-dns.           | `{}`                                               |
 | `extraEnv`                         | Optional array of extra environment variables. Supply a `name` property and either `value` of `valueFrom` for each.        | `[]`                                               |

diff --git a/stable/external-dns/templates/deployment.yaml b/stable/external-dns/templates/deployment.yaml
@@ -137,6 +137,13 @@ spec:
           - name: CF_API_EMAIL
             value: "{{ .Values.cloudflare.email }}"
         {{- end }}
+        {{- if .Values.digitalocean.apiToken }}
+          - name: DO_TOKEN
+            valueFrom:
+              secretKeyRef:
+                name: {{ template "external-dns.fullname" . }}
+                key: digitalocean_api_token
+        {{- end }}
         {{- if .Values.infoblox.wapiConnectionPoolSize }}
           - name: EXTERNAL_DNS_INFOBLOX_HTTP_POOL_CONNECTIONS
             value: "{{ .Values.infoblox.wapiConnectionPoolSize }}"

diff --git a/stable/external-dns/templates/secret.yaml b/stable/external-dns/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- if or (and .Values.aws.secretKey .Values.aws.accessKey) .Values.cloudflare.apiKey (and .Values.infoblox.wapiUsername .Values.infoblox.wapiPassword) .Values.extraEnv .Values.google.serviceAccountKey -}}
+{{- if or (and .Values.aws.secretKey .Values.aws.accessKey) .Values.cloudflare.apiKey .Values.digitalocean.apiToken (and .Values.infoblox.wapiUsername .Values.infoblox.wapiPassword) .Values.extraEnv .Values.google.serviceAccountKey -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -17,6 +17,9 @@ data:
 {{- if .Values.cloudflare.apiKey }}
   cloudflare_api_key: {{ .Values.cloudflare.apiKey | b64enc | quote }}
 {{- end }}
+{{- if .Values.digitalocean.apiToken }}
+  digitalocean_api_token: {{ .Values.digitalocean.apiToken | b64enc | quote }}
+{{- end }}
 {{- if and .Values.infoblox.wapiUsername .Values.infoblox.wapiPassword }}
   infoblox_wapi_username: {{ .Values.infoblox.wapiUsername | b64enc | quote }}
   infoblox_wapi_password: {{ .Values.infoblox.wapiPassword | b64enc | quote }}

diff --git a/stable/external-dns/values.yaml b/stable/external-dns/values.yaml
@@ -51,6 +51,10 @@ designate:
     # Filename of the custom CA
     filename: "designate-ca.pem"
 
+# DigitalOcean API token to inject as environment variable
+digitalocean:
+  apiToken: ""
+
 # When using the Google provider, specify the Google project (required when provider=google)
 google:
   project: ""