From a6f516b46c582c083a1ecaefdad59b70bdde2372 Mon Sep 17 00:00:00 2001
From: inikulin <inikulin@co-work.ru>
Date: Wed, 23 Jul 2025 10:12:06 +0000
Subject: [PATCH] Edit deployment.yaml

---
 .../auth-app-k8s/templates/deployment.yaml    | 38 ++++++-------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/charts/backend/charts/auth-app-k8s/templates/deployment.yaml b/charts/backend/charts/auth-app-k8s/templates/deployment.yaml
index 2ab4347..ba42c60 100755
--- a/charts/backend/charts/auth-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/auth-app-k8s/templates/deployment.yaml
@@ -47,11 +47,16 @@ spec:
             - sh
             - -c
             - |
-              cp /usr/lib/jvm/java-21-amazon-corretto/lib/security/cacerts /tmp/cacerts/cacerts &&
-              keytool -import -trustcacerts -storepass changeit -noprompt \
-                -alias gemcert \
-                -file /app/resources/RootCA_${CERT_ALIAS}.crt \
-                -keystore /tmp/cacerts/cacerts
+              cp /usr/lib/jvm/java-21-amazon-corretto/lib/security/cacerts /tmp/cacerts/cacerts
+              if keytool -list -keystore /tmp/cacerts/cacerts -storepass changeit -alias gemcert > /dev/null 2>&1; then
+                echo "Certificate with alias gemcert already exists, skipping import"
+              else
+                echo "Importing certificate with alias gemcert"
+                keytool -import -trustcacerts -storepass changeit -noprompt \
+                  -alias gemcert \
+                  -file /app/resources/RootCA_${CERT_ALIAS}.crt \
+                  -keystore /tmp/cacerts/cacerts
+              fi
       containers:
         - name: auth-app
           image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
@@ -63,38 +68,17 @@ spec:
               {{- end }}
               protocol: TCP
           env:
-            - name: ADMIN_CLIENT_ID
-              value: {{ .Values.env.adminClientId | quote }}
+            {{- include "global.env.general" . | nindent 12 }}
             - name: ADMIN_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.secrets.adminPassword.name }}
                   key: {{ .Values.secrets.adminPassword.key }}
-            - name: ADMIN_REALM
-              value: {{ .Values.env.adminRealm | quote }}
-            - name: ADMIN_URL
-              value: {{ .Values.env.adminUrl | quote }}
-            - name: ADMIN_USERNAME
-              value: {{ .Values.env.adminUsername | quote }}
-            - name: CLIENT_ID
-              value: {{ .Values.env.clientId | quote }}
-            - name: CLIENT_ISSUER_IRI
-              value: {{ .Values.env.clientIssuerIri | quote }}
-            - name: CLIENT_REALM
-              value: {{ .Values.env.clientRealm | quote }}
             - name: CLIENT_SECRET
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.secrets.clientSecret.name }}
                   key: {{ .Values.secrets.clientSecret.key }}
-            - name: REALM
-              value: {{ .Values.env.realm | quote }}
-            - name: CERT_ALIAS
-              value: {{ .Values.global.cert_alias | quote }}
-            - name: SECURITY_ADMIN_REALM
-              value: {{ .Values.env.securityAdminRealm | quote }}
-            - name: SECURITY_OAUTH2_CLIENT_ISSUER_URI
-              value: {{ .Values.env.securityOauth2ClientIssuerUri | quote }}
           volumeMounts:
             - name: cacerts-volume
               mountPath: /usr/lib/jvm/java-21-amazon-corretto/lib/security/cacerts