Merge pull request #131 from catenax-ng/modify-ingress

chore: Modification in ingress
eclipse-tractusx · Apr 25, 2024 · d5803ce · d5803ce
2 parents f1ea4b2 + d986083
commit d5803ce
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 106 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ further processing.
 
 ```shell
 Software version: 2.1.10
-Helm Chart version: 2.1.15
+Helm Chart version: 2.1.16
 ```
 
 

diff --git a/charts/sdfactory/Chart.yaml b/charts/sdfactory/Chart.yaml
@@ -38,7 +38,7 @@ sources:
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: "2.1.15"
+version: "2.1.16"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/sdfactory/README.md b/charts/sdfactory/README.md
@@ -1,6 +1,6 @@
 # sdfactory
 
-![Version: 2.1.15](https://img.shields.io/badge/Version-2.1.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.10](https://img.shields.io/badge/AppVersion-2.1.10-informational?style=flat-square)
+![Version: 2.1.16](https://img.shields.io/badge/Version-2.1.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.10](https://img.shields.io/badge/AppVersion-2.1.10-informational?style=flat-square)
 
 Helm Charts for SD Factory application. Self-Description Factory component is responsible for the creation of Self Descriptions.
 

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: