diff --git a/charts/ace/templates/ingress/issuer.yaml b/charts/ace/templates/ingress/issuer.yaml index 359fe88b1..389abc4e8 100644 --- a/charts/ace/templates/ingress/issuer.yaml +++ b/charts/ace/templates/ingress/issuer.yaml @@ -29,13 +29,14 @@ spec: # An empty 'selector' means that this solver matches all domains - selector: {} dns01: - {{- if eq .Values.global.infra.dns.provider "cloudflare" }} - {{- if .Values.global.infra.dns.auth.cloudflare.baseURL }} + {{- with .Values.global.infra.dns }} + {{- if eq .provider "cloudflare" }} + {{- if .auth.cloudflare.baseURL }} webhook: solverName: "ace" groupName: webhook.dns.appscode.com config: - baseURL: '{{ printf "https://%s" .Values.global.infra.dns.auth.cloudflare.baseURL }}' + baseURL: '{{ printf "https://%s" auth.cloudflare.baseURL }}' apiToken: name: {{ include "ace.fullname" . }}-dns-cred key: CF_API_TOKEN @@ -46,12 +47,21 @@ spec: key: CF_API_TOKEN {{- end }} {{- end }} - {{- if eq .Values.global.infra.dns.provider "cloudDNS" }} + {{- if eq .provider "cloudDNS" }} cloudDNS: - project: {{ .Values.global.infra.dns.auth.cloudDNS.GOOGLE_PROJECT_ID }} + project: {{ .auth.cloudDNS.GOOGLE_PROJECT_ID }} serviceAccountSecretRef: name: {{ include "ace.fullname" . }}-dns-cred key: GOOGLE_SERVICE_ACCOUNT_JSON_KEY {{- end }} + {{- if eq .provider "route53" }} + route53: + accessKeyID: {{ .auth.route53.AWS_ACCESS_KEY_ID }} + region: {{ .auth.route53.AWS_REGION }} + secretAccessKeySecretRef: + name: {{ include "ace.fullname" . }}-dns-cred + key: AWS_SECRET_ACCESS_KEY + {{- end }} + {{- end }} {{- end }} {{- end }} diff --git a/charts/ace/values.yaml b/charts/ace/values.yaml index 1451e4417..af276ff06 100644 --- a/charts/ace/values.yaml +++ b/charts/ace/values.yaml @@ -150,6 +150,10 @@ global: # cloudDNS: # GOOGLE_PROJECT_ID: "project-id" # GOOGLE_SERVICE_ACCOUNT_JSON_KEY: xyz + # route53: + # AWS_ACCESS_KEY_ID: "access-id" + # AWS_SECRET_ACCESS_KEY: "secret-key" + # AWS_REGION: "us-east-1" # KMS and Object Store services are required # set provider to empty to disable this feature objstore: