From 0c4f202a51f6131d9856a80fe44c0b33a7180beb Mon Sep 17 00:00:00 2001
From: pida123 <pidanou.eang@smart-chain.fr>
Date: Thu, 3 Aug 2023 15:59:55 +0200
Subject: [PATCH] fix secrets

---
 devops/ppd.values.yaml              | 4 ++--
 devops/prd.values.yaml              | 4 ++--
 devops/stg.values.yaml              | 8 ++++----
 devops/templates/lecoffre-back.yaml | 3 ++-
 devops/templates/secrets.yaml       | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/devops/ppd.values.yaml b/devops/ppd.values.yaml
index f010ae46..f2532b48 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: "export $(xargs </etc/.env) && npm run api:start" 
+  command: "export $(xargs </etc/env/.env) && npm run api:start" 
   envSecrets: ppd-env
   imagePullSecrets:
     - name: docker-pull-secret
@@ -29,6 +29,6 @@ lecoffreBack:
       nginx.ingress.kubernetes.io/from-to-www-redirect: "true"
       nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
   env: 
-    - key: env1
+    - key: .env
       scwID: "id:a131edea-84e0-49d6-b4a8-20ab417220c9"
 
diff --git a/devops/prd.values.yaml b/devops/prd.values.yaml
index 99910bb9..ec1bfdc9 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: "export $(xargs </etc/.env) && npm run api:start" 
+  command: "export $(xargs </etc/env/.env) && npm run api:start" 
   envSecrets: prd-env
   imagePullSecrets:
     - name: docker-pull-secret
@@ -29,6 +29,6 @@ lecoffreBack:
       nginx.ingress.kubernetes.io/from-to-www-redirect: "true"
       nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
   env: 
-    - key: env1
+    - key: .env
       scwID: "id:a131edea-84e0-49d6-b4a8-20ab417220c9"
 
diff --git a/devops/stg.values.yaml b/devops/stg.values.yaml
index ef2e7c42..7510f5e7 100644
--- a/devops/stg.values.yaml
+++ b/devops/stg.values.yaml
@@ -1,11 +1,11 @@
-dockerPullSecret: docker-pull-secret
+dockerPullSecret: id:47c1c301-1f02-49cc-9e5c-c1225a770aa8
 
 scwSecretKey: AgChoEnPitXp4Ny/rVMEcevaWKNVpyj2cJYAcq+yFqKwVwnLB+ffDvwqz9XBHu+6d4Nyyjkf37zUAMoaM21lEDWA7x3zfG2/D/j+rvX1qxzZgLD0mjBk7fGElVm332I6JA83oInes8AMMYEDPLElzHnpKRb9KtkIP4NzgOcCeW0ijft3N7Vroez6LEHsBPCA1I9XjKSkGEDvrO0MhWX3iJOlfz+SPMfJAV7rPawOs0ZmohTHrPW8qIvGDn8HCzKyU8zRBoMt+Ogpf5pH4U3JryEFuqD61KAQgablAM8edPIvsgNno9HAEuC2QtRLYA9aUhuKdaKuS58c9P2E80PHWXIlbpFCg6EugQTgNfnYp+3qDUNz8edeCfapYLvF4s9eCMGyMsGnpDR8EDNOyuGy7Y3l7okX8Xqu464gMp9E+hX7bHkcD6a4xfyIgJcWxsku0tm1TH1dpn4M1UXRuyZZif8P08nuE6MTUL67sAR9J1lpn4lVEL4kflk0pP2tZ5ncgPQFafJrRz05krMb0eU5tb2H4gs7ao/LL6idWo8MM9K1yr8lIuT5x2WW5CX+RjA+i50ex114V6vX3PNP5oVyt+DynTUB9QmXzVm3oLfDc3Cae1uqh7X0CFd+xiztJBtg0VtJaD/xUJcuWfY4cV2lERo9fRrykltzlJqiXHO4nowt8OtN0BcViVV8NJhPhYFzyb4ympxpOlTjm3GETuT2TYhUqdgS9nzleEAbOmOHZdIO2COunPE=
 
 lecoffreBack:
   serviceAccountName: lecoffre-back-sa
   envSecrets: stg-env
-  command: "export $(xargs </etc/.env) && npm run api:start" 
+  command: "export $(xargs </etc/env/.env) && npm run api:start" 
   imagePullSecrets:
     - name: docker-pull-secret
   image:
@@ -30,7 +30,7 @@ lecoffreBack:
       nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
  # key is name of the environment variable, scwID is the secret ID in SCW with "id:" in front
   env: 
-    - key: env1
-      scwID: "id:a131edea-84e0-49d6-b4a8-20ab417220c9"
+    - key: .env
+      scwID: "id:2be9510b-bb1f-4fbe-ab3e-3dc11fb49051"
 
 
diff --git a/devops/templates/lecoffre-back.yaml b/devops/templates/lecoffre-back.yaml
index 7f6e0b1b..78572e5e 100644
--- a/devops/templates/lecoffre-back.yaml
+++ b/devops/templates/lecoffre-back.yaml
@@ -66,7 +66,8 @@ spec:
         imagePullPolicy: {{ .Values.lecoffreBack.image.pullPolicy }}
         command: [{{ .Values.lecoffreBack.command }}]
         volumeMounts:
-          - mountPath: /etc/.env
+          - name: secret-volume
+            mountPath: /etc/env
       volumes:
           - name: secret-volume
             secret:
diff --git a/devops/templates/secrets.yaml b/devops/templates/secrets.yaml
index e116cc9c..2e08b03c 100644
--- a/devops/templates/secrets.yaml
+++ b/devops/templates/secrets.yaml
@@ -3,7 +3,7 @@ kind: ExternalSecret
 metadata:
   name: {{ .Values.lecoffreBack.envSecrets }}
 spec:
-  refreshInterval: 20s
+  refreshInterval: 1h
   secretStoreRef:
     kind: SecretStore
     name: secret-store