Add Google CloudDNS as dns provider (#229)

Signed-off-by: Masudur Rahman <[email protected]>
appscode-cloud · Oct 12, 2023 · 0f4a411 · 0f4a411
1 parent e238ddd
commit 0f4a411
Show file tree

Hide file tree

Showing 8 changed files with 218 additions and 156 deletions.
diff --git a/apis/installer/v1alpha1/ace_ace_types.go b/apis/installer/v1alpha1/ace_ace_types.go
@@ -259,13 +259,14 @@ type TLSIssuerAcme struct {
 	Email string `json:"email"`
 }
 
-// +kubebuilder:validation:Enum=external;cloudflare;route53
+// +kubebuilder:validation:Enum=external;cloudflare;route53;cloudDNS
 type DNSProvider string
 
 const (
 	DNSProviderExternal   DNSProvider = "external"
 	DNSProviderCloudflare DNSProvider = "cloudflare"
 	DNSProviderRoute53    DNSProvider = "route53"
+	DNSProviderCloudDNS   DNSProvider = "cloudDNS"
 )
 
 type InfraDns struct {
@@ -276,6 +277,7 @@ type InfraDns struct {
 type DNSProviderAuth struct {
 	Cloudflare *CloudflareAuth `json:"cloudflare,omitempty"`
 	Route53    *Route53Auth    `json:"route53,omitempty"`
+	CloudDNS   *CloudDNSAuth   `json:"cloudDNS,omitempty"`
 }
 
 type CloudflareAuth struct {
@@ -290,6 +292,11 @@ type Route53Auth struct {
 	AwsRegion          string `json:"AWS_REGION"`
 }
 
+type CloudDNSAuth struct {
+	GoogleProjectID             string `json:"GOOGLE_PROJECT_ID"`
+	GoogleServiceAccountJSONKey string `json:"GOOGLE_SERVICE_ACCOUNT_JSON_KEY"`
+}
+
 // +kubebuilder:validation:Enum=gcs;s3;azure;swift
 type ObjstoreProvider string
 

diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/ace/README.md b/charts/ace/README.md
diff --git a/charts/ace/templates/dns/dns-cred.yaml b/charts/ace/templates/dns/dns-cred.yaml
@@ -16,4 +16,7 @@ stringData:
   AWS_SECRET_ACCESS_KEY: '{{ .Values.global.infra.dns.auth.route53.AWS_SECRET_ACCESS_KEY }}'
   AWS_REGION: '{{ .Values.global.infra.dns.auth.route53.AWS_REGION }}'
 {{- end }}
-{{- end }}
+{{- if eq .Values.global.infra.dns.provider "cloudDNS" }}
+  GOOGLE_SERVICE_ACCOUNT_JSON_KEY: '{{ .Values.global.infra.dns.auth.cloudDNS.GOOGLE_SERVICE_ACCOUNT_JSON_KEY }}'
+{{- end }}
+{{- end }}
diff --git a/charts/ace/templates/ingress/issuer.yaml b/charts/ace/templates/ingress/issuer.yaml
@@ -46,5 +46,12 @@ spec:
             key: CF_API_TOKEN
       {{- end }}
       {{- end }}
+      {{- if eq .Values.global.infra.dns.provider "cloudDNS" }}
+        cloudDNS:
+          project: {{ .Values.global.infra.dns.auth.cloudDNS.GOOGLE_PROJECT_ID }}
+          serviceAccountSecretRef:
+            name: {{ include "ace.fullname" . }}-dns-cred
+            key: GOOGLE_SERVICE_ACCOUNT_JSON_KEY
+      {{- end }}
   {{- end }}
 {{- end }}
diff --git a/charts/ace/values.openapiv3_schema.yaml b/charts/ace/values.openapiv3_schema.yaml
@@ -3702,6 +3702,16 @@ properties:
             properties:
               auth:
                 properties:
+                  cloudDNS:
+                    properties:
+                      GOOGLE_PROJECT_ID:
+                        type: string
+                      GOOGLE_SERVICE_ACCOUNT_JSON_KEY:
+                        type: string
+                    required:
+                    - GOOGLE_PROJECT_ID
+                    - GOOGLE_SERVICE_ACCOUNT_JSON_KEY
+                    type: object
                   cloudflare:
                     properties:
                       baseURL:
@@ -3730,6 +3740,7 @@ properties:
                 - external
                 - cloudflare
                 - route53
+                - cloudDNS
                 type: string
             required:
             - auth

diff --git a/charts/ace/values.yaml b/charts/ace/values.yaml
@@ -143,10 +143,13 @@ global:
         cert: ""
         key: ""
     dns:
-      provider: "cloudflare" # external,cloudflare,route53
-      auth:
-        cloudflare:
-          token: xyz
+      provider: "external" # external,cloudflare,route53,cloudDNS
+      auth: {}
+        # cloudflare:
+          # token: xyz
+        # cloudDNS:
+          # GOOGLE_PROJECT_ID: "project-id"
+          # GOOGLE_SERVICE_ACCOUNT_JSON_KEY: xyz
     # KMS and Object Store services are required
     # set provider to empty to disable this feature
     objstore:

diff --git a/schema/ace-options/values.openapiv3_schema.yaml b/schema/ace-options/values.openapiv3_schema.yaml
@@ -389,6 +389,16 @@ properties:
         properties:
           auth:
             properties:
+              cloudDNS:
+                properties:
+                  GOOGLE_PROJECT_ID:
+                    type: string
+                  GOOGLE_SERVICE_ACCOUNT_JSON_KEY:
+                    type: string
+                required:
+                - GOOGLE_PROJECT_ID
+                - GOOGLE_SERVICE_ACCOUNT_JSON_KEY
+                type: object
               cloudflare:
                 properties:
                   baseURL:
@@ -417,6 +427,7 @@ properties:
             - external
             - cloudflare
             - route53
+            - cloudDNS
             type: string
         required:
         - auth