Added configuration for provider rfc2136 (see #11779) (#11781)

* Added configuration for provider rfc2136 (see #11779)

Signed-off-by: Nicolas Dascanio <nicolas.dascanio@intraway.com>

* [stable/external-dns] Incresed minor chart version (see #11779)

Signed-off-by: Nicolas Dascanio <nicolas.dascanio@intraway.com>
This commit is contained in:
elpadrinoIV
2019-03-07 13:30:09 -08:00
committed by Kubernetes Prow Robot
parent c39be54530
commit e7bdbc4722
5 changed files with 44 additions and 4 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.6.2
version: 1.7.0
appVersion: 0.5.9
home: https://github.com/kubernetes-incubator/external-dns
sources:
+8 -1
View File
@@ -61,11 +61,18 @@ The following table lists the configurable parameters of the external-dns chart
| `infoblox.wapiVersion` | When using the Infoblox provider, optionally specify the Infoblox WAPI version. | `""` |
| `infoblox.wapiConnectionPoolSize` | When using the Infoblox provider, optionally specify the Infoblox WAPI request connection pool size. | `""` |
| `infoblox.wapiHttpTimeout` | When using the Infoblox provider, optionally specify the Infoblox WAPI request timeout in seconds. | `""` |
| `rfc2136.host` | When using the rfc2136 provider, specify the RFC2136 host. | `""` |
| `rfc2136.port` | When using the rfc2136 provider, optionally specify the RFC2136 port. | `53` |
| `rfc2136.zone` | When using the rfc2136 provider, specify the zone. | `""` |
| `rfc2136.tsigSecret` | When using the rfc2136 provider, if you want to enable security, specify the tsig secret. | `""` |
| `rfc2136.tsigKeyname` | When using the rfc2136 provider, if you want to enable security, specify the tsig keyname. If you want an insecure connection, disable this parameter. | `"externaldns-key"` |
| `rfc2136.tsigSecretAlg` | When using the rfc2136 provider, if you want to enable security, specify the tsig secret alg. | `"hmac-sha256"` |
| `rfc2136.tsigAxfr` | When using the rfc2136 provider, if you want to enable security, enable AFXR. | `true` |
| `logLevel` | Verbosity of the logs (options: panic, debug, info, warn, error, fatal) | `info` |
| `nodeSelector` | Node labels for pod assignment | `{}` |
| `podAnnotations` | Additional annotations to apply to the pod. | `{}` |
| `policy` | Modify how DNS records are sychronized between sources and providers (options: sync, upsert-only ). | `upsert-only` |
| `provider` | The DNS provider where the DNS records will be created (options: aws, google, azure, cloudflare, digitalocean, inmemory ). | `aws` |
| `provider` | The DNS provider where the DNS records will be created (options: aws, google, azure, cloudflare, digitalocean, inmemory, rfc2136 ). | `aws` |
| `publishInternalServices` | Allow external-dns to publish DNS records for ClusterIP services (optional). | `false` |
| `rbac.create` | If true, create & use RBAC resources | `false` |
| `rbac.serviceAccountName` | Existing ServiceAccount to use (ignored if rbac.create=true) | `default` |
@@ -93,6 +93,20 @@ spec:
- --infoblox-ssl-verify
{{- end }}
{{- end }}
{{- if eq .Values.provider "rfc2136" }}
- --rfc2136-host={{ required "rfc2136.host must be supplied for provider 'rfc2136'" .Values.rfc2136.host }}
- --rfc2136-port={{ .Values.rfc2136.port }}
- --rfc2136-zone={{ required "rfc2136.zone must be supplied for provider 'rfc2136'" .Values.rfc2136.zone }}
{{- if .Values.rfc2136.tsigKeyname }}
- --rfc2136-tsig-secret-alg={{ .Values.rfc2136.tsigSecretAlg }}
- --rfc2136-tsig-keyname={{ .Values.rfc2136.tsigKeyname }}
{{- if .Values.rfc2136.tsigAxfr }}
- --rfc2136-tsig-axfr
{{- end }}
{{- else }}
- --rfc2136-insecure=false
{{- end }}
{{- end }}
volumeMounts:
{{- if or .Values.google.serviceAccountSecret .Values.google.serviceAccountKey }}
- name: google-service-account
@@ -164,6 +178,13 @@ spec:
name: {{ template "external-dns.fullname" . }}
key: infoblox_wapi_password
{{- end }}
{{- if and .Values.rfc2136.tsigSecret }}
- name: EXTERNAL_DNS_RFC2136_TSIG_SECRET
valueFrom:
secretKeyRef:
name: {{ template "external-dns.fullname" . }}
key: rfc2136_tsig_secret
{{- end }}
{{- if and (eq .Values.provider "designate") .Values.designate.customCA.enabled }}
- name: OPENSTACK_CA_FILE
value: {{ .Values.designate.customCA.directory }}/{{ .Values.designate.customCA.filename }}
+4 -1
View File
@@ -1,4 +1,4 @@
{{- 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 -}}
{{- if or (and .Values.aws.secretKey .Values.aws.accessKey) .Values.cloudflare.apiKey .Values.digitalocean.apiToken (and .Values.infoblox.wapiUsername .Values.infoblox.wapiPassword) .Values.rfc2136.tsigSecret .Values.extraEnv .Values.google.serviceAccountKey -}}
apiVersion: v1
kind: Secret
metadata:
@@ -24,6 +24,9 @@ data:
infoblox_wapi_username: {{ .Values.infoblox.wapiUsername | b64enc | quote }}
infoblox_wapi_password: {{ .Values.infoblox.wapiPassword | b64enc | quote }}
{{- end }}
{{- if .Values.rfc2136.tsigSecret }}
rfc2136_tsig_secret: {{ .Values.rfc2136.tsigSecret | b64enc | quote }}
{{- end }}
{{- range .Values.extraEnv }}
{{- if .value }}
+10 -1
View File
@@ -14,7 +14,7 @@ sources:
# Allow external-dns to publish DNS records for ClusterIP services (optional)
publishInternalServices: false
## The DNS provider where the DNS records will be created (options: aws, google, inmemory, azure )
## The DNS provider where the DNS records will be created (options: aws, google, inmemory, azure, rfc2136 )
provider: aws
# AWS Access keys to inject as environment variables
@@ -75,6 +75,15 @@ infoblox:
wapiConnectionPoolSize: ""
wapiHttpTimeout: ""
rfc2136:
host: ""
port: 53
zone: ""
tsigSecret: ""
tsigSecretAlg: hmac-sha256
tsigKeyname: externaldns-key
tsigAxfr: true
## Limit possible target zones by domain suffixes (optional)
domainFilters: []
## Limit possible target zones by zone id (optional)