move cors again!

dnvgl · Apr 14, 2021 · 658dea7 · 658dea7
1 parent e239b6a
commit 658dea7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/charts/platform-service/Chart.yaml b/charts/platform-service/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: Platform service chart
 name: platform-service
-version: 1.0.21
+version: 1.0.22
diff --git a/charts/platform-service/templates/virtualservice.yaml b/charts/platform-service/templates/virtualservice.yaml
@@ -62,6 +62,10 @@ spec:
   - route:
     - destination:
         host: {{ include "platform-service.serviceName" . | quote }}
+{{- if .Values.defaultRouting.corsPolicy }}
+    corsPolicy:
+{{ .Values.defaultRouting.corsPolicy | toYaml | trim | indent 6 }}
+{{- end -}}
 
   {{- if not .Values.defaultRouting.catchAll }}
     match:
@@ -78,10 +82,6 @@ spec:
     rewrite:
       uri: {{ required "rewriteUri is required" .Values.defaultRouting.rewriteUrlPrefix.replaceWith }}
 {{- end}}
-{{- if .Values.defaultRouting.corsPolicy }}
-    corsPolicy:
-{{ .Values.defaultRouting.corsPolicy | toYaml | trim | indent 6 }}
-{{- end -}}
     # deprecated
     headers:
       request:

diff --git a/charts/platform-service/values.yaml b/charts/platform-service/values.yaml
@@ -102,16 +102,16 @@ defaultRouting:
     #  attempts: 3
     #  perTryTimeout: 2s
 
-  # corsPolicy:
-  #   allowOrigins:
-  #     - exact: https://example.com
-  #   allowMethods:
-  #     - POST
-  #     - GET
-  #   allowCredentials: false
-  #   allowHeaders:
-  #     - X-Foo-Bar
-  #  maxAge: "24h"
+  corsPolicy:
+    allowOrigins:
+      - exact: https://example.com
+    allowMethods:
+      - POST
+      - GET
+    allowCredentials: false
+    allowHeaders:
+      - X-Foo-Bar
+    maxAge: "24h"
 
 # Specify network policies
 networkPolicy: