From 0a1d4e6d07f9e4bb7f6a8bed32ed0f66da32d0cf Mon Sep 17 00:00:00 2001
From: inikulin <inikulin@co-work.ru>
Date: Wed, 23 Jul 2025 09:23:47 +0000
Subject: [PATCH] Edit deployment.yaml

---
 .../admin-app-k8s/templates/deployment.yaml   | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/charts/backend/charts/admin-app-k8s/templates/deployment.yaml b/charts/backend/charts/admin-app-k8s/templates/deployment.yaml
index daafdf3..970d5a5 100755
--- a/charts/backend/charts/admin-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/admin-app-k8s/templates/deployment.yaml
@@ -38,11 +38,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: admin-app
           ports:
@@ -51,16 +56,6 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.general" . | nindent 12 }}
-            - name: WORKSPACE_HOST
-              value: "{{ .Values.env.workspace_host }}"
-            - name: WORKSPACE_PORT
-              value: "{{ .Values.env.workspace_port }}"
-            - name: USER_HOST
-              value: "{{ .Values.env.user_host }}"
-            - name: USER_PORT
-              value: "{{ .Values.env.user_port }}"
-            - name: DEBUG_GLOBAL_PREFIX
-              value: "{{ .Values.global.dockerRegistryPrefix | default "NOT SET" }}"
           volumeMounts:
             - name: cacerts-volume
               mountPath: /usr/lib/jvm/java-21-amazon-corretto/lib/security/cacerts