diff --git a/chart/k8gb/templates/external-dns/external-dns-route53.yaml b/chart/k8gb/templates/external-dns/external-dns-route53.yaml deleted file mode 100644 index 4efe95126b..0000000000 --- a/chart/k8gb/templates/external-dns/external-dns-route53.yaml +++ /dev/null @@ -1,39 +0,0 @@ -{{ if .Values.route53.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: external-dns-route53 -spec: - strategy: - type: Recreate - selector: - matchLabels: - app: external-dns-route53 - template: - metadata: - labels: - app: external-dns-route53 - spec: - serviceAccountName: external-dns - securityContext: {{- toYaml .Values.externaldns.securityContext | nindent 8 }} - containers: - - name: external-dns - image: {{ .Values.externaldns.image }} - args: - - --source=crd - - --domain-filter={{ .Values.k8gb.edgeDNSZone }} # will make ExternalDNS see only the hosted zones matching provided domain, omit to process all available hosted zones - - --annotation-filter=k8gb.absa.oss/dnstype=route53 # filter out only relevant DNSEntrypoints - - --provider=aws - - --txt-owner-id=k8gb-{{ .Values.route53.hostedZoneID }}-{{ .Values.k8gb.clusterGeoTag }} - - --policy=sync # enable full synchronization including record removal - - --log-level=debug # debug only - resources: - requests: - memory: "32Mi" - cpu: "100m" - limits: - memory: "128Mi" - cpu: "500m" - securityContext: - readOnlyRootFilesystem: true -{{ end }} diff --git a/chart/k8gb/templates/external-dns/external-dns-ns1.yaml b/chart/k8gb/templates/external-dns/external-dns.yaml similarity index 76% rename from chart/k8gb/templates/external-dns/external-dns-ns1.yaml rename to chart/k8gb/templates/external-dns/external-dns.yaml index 8965a73911..1517ff5616 100644 --- a/chart/k8gb/templates/external-dns/external-dns-ns1.yaml +++ b/chart/k8gb/templates/external-dns/external-dns.yaml @@ -1,18 +1,18 @@ -{{ if .Values.ns1.enabled }} +{{ if or .Values.ns1.enabled .Values.route53.enabled }} apiVersion: apps/v1 kind: Deployment metadata: - name: external-dns-ns1 + name: external-dns spec: strategy: type: Recreate selector: matchLabels: - app: external-dns-ns1 + app: external-dns template: metadata: labels: - app: external-dns-ns1 + app: external-dns spec: serviceAccountName: external-dns securityContext: @@ -25,23 +25,32 @@ spec: args: - --source=crd - --domain-filter={{ .Values.k8gb.edgeDNSZone }} # will make ExternalDNS see only the hosted zones matching provided domain, omit to process all available hosted zones +{{- if .Values.ns1.enabled }} - --annotation-filter=k8gb.absa.oss/dnstype=ns1 # filter out only relevant DNSEntrypoints - --provider=ns1 + - --txt-owner-id=k8gb-{{ .Values.k8gb.dnsZone }}-{{ .Values.k8gb.clusterGeoTag }} {{- if .Values.ns1.endpoint }} - --ns1-endpoint={{ .Values.ns1.endpoint }} {{- end }} {{- if .Values.ns1.ignoreSSL }} - --ns1-ignoressl {{- end }} - - --txt-owner-id=k8gb-{{ .Values.k8gb.dnsZone }}-{{ .Values.k8gb.clusterGeoTag }} +{{- end }} +{{- if .Values.route53.enabled }} + - --annotation-filter=k8gb.absa.oss/dnstype=route53 # filter out only relevant DNSEntrypoints + - --provider=aws + - --txt-owner-id=k8gb-{{ .Values.route53.hostedZoneID }}-{{ .Values.k8gb.clusterGeoTag }} +{{- end }} - --policy=sync # enable full synchronization including record removal - --log-level=debug # debug only +{{- if .Values.ns1.enabled }} env: - name: NS1_APIKEY valueFrom: secretKeyRef: name: ns1 key: apiKey +{{- end }} resources: requests: memory: "32Mi"