set default cors regex list

Author: zubenkoivan

charts/platform-ingress/templates/_helpers.tpl

@@ -25,3 +25,7 @@ chart: {{ include "platform.chart" . }}
 heritage: {{ .Release.Service | quote }}
 release: {{ .Release.Name | quote }}
 {{- end -}}
+
+{{- define "platform.clusterDnsName" -}}
+{{- required "clusterDnsName is required" .Values.clusterDnsName -}}
+{{- end -}}

charts/platform-ingress/templates/cors-middleware.yaml

@@ -42,8 +42,10 @@ spec:
     accessControlAllowOriginList:
       {{- toYaml . | nindent 6 }}
     {{- end }}
-    {{- with .Values.cors.originListRegex }}
     accessControlAllowOriginListRegex:
+      - https:\/\/[a-zA-Z0-9_-]+\.jobs\.{{ include "platform.clusterDnsName" . | regexQuoteMeta }}
+      - https:\/\/[a-zA-Z0-9_-]+\.apps\.{{ include "platform.clusterDnsName" . | regexQuoteMeta }}
+    {{- with .Values.cors.originListRegex }}
       {{- toYaml . | nindent 6 }}
     {{- end }}
     accessControlMaxAge: 100

charts/platform-ingress/tests/__snapshot__/cors-middleware_test.yaml.snap

@@ -46,6 +46,8 @@ exposes configured CORS origins:
         accessControlAllowOriginList:
           - https://example.com
         accessControlAllowOriginListRegex:
+          - https:\/\/[a-zA-Z0-9_-]+\.jobs\.test-cluster\.org\.apolo\.us
+          - https:\/\/[a-zA-Z0-9_-]+\.apps\.test-cluster\.org\.apolo\.us
           - https://.*\\.example\\.com
         accessControlMaxAge: 100
         addVaryHeader: true

charts/platform-ingress/tests/cors-middleware_test.yaml

@@ -6,6 +6,7 @@ tests:
     release:
       name: ingress
     set:
+      clusterDnsName: test-cluster.org.apolo.us
       cors:
         originList:
           - https://example.com

charts/platform-ingress/values.yaml

@@ -1,5 +1,6 @@
 # defaultClassName: traefik
 
+clusterDnsName: ""
 ingressAuthHost: api.apolo.us
 fallbackHost: default.jobs.apolo.us
 

charts/platform/templates/platform-ingress-application.yaml

@@ -1,10 +1,12 @@
 {{- define "platform.argocd.applications.platformIngress.values" -}}
+{{- $clusterDnsName := include "platform.clusterDnsName" . -}}
 {{- $platformUrls := include "platform.urls" . | fromYaml -}}
 {{- $ingressAuthUrl := urlParse (get $platformUrls "ingressAuthUrl") -}}
 {{- $ingressAuthHost := $ingressAuthUrl.host -}}
 {{- with .Values.defaultIngressClassName }}
 defaultClassName: {{ . }}
 {{- end }}
+clusterDnsName: {{ $clusterDnsName }}
 ingressAuthHost: {{ $ingressAuthHost }}
 {{- end }}
 

charts/platform/tests/__snapshot__/platform-ingress-application_test.yaml.snap

@@ -19,6 +19,7 @@ renders argocd application for platform-ingress chart:
         helm:
           releaseName: platform
           valuesObject:
+            clusterDnsName: test-cluster.org.apolo.us
             defaultClassName: traefik
             ingressAuthHost: api.apolo.us
         repoURL: ghcr.io/neuro-inc/helm-charts/platform-compute