Synchronize upstreamed folder to 9e440cf42

upstreamed/external-dns/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: external-dns
-version: 2.15.2
+version: 2.15.3
 appVersion: 0.5.18
 description: ExternalDNS is a Kubernetes addon that configures public DNS servers with information about exposed Kubernetes services to make them discoverable.
 keywords:

upstreamed/external-dns/README.md

@@ -102,6 +102,7 @@ The following table lists the configurable parameters of the external-dns chart
 | `digitalocean.apiToken`             | When using the DigitalOcean provider, `DO_TOKEN` to set (optional)                                       | `""`                                                        |
 | `google.project`                    | When using the Google provider, specify the Google project (required when provider=google)               | `""`                                                        |
 | `google.serviceAccountSecret`       | When using the Google provider, specify the existing secret which contains credentials.json (optional)   | `""`                                                        |
+| `google.serviceAccountSecretKey`    | When using the Google provider with an existing secret, specify the key name (optional)                  | `"credentials.json"`                                        |
 | `google.serviceAccountKey`          | When using the Google provider, specify the service account key JSON file. (required when `google.serviceAccountSecret` is not provided. In this case a new secret will be created holding this service account | `""`    |
 | `infoblox.gridHost`                 | When using the Infoblox provider, specify the Infoblox Grid host (required when provider=infoblox)       | `""`                                                        |
 | `infoblox.wapiUsername`             | When using the Infoblox provider, specify the Infoblox WAPI username                                     | `"admin"`                                                   |

upstreamed/external-dns/templates/deployment.yaml

@@ -405,6 +405,11 @@ spec:
       - name: google-service-account
         secret:
           secretName: {{ .Values.google.serviceAccountSecret | quote }}
+          {{- if .Values.google.serviceAccountSecretKey }}
+          items:
+          - key: {{ .Values.google.serviceAccountSecretKey | quote }}
+            path: credentials.json
+          {{- end }}
       {{- else if .Values.google.serviceAccountKey }}
       - name: google-service-account
         secret:

upstreamed/external-dns/values-production.yaml

@@ -218,6 +218,7 @@ google:
   ## Google Application Credentials
   ##
   serviceAccountSecret: ""
+  serviceAccountSecretKey: "credentials.json"
   serviceAccountKey: ""
 
 ## Infoblox configuration to be set via arguments/env. variables

upstreamed/external-dns/values.yaml

@@ -217,6 +217,7 @@ google:
   ## Google Application Credentials
   ##
   serviceAccountSecret: ""
+  serviceAccountSecretKey: "credentials.json"
   serviceAccountKey: ""
 
 ## Infoblox configuration to be set via arguments/env. variables