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

---
 .../call-app-k8s/templates/deployment.yaml    | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/charts/backend/charts/call-app-k8s/templates/deployment.yaml b/charts/backend/charts/call-app-k8s/templates/deployment.yaml
index 9294b91..adf3b67 100755
--- a/charts/backend/charts/call-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/call-app-k8s/templates/deployment.yaml
@@ -41,11 +41,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: call-app
           image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
@@ -56,14 +61,11 @@ spec:
             - containerPort: 9090
               protocol: TCP
           env:
-            - name: TENANT_ID
-              value: {{ .Values.env.TENANT_ID | quote }}
             {{- include "global.env.cassandra" . | nindent 12 }}
             {{- include "global.env.kafka" . | nindent 12 }}
             {{- include "global.env.redis" . | nindent 12 }}
             {{- include "global.env.general" . | nindent 12 }}
-            - name: KEYCLOAK_URL
-              value: {{ .Values.env.keycloak.url | quote }}
+            {{- include "global.env.call" . | nindent 12 }}
             - name: LIVEKIT_API_KEY
               valueFrom:
                 secretKeyRef:
@@ -79,14 +81,6 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.secrets.recording.name }}
                   key: {{ .Values.secrets.recording.accessKeyKey }}
-            - name: RECORDING_API_HOST
-              value: {{ .Values.env.livekit.apiHost | quote }}
-            - name: RECORDING_BUCKET
-              value: {{ .Values.env.recording.bucket | quote }}
-            - name: RECORDING_ENDPOINT
-              value: {{ .Values.env.recording.endpoint | quote }}
-            - name: RECORDING_REGION
-              value: {{ .Values.env.recording.region | quote }}
             - name: RECORDING_SECRET
               valueFrom:
                 secretKeyRef: