fix: fixed cors and template issues (#717)

* fixed persistence and changed formatting

* release canidate for chart version 2.0.0

Author: marctuerke

examples/cloud/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: aas-basyx-v2-full
 description: Umbrella chart for the AAS Basyx v2 Environment
 type: application
-version: 0.0.1
-appVersion: 0.0.1
+version: 2.0.0
+appVersion: 2.0.0
 
 dependencies:
 # Contains frontend, backend and dashboard
@@ -36,8 +36,6 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   alias: mongodb
   condition: mongodb.enabled
-  # Isolation der MongoDB-Variablen durch eigenen Namespace
-  namespace: project-factory-x
 - repository: https://charts.bitnami.com/bitnami
   name: keycloak
   version: 24.4.11

examples/cloud/dependency_charts/aas-discovery/templates/aas-discovery-apirule.yaml

@@ -7,14 +7,20 @@ metadata:
   name: {{ include "aas-discovery.fullname" . }}
 spec:
   gateway: kyma-system/kyma-gateway
+  {{- if .Values.apirule.corsPolicy }}
+  corsPolicy: 
+    {{- with .Values.apirule.corsPolicy }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- end }}
   hosts:
-    - {{ .Values.apirule.host }}
+  - {{ .Values.apirule.host }}
   service:
     name: {{ include "aas-discovery.fullname" . }}
     port: {{ .Values.service.port }}
   timeout: 360
   rules:
-    - path: /*
-      methods: {{- toYaml .Values.apirule.methods | nindent 6 }}
-      noAuth: true
+  - path: /*
+    methods: {{- toYaml .Values.apirule.methods | nindent 6 }}
+    noAuth: true
 {{ end -}}

examples/cloud/dependency_charts/aas-discovery/templates/aas-discovery-deployment.yaml

@@ -24,25 +24,28 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
-        - name: {{ .Chart.Name }}
-          image: {{ .Values.image.name }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.port }}
-              protocol: TCP
-          volumeMounts:
-            - mountPath: /application/application.properties
-              name: {{ template "aas-discovery.fullname" $ }}-config
-              subPath: application.properties
-            - mountPath: /application/rbac-rules.json
-              name: {{ template "aas-discovery.fullname" $ }}-rbac-rules
-              subPath: rbac-rules.json
+      - name: {{ .Chart.Name }}
+        image: {{ .Values.image.name }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        env:
+        - name: SERVER_PORT
+          value: {{ .Values.service.port | quote }}
+        ports:
+        - name: http
+          containerPort: {{ .Values.service.port }}
+          protocol: TCP
+        volumeMounts:
+        - mountPath: /application/application.properties
+          name: {{ template "aas-discovery.fullname" $ }}-config
+          subPath: application.properties
+        - mountPath: /application/rbac-rules.json
+          name: {{ template "aas-discovery.fullname" $ }}-rbac-rules
+          subPath: rbac-rules.json
       volumes:
-        - name: {{ template "aas-discovery.fullname" $ }}-config
-          configMap:
-            name: {{ template "aas-discovery.fullname" $ }}-config
-        - name: {{ template "aas-discovery.fullname" $ }}-rbac-rules
-          configMap:
-            name: {{ template "aas-discovery.fullname" $ }}-rbac-rules
+      - name: {{ template "aas-discovery.fullname" $ }}-config
+        configMap:
+          name: {{ template "aas-discovery.fullname" $ }}-config
+      - name: {{ template "aas-discovery.fullname" $ }}-rbac-rules
+        configMap:
+          name: {{ template "aas-discovery.fullname" $ }}-rbac-rules
 {{ end -}}

examples/cloud/dependency_charts/aas-discovery/templates/aas-discovery-ingress.yaml

@@ -10,9 +10,9 @@ metadata:
       cert-manager.io/cluster-issuer: letsencrypt-prod
 spec:
   tls:
-    - hosts:
-        - {{ .Values.ingress.host }}
-      secretName: {{ include "aas-discovery.fullname" . }}-tls
+  - hosts:
+      - {{ .Values.ingress.host }}
+    secretName: {{ include "aas-discovery.fullname" . }}-tls
   rules:
   - host: {{ .Values.ingress.host }}
     http:

examples/cloud/dependency_charts/aas-discovery/templates/aas-discovery-service.yaml

@@ -8,10 +8,10 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
+  - port: {{ .Values.service.port }}
+    targetPort: http
+    protocol: TCP
+    name: http
   selector:
     {{- include "aas-discovery.selectorLabels" . | nindent 4 }}
 {{ end -}}

examples/cloud/dependency_charts/aas-discovery/values.yaml

@@ -31,10 +31,22 @@ apirule:
     - "OPTIONS" 
     - "TRACE"
     - "PATCH"
+  # -- Allows configuring CORS headers sent with the response. If corsPolicy is not defined, the CORS headers are enforced to be empty.
+  corsPolicy: 
+    allowMethods:
+    - POST
+    - GET
+    - PUT
+    - DELETE
+    - PATCH
+    - OPTIONS
+    - HEAD
+    allowOrigins:
+      - regex: ".*" # allow all origins
+    allowCredentials: true
 
 # Content of application.properties
 config: |
-  server.port=8080
   spring.application.name=AAS Discovery Service
 
   basyx.aasdiscoveryservice.name=aas-discovery-service

examples/cloud/dependency_charts/aas-environment/templates/aas-environment-apirule.yaml

@@ -7,14 +7,20 @@ metadata:
   name: {{ include "aas-environment.fullname" . }}
 spec:
   gateway: kyma-system/kyma-gateway
+  {{- if .Values.apirule.corsPolicy }}
+  corsPolicy: 
+    {{- with .Values.apirule.corsPolicy }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- end }}
   hosts:
-    - {{ .Values.apirule.host }}
+  - {{ .Values.apirule.host }}
   service:
     name: {{ include "aas-environment.fullname" . }}
     port: {{ .Values.service.port }}
   timeout: 360
   rules:
-    - path: /*
-      methods: {{- toYaml .Values.apirule.methods | nindent 6 }}
-      noAuth: true
+  - path: /*
+    methods: {{- toYaml .Values.apirule.methods | nindent 6 }}
+    noAuth: true
 {{ end -}}

examples/cloud/dependency_charts/aas-environment/templates/aas-environment-deployment.yaml

@@ -19,13 +19,13 @@ spec:
         {{- include "aas-environment.selectorLabels" . | nindent 8 }}
     spec:
       volumes:
-        {{- if .Values.startup.enabled }}
-        - name: startup
-          emptyDir: {}
-        {{- end }}
-        - name: {{ template "aas-environment.fullname" $ }}-config
-          configMap:
-            name: {{ template "aas-environment.fullname" $ }}-config
+      {{- if .Values.startup.enabled }}
+      - name: startup
+        emptyDir: {}
+      {{- end }}
+      - name: {{ template "aas-environment.fullname" $ }}-config
+        configMap:
+          name: {{ template "aas-environment.fullname" $ }}-config
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -49,6 +49,9 @@ spec:
       - name: {{ .Chart.Name }}
         image: {{ .Values.image.name }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        env:
+        - name: SERVER_PORT
+          value: {{ .Values.service.port | quote }}
         ports:
         - name: http
           containerPort: {{ .Values.service.port }}

examples/cloud/dependency_charts/aas-environment/templates/aas-environment-ingress.yaml

@@ -10,9 +10,9 @@ metadata:
       cert-manager.io/cluster-issuer: letsencrypt-prod
 spec:
   tls:
-    - hosts:
-        - {{ .Values.ingress.host }}
-      secretName: {{ include "aas-environment.fullname" . }}-tls
+  - hosts:
+      - {{ .Values.ingress.host }}
+    secretName: {{ include "aas-environment.fullname" . }}-tls
   rules:
   - host: {{ .Values.ingress.host }}
     http:

examples/cloud/dependency_charts/aas-environment/templates/aas-environment-service.yaml

@@ -7,9 +7,9 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.service.port }}
-      targetPort: http
-      protocol: TCP
-      name: http
+  - port: {{ .Values.service.port }}
+    targetPort: http
+    protocol: TCP
+    name: http
   selector:
     {{- include "aas-environment.selectorLabels" . | nindent 4 }}