diff --git a/stable/external-dns/Chart.yaml b/stable/external-dns/Chart.yaml index 25956f7de5..24866b1a21 100644 --- a/stable/external-dns/Chart.yaml +++ b/stable/external-dns/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v1 description: Configure external DNS servers (AWS Route53, Google CloudDNS and others) for Kubernetes Ingresses and Services name: external-dns -version: 0.4.4 -appVersion: 0.4.5 +version: 0.4.5 +appVersion: 0.4.8 home: https://github.com/kubernetes-incubator/external-dns sources: - https://github.com/kubernetes-incubator/external-dns diff --git a/stable/external-dns/templates/clusterrole.yaml b/stable/external-dns/templates/clusterrole.yaml index 0f42649aab..3d16e9f353 100644 --- a/stable/external-dns/templates/clusterrole.yaml +++ b/stable/external-dns/templates/clusterrole.yaml @@ -1,5 +1,5 @@ {{- if .Values.rbac.create -}} -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/{{ .Values.rbac.apiVersion }} kind: ClusterRole metadata: labels: {{ include "external-dns.labels" . | indent 4 }} diff --git a/stable/external-dns/templates/clusterrolebinding.yaml b/stable/external-dns/templates/clusterrolebinding.yaml old mode 100644 new mode 100755 index e3a60ae6e3..b93b19f306 --- a/stable/external-dns/templates/clusterrolebinding.yaml +++ b/stable/external-dns/templates/clusterrolebinding.yaml @@ -1,5 +1,5 @@ {{- if .Values.rbac.create -}} -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/{{ .Values.rbac.apiVersion }} kind: ClusterRoleBinding metadata: labels: {{ include "external-dns.labels" . | indent 4 }} diff --git a/stable/external-dns/templates/deployment.yaml b/stable/external-dns/templates/deployment.yaml index a8a1c509b3..d2289555cf 100644 --- a/stable/external-dns/templates/deployment.yaml +++ b/stable/external-dns/templates/deployment.yaml @@ -42,7 +42,14 @@ spec: {{- if .Values.aws.zoneType }} - --aws-zone-type={{ .Values.aws.zoneType }} {{- end }} + volumeMounts: + {{- if eq .Values.provider "azure" }} + - name: azure-config-file + mountPath: /etc/kubernetes/azure.json + readOnly: true + {{- end }} env: + {{- if eq .Values.provider "aws" }} {{- if and .Values.aws.secretKey .Values.aws.accessKey }} - name: AWS_ACCESS_KEY_ID valueFrom: @@ -68,6 +75,7 @@ spec: - name: CF_API_EMAIL value: "{{ .Values.cloudflare.email }}" {{- end }} + {{- end }} {{- $root := . -}} {{- range $key, $value := .Values.extraEnv }} - name: {{ $key }} @@ -86,6 +94,13 @@ spec: resources: {{ toYaml .Values.resources | indent 12 }} {{- end }} + volumes: + {{- if eq .Values.provider "azure" }} + - name: azure-config-file + hostPath: + path: /etc/kubernetes/azure.json + type: File + {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 8 }} diff --git a/stable/external-dns/values.yaml b/stable/external-dns/values.yaml old mode 100644 new mode 100755 index 6be6fb4064..b105c50ebf --- a/stable/external-dns/values.yaml +++ b/stable/external-dns/values.yaml @@ -1,7 +1,7 @@ ## Details about the image to be pulled. image: name: registry.opensource.zalan.do/teapot/external-dns - tag: v0.4.5 + tag: v0.4.8 pullPolicy: IfNotPresent @@ -69,6 +69,8 @@ rbac: ## If true, create & use RBAC resources ## create: false + # Beginning with Kubernetes 1.8, the api is stable and v1 can be used. + apiVersion: v1beta ## Ignored if rbac.create is true ##