update helm config

#build-docker-be-and-push-image.bat

+@ECHO off
+
+set servicename=sdtooling-validation-api-be
+
+ECHO ============================
+ECHO SERVICE NAME : %servicename%
+ECHO ============================
+
+ECHO ============================
+ECHO BUILD BE
+ECHO ============================
+
+call mvn clean package -DskipTests
+
+ECHO ============================
+ECHO DOCKER LOGIN
+ECHO ============================
+
+call docker login code.europa.eu:4567
+
+ECHO ============================
+ECHO DOCKER BUILD
+ECHO ============================
+
+call docker build -t code.europa.eu:4567/simpl/simpl-open/development/data1/%servicename% .
+
+ECHO ============================
+ECHO DOCKER PUSH
+ECHO ============================
+
+call docker push code.europa.eu:4567/simpl/simpl-open/development/data1/%servicename%
+
+ECHO ============================
+ECHO ALL COMMAND COMPLETED
+ECHO ============================
+
+EXIT /B
\ No newline at end of file

deployment/sd/helm/sd-creation-wizard/templates/deployment.yaml

@@ -11,11 +11,24 @@ spec:
       app: sd-api
   template:
     metadata:
+      annotations:
+        vault.hashicorp.com/agent-inject: "true"
+        vault.hashicorp.com/role: "gaiax-edc_role"
+        vault.hashicorp.com/agent-inject-secret-config.txt: "dev/gaiax-edc-dev-sd-sd-creation-wizard-api"
+        vault.hashicorp.com/agent-inject-template-config.txt: |
+          {{`{{ with secret "dev/gaiax-edc-dev-sd-sd-creation-wizard-api" }}
+          {{ range $k, $v := .Data.data }}
+            export {{ $k }}={{ $v }}
+          {{ end }}
+          {{ end }}`}}
       labels:
         app: sd-api
     spec:
+      serviceAccountName: {{ .Release.Namespace }}
       containers:
         - name: {{ .Chart.Name }}-api
+          command: [ "/bin/sh" ]
+          args: [ "-c", "source /vault/secrets/config.txt && java -jar /app.jar" ]
           image: code.europa.eu:4567/simpl/simpl-open/development/data1/sdtooling-api-be:latest
           imagePullPolicy: Always
           ports:
@@ -36,15 +49,51 @@ spec:
       app: sd-frontend
   template:
     metadata:
+      annotations:
+        vault.hashicorp.com/agent-inject: "true"
+        vault.hashicorp.com/role: "gaiax-edc_role"
+        vault.hashicorp.com/agent-inject-secret-config.txt: "dev/gaiax-edc-dev-sd-sd-creation-wizard-frontend"
+        vault.hashicorp.com/agent-inject-template-config.txt: |
+          {{`{{ with secret "dev/gaiax-edc-dev-sd-sd-creation-wizard-frontend" }}
+          {{ range $k, $v := .Data.data }}
+            export {{ $k }}={{ $v }}
+          {{ end }}
+          {{ end }}`}}
       labels:
         app: sd-frontend
     spec:
+      serviceAccountName: {{ .Release.Namespace }}
       containers:
         - name: {{ .Chart.Name }}-frontend
-          image: code.europa.eu:4567/simpl/simpl-open/development/data1/sdtooling-wizard-fe:latest
+          command: [ "/bin/sh" ]
+          args: [ "-c", "source /vault/secrets/config.txt && envsubst < /usr/share/nginx/html/assets/env.template.js > /usr/share/nginx/html/assets/env.js && exec nginx -g 'daemon off;'" ]
+          image: code.europa.eu:4567/simpl/simpl-open/development/data1/sdtooling-wizard-fe:0.0.1
           imagePullPolicy: Always
           ports:
             - containerPort: {{ .Values.creationWizardFrontendContainerPort }}
-          env:
-            - name: API_URL
-              value:  https://creation-wizard-api.{{ .Values.domain }}
+
+---
+
\ No newline at end of file
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Release.Name }}-creation-wizard-api-validation
+  labels:
+    app: sd-api-validation
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: sd-api-validation
+  template:
+    metadata:
+      labels:
+        app: sd-api-validation
+    spec:
+      serviceAccountName: {{ .Release.Namespace }}
+      containers:
+        - name: {{ .Chart.Name }}-api-validation
+          image: code.europa.eu:4567/simpl/simpl-open/development/data1/sdtooling-validation-api-be:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: {{ .Values.creationWizardApiValidationContainerPort }}
\ No newline at end of file

deployment/sd/helm/sd-creation-wizard/templates/ingress.yaml

@@ -54,3 +54,31 @@ spec:
                 name: {{ .Release.Name }}-creation-wizard-api
                 port:
                   number: {{ .Values.creationWizardApiServicePort}}
+
+---
+
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ .Release.Name }}-creation-wizard-api-validation
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    cert-manager.io/cluster-issuer: "dev-prod"
+    acme.cert-manager.io/http01-edit-in-place: "true"
+    kubernetes.io/ingress.class: nginx
+spec:
+  tls:
+    - hosts:
+        - creation-wizard-api-validation.{{ .Values.domain }}
+      secretName: creation-wizard-api-validation-tls
+  rules:
+    - host: creation-wizard-api-validation.{{ .Values.domain}}
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: {{ .Release.Name }}-creation-wizard-api-validation
+                port:
+                  number: {{ .Values.creationWizardApiValidationServicePort}}
\ No newline at end of file

deployment/sd/helm/sd-creation-wizard/templates/service.yaml

@@ -25,3 +25,18 @@ spec:
       protocol: TCP
       port: {{ .Values.creationWizardFrontendServicePort }}
       targetPort: {{ .Values.creationWizardFrontendContainerPort }}
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-creation-wizard-api-validation
+spec:
+  selector:
+    app: sd-api-validation
+  ports:
+    - name: http
+      protocol: TCP
+      port: {{ .Values.creationWizardApiValidationServicePort }}
+      targetPort: {{ .Values.creationWizardApiValidationContainerPort }}

deployment/sd/helm/sd-creation-wizard/templates/serviceaccount.yaml

+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Namespace }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ .Release.Name }}

deployment/sd/helm/sd-creation-wizard/values.yaml

+creationWizardApiValidationServicePort: 8081
 creationWizardApiServicePort: 8082
 creationWizardFrontendServicePort: 8087
 
+creationWizardApiValidationContainerPort: 8081
 creationWizardApiContainerPort: 8080
 creationWizardFrontendContainerPort: 80