From dbebab1ad0424badad57005c3070977b6477a852 Mon Sep 17 00:00:00 2001
From: pida123 <pidanou.eang@smart-chain.fr>
Date: Thu, 3 Aug 2023 15:41:18 +0200
Subject: [PATCH] fix secret injection in helm chart

---
 devops/ppd.values.yaml              | 5 ++++-
 devops/prd.values.yaml              | 5 ++++-
 devops/stg.values.yaml              | 4 +---
 devops/templates/lecoffre-back.yaml | 9 ++++++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/devops/ppd.values.yaml b/devops/ppd.values.yaml
index 3320c1aa..f010ae46 100644
--- a/devops/ppd.values.yaml
+++ b/devops/ppd.values.yaml
@@ -4,7 +4,7 @@ scwSecretKey: AgCgjF5QEzxT3GYTS5B6cmQ0e+0/qFWzKaUDSi+Vjc7RoameuvaIJvTXMBkS3he1oy
 
 lecoffreBack:
   serviceAccountName: lecoffre-back-sa
-  command: "npm run api:start" 
+  command: "export $(xargs </etc/.env) && npm run api:start" 
   envSecrets: ppd-env
   imagePullSecrets:
     - name: docker-pull-secret
@@ -28,4 +28,7 @@ lecoffreBack:
       cert-manager.io/cluster-issuer: letsencrypt-prod 
       nginx.ingress.kubernetes.io/from-to-www-redirect: "true"
       nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+  env: 
+    - key: env1
+      scwID: "id:a131edea-84e0-49d6-b4a8-20ab417220c9"
 
diff --git a/devops/prd.values.yaml b/devops/prd.values.yaml
index f0fa85c8..99910bb9 100644
--- a/devops/prd.values.yaml
+++ b/devops/prd.values.yaml
@@ -4,7 +4,7 @@ scwSecretKey: AgBG2y7uQuap+2akNPGFxpCR+l0INO6Wxez5qljtY6t71GFGhJLYN9ZfefflKcFzD2
 
 lecoffreBack:
   serviceAccountName: lecoffre-back-sa
-  command: "npm run api:start" 
+  command: "export $(xargs </etc/.env) && npm run api:start" 
   envSecrets: prd-env
   imagePullSecrets:
     - name: docker-pull-secret
@@ -28,4 +28,7 @@ lecoffreBack:
       cert-manager.io/cluster-issuer: letsencrypt-prod 
       nginx.ingress.kubernetes.io/from-to-www-redirect: "true"
       nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+  env: 
+    - key: env1
+      scwID: "id:a131edea-84e0-49d6-b4a8-20ab417220c9"
 
diff --git a/devops/stg.values.yaml b/devops/stg.values.yaml
index 21eb7d90..ef2e7c42 100644
--- a/devops/stg.values.yaml
+++ b/devops/stg.values.yaml
@@ -5,7 +5,7 @@ scwSecretKey: AgChoEnPitXp4Ny/rVMEcevaWKNVpyj2cJYAcq+yFqKwVwnLB+ffDvwqz9XBHu+6d4
 lecoffreBack:
   serviceAccountName: lecoffre-back-sa
   envSecrets: stg-env
-  command: "npm run api:start" 
+  command: "export $(xargs </etc/.env) && npm run api:start" 
   imagePullSecrets:
     - name: docker-pull-secret
   image:
@@ -32,7 +32,5 @@ lecoffreBack:
   env: 
     - key: env1
       scwID: "id:a131edea-84e0-49d6-b4a8-20ab417220c9"
-    - key: env2 
-      scwID: "id:f396cfed-098f-4f75-8e5e-92ba60b46cee"
 
 
diff --git a/devops/templates/lecoffre-back.yaml b/devops/templates/lecoffre-back.yaml
index cb1a8f98..7f6e0b1b 100644
--- a/devops/templates/lecoffre-back.yaml
+++ b/devops/templates/lecoffre-back.yaml
@@ -65,6 +65,9 @@ spec:
 {{end}}
         imagePullPolicy: {{ .Values.lecoffreBack.image.pullPolicy }}
         command: [{{ .Values.lecoffreBack.command }}]
-        envFrom:
-          - secretRef:
-              name:  {{ .Values.lecoffreBack.envSecrets }}
\ No newline at end of file
+        volumeMounts:
+          - mountPath: /etc/.env
+      volumes:
+          - name: secret-volume
+            secret:
+              secretName: {{ .Values.lecoffreBack.envSecrets }}
\ No newline at end of file