fix error calling eq: invalid type for comparison; add default value for serviceAccountKey (#10487)

Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@commercetools.de>
This commit is contained in:
tetianakravchenko
2019-01-11 08:56:38 -08:00
committed by Kubernetes Prow Robot
parent 063aa943e2
commit d1f773cd63
3 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -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.3.2
version: 1.3.3
appVersion: 0.5.9
home: https://github.com/kubernetes-incubator/external-dns
sources:
+1 -1
View File
@@ -11,7 +11,7 @@ data:
credentials: {{ include "external-dns.aws-credentials" . | b64enc | quote }}
config: {{ include "external-dns.aws-config" . | b64enc | quote }}
{{- end}}
{{- if and (eq .Values.provider "google" .Values.google.serviceAccountKey) }}
{{- if and (eq .Values.provider "google") .Values.google.serviceAccountKey }}
credentials.json: {{ .Values.google.serviceAccountKey | b64enc | quote }}
{{- end}}
{{- if .Values.cloudflare.apiKey }}
+1
View File
@@ -41,6 +41,7 @@ cloudflare:
google:
project: ""
serviceAccountSecret: ""
serviceAccountKey: ""
# Infoblox keys to inject
infoblox: