Merge pull request #32 from catenax-ng/main

Rebase
eclipse-tractusx · Apr 26, 2024 · 9d1e542 · 9d1e542
2 parents ffe0513 + d5803ce
commit 9d1e542
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 162 deletions.
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
diff --git a/charts/sdfactory/values-beta.yaml b/charts/sdfactory/values-beta.yaml
@@ -26,26 +26,6 @@ ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
     kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/configuration-snippet: |-
-      if ($http_origin ~* "http.?:\/\/(.*\.)?(localhost:3000|catena-x\.net|example\.com|idses-fe\.demo\.catena-x\.net).*$") {
-        set $allow_origin $http_origin;
-      }
-
-      add_header "Access-Control-Allow-Origin" "$http_origin" always;
-      add_header "Access-Control-Allow-Methods" "GET, PUT, POST, OPTIONS, DELETE" always;
-      add_header "Access-Control-Allow-Headers" "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization" always;
-      add_header "Access-Control-Expose-Headers" "Content-Range";
-
-      if ($request_method = 'OPTIONS') {
-        add_header "Access-Control-Allow-Origin" "$http_origin" always;
-        add_header "Access-Control-Allow-Methods" "GET, PUT, POST, OPTIONS, DELETE" always;
-        add_header "Access-Control-Allow-Headers" "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization" always;
-        add_header "Access-Control-Max-Age" "1728000" always;
-        add_header "Content-Type" "text/plain charset=UTF-8";
-        add_header "Content-Length" 0;
-        return 204;
-      }
-
   hosts:
     - host: "sdfactory.beta.demo.catena-x.net"
       paths:

diff --git a/charts/sdfactory/values-dev.yaml b/charts/sdfactory/values-dev.yaml
@@ -25,27 +25,7 @@ ingress:
   domain: ""
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
-    kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/configuration-snippet: |-
-      if ($http_origin ~* "http.?:\/\/(.*\.)?(localhost:3000|catena-x\.net|example\.com|idses-fe\.demo\.catena-x\.net).*$") {
-        set $allow_origin $http_origin;
-      }
-
-      add_header "Access-Control-Allow-Origin" "$http_origin" always;
-      add_header "Access-Control-Allow-Methods" "GET, PUT, POST, OPTIONS, DELETE" always;
-      add_header "Access-Control-Allow-Headers" "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization" always;
-      add_header "Access-Control-Expose-Headers" "Content-Range";
-
-      if ($request_method = 'OPTIONS') {
-        add_header "Access-Control-Allow-Origin" "$http_origin" always;
-        add_header "Access-Control-Allow-Methods" "GET, PUT, POST, OPTIONS, DELETE" always;
-        add_header "Access-Control-Allow-Headers" "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization" always;
-        add_header "Access-Control-Max-Age" "1728000" always;
-        add_header "Content-Type" "text/plain charset=UTF-8";
-        add_header "Content-Length" 0;
-        return 204;
-      }
-      
+    kubernetes.io/ingress.class: nginx   
   hosts:
     - host: "sdfactory.dev.demo.catena-x.net"
       paths:

diff --git a/charts/sdfactory/values-int.yaml b/charts/sdfactory/values-int.yaml
@@ -25,27 +25,7 @@ ingress:
   domain: ""
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
-    kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/configuration-snippet: |-
-      if ($http_origin ~* "http.?:\/\/(.*\.)?(localhost:3000|catena-x\.net|example\.com|idses-fe\.demo\.catena-x\.net).*$") {
-        set $allow_origin $http_origin;
-      }
-
-      add_header "Access-Control-Allow-Origin" "$http_origin" always;
-      add_header "Access-Control-Allow-Methods" "GET, PUT, POST, OPTIONS, DELETE" always;
-      add_header "Access-Control-Allow-Headers" "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization" always;
-      add_header "Access-Control-Expose-Headers" "Content-Range";
-
-      if ($request_method = 'OPTIONS') {
-        add_header "Access-Control-Allow-Origin" "$http_origin" always;
-        add_header "Access-Control-Allow-Methods" "GET, PUT, POST, OPTIONS, DELETE" always;
-        add_header "Access-Control-Allow-Headers" "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization" always;
-        add_header "Access-Control-Max-Age" "1728000" always;
-        add_header "Content-Type" "text/plain charset=UTF-8";
-        add_header "Content-Length" 0;
-        return 204;
-      }
-      
+    kubernetes.io/ingress.class: nginx 
   hosts:
     - host: "sdfactory.int.demo.catena-x.net"
       paths:

diff --git a/charts/sdfactory/values-pen.yaml b/charts/sdfactory/values-pen.yaml
@@ -26,26 +26,6 @@ ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
     kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/configuration-snippet: |-
-      if ($http_origin ~* "http.?:\/\/(.*\.)?(localhost:3000|catena-x\.net|example\.com|idses-fe\.demo\.catena-x\.net).*$") {
-        set $allow_origin $http_origin;
-      }
-
-      add_header "Access-Control-Allow-Origin" "$http_origin" always;
-      add_header "Access-Control-Allow-Methods" "GET, PUT, POST, OPTIONS, DELETE" always;
-      add_header "Access-Control-Allow-Headers" "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization" always;
-      add_header "Access-Control-Expose-Headers" "Content-Range";
-
-      if ($request_method = 'OPTIONS') {
-        add_header "Access-Control-Allow-Origin" "$http_origin" always;
-        add_header "Access-Control-Allow-Methods" "GET, PUT, POST, OPTIONS, DELETE" always;
-        add_header "Access-Control-Allow-Headers" "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization" always;
-        add_header "Access-Control-Max-Age" "1728000" always;
-        add_header "Content-Type" "text/plain charset=UTF-8";
-        add_header "Content-Length" 0;
-        return 204;
-      }
-
   hosts:
     - host: "sdfactory-pen.int.demo.catena-x.net"
       paths:

diff --git a/charts/sdfactory/values-test.yaml b/charts/sdfactory/values-test.yaml
@@ -26,27 +26,6 @@ ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-prod
     kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/configuration-snippet: |-
-      if ($http_origin ~* "http.?:\/\/(.*\.)?(localhost:3000|catena-x\.net|example\.com|idses-fe\.demo\.catena-x\.net).*$") {
-        set $allow_origin $http_origin;
-      }
-
-      add_header "Access-Control-Allow-Origin" "$http_origin" always;
-      add_header "Access-Control-Allow-Methods" "GET, PUT, POST, OPTIONS, DELETE" always;
-      add_header "Access-Control-Allow-Headers" "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization" always;
-      add_header "Access-Control-Expose-Headers" "Content-Range";
-
-      if ($request_method = 'OPTIONS') {
-        add_header "Access-Control-Allow-Origin" "$http_origin" always;
-        add_header "Access-Control-Allow-Methods" "GET, PUT, POST, OPTIONS, DELETE" always;
-        add_header "Access-Control-Allow-Headers" "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization" always;
-        add_header "Access-Control-Max-Age" "1728000" always;
-        add_header "Content-Type" "text/plain charset=UTF-8";
-        add_header "Content-Length" 0;
-        return 204;
-      }
-
-
   hosts:
     - host: "sdfactory-test.int.demo.catena-x.net"
       paths: