drop the suffix cname

Author: boddumanohar

chart/templates/controller.yaml

@@ -94,8 +94,8 @@ data:
   VELA_KEYCLOAK_ADMIN_SECRET: {{ .Values.controller.env.VELA_KEYCLOAK_ADMIN_SECRET | quote }}
   VELA_CLOUDFLARE__API_TOKEN: {{ .Values.controller.env.VELA_CLOUDFLARE_API_TOKEN | quote }}
   VELA_CLOUDFLARE__ZONE_ID: {{ .Values.controller.env.VELA_CLOUDFLARE_ZONE_ID | quote }}
-  VELA_CLOUDFLARE__BRANCH_REF_CNAME: {{ .Values.controller.env.VELA_BRANCH_REF_CNAME | quote }}
-  VELA_CLOUDFLARE__BRANCH_DB_REF_CNAME: {{ .Values.controller.env.VELA_BRANCH_DB_REF_CNAME | quote }}
+  VELA_CLOUDFLARE__BRANCH_REF: {{ .Values.controller.env.VELA_BRANCH_REF | quote }}
+  VELA_CLOUDFLARE__BRANCH_DB_REF: {{ .Values.controller.env.VELA_BRANCH_DB_REF | quote }}
   VELA_CLOUDFLARE__DOMAIN_SUFFIX: {{ .Values.domain | quote }}
   VELA_DEPLOYMENT_NAMESPACE_PREFIX: {{ .Values.controller.env.VELA_DEPLOYMENT_NAMESPACE_PREFIX | quote }}
   VELA_DEPLOYMENT_SERVICE_PORT: {{ .Values.port | quote }}

chart/values.yaml

@@ -34,8 +34,8 @@ controller:
     VELA_CLOUDFLARE_API_TOKEN: 'your_cloudflare_api_token'
     VELA_CLOUDFLARE_ZONE_ID: 'your_cloudflare_zone_id'
     VELA_DEPLOYMENT_NAMESPACE_PREFIX: 'vela'
-    VELA_BRANCH_REF_CNAME: 'demo-ref.vela.run'
-    VELA_BRANCH_DB_REF_CNAME: 'demo-dbref.vela.run'
+    VELA_BRANCH_REF: 'demo-ref.vela.run'
+    VELA_BRANCH_DB_REF: 'demo-dbref.vela.run'
     VELA_KEYCLOAK_URL: 'http://vela-auth-service:8080/auth/'
     VELA_JWT_SECRET: 'http://vela-auth-service:8080/auth/realms/vela/protocol/openid-connect/certs'
     VELA_GRAFANA_URL: 'http://vela-grafana:3000'

containers/compose.yml

@@ -32,8 +32,8 @@ services:
       VELA_KEYCLOAK_ADMIN_SECRET: 'admin'
       VELA_CLOUDFLARE__API_TOKEN: 'your_cloudflare_api_token'
       VELA_CLOUDFLARE__ZONE_ID: 'your_cloudflare_zone_id'
-      VELA_CLOUDFLARE__BRANCH_REF_CNAME: 'branch-ref.staging.vela.run'
-      VELA_CLOUDFLARE__BRANCH_DB_REF_CNAME: 'branch-db-ref.staging.vela.run'
+      VELA_CLOUDFLARE__BRANCH_REF: 'branch-ref.staging.vela.run'
+      VELA_CLOUDFLARE__BRANCH_DB_REF: 'branch-db-ref.staging.vela.run'
       VELA_CLOUDFLARE__DOMAIN_SUFFIX: 'example.com'
       VELA_DEPLOYMENT_NAMESPACE_PREFIX: 'vela'
       VELA_GRAFANA_URL: 'http://grafana:3000'

src/deployment/__init__.py

@@ -1186,7 +1186,7 @@ async def provision_branch_endpoints(
             cf_cfg,
             domain=domain,
             record_type="CNAME",
-            content=cf_cfg.branch_ref_cname,
+            content=cf_cfg.branch_ref,
             proxied=False,
         )
     )
@@ -1195,7 +1195,7 @@ async def provision_branch_endpoints(
             cf_cfg,
             domain=db_domain,
             record_type=DATABASE_DNS_RECORD_TYPE,
-            content=cf_cfg.branch_db_ref_cname,
+            content=cf_cfg.branch_db_ref,
             proxied=False,
         )
     )

src/deployment/settings.py

@@ -8,8 +8,8 @@
 class CloudflareSettings(BaseModel):
     api_token: str
     zone_id: str
-    branch_ref_cname: str
-    branch_db_ref_cname: str
+    branch_ref: str
+    branch_db_ref: str
     domain_suffix: str