From e660e2d7d9af44a9f515bb3797364d0f39e294ea Mon Sep 17 00:00:00 2001
From: pida123 <pidanou.eang@smart-chain.fr>
Date: Thu, 3 Aug 2023 17:42:42 +0200
Subject: [PATCH] fix cron

---
 .circleci/config.yml                  | 10 ++--------
 devops/ppd.values.yaml                |  2 +-
 devops/prd.values.yaml                |  2 +-
 devops/stg.values.yaml                |  2 +-
 devops/templates/service-account.yaml | 16 ++++++++++++++++
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c68df9f0..2c8347dd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -48,15 +48,9 @@ jobs:
               --create-namespace
               --set lecoffreBack.image.repository='rg.fr-par.scw.cloud/lecoffre/back'
               --set lecoffreBack.image.tag=${CIRCLE_SHA1:0:7}
-      - run: 
-          name: Deploy
-          command: >
-              helm upgrade 
-              lecoffre-cron devops/ -i -f devops/<<parameters.env>>.values.yaml 
-              -n lecoffre-<<parameters.env>>
-              --create-namespace
               --set lecoffreCron.image.repository='rg.fr-par.scw.cloud/lecoffre/back'
-              --set lecoffreCron.image.tag=${CIRCLE_SHA1:0:7}             
+              --set lecoffreCron.image.tag=${CIRCLE_SHA1:0:7}    
+       
 
 
 workflows:
diff --git a/devops/ppd.values.yaml b/devops/ppd.values.yaml
index 892aeb19..ba5c13a9 100644
--- a/devops/ppd.values.yaml
+++ b/devops/ppd.values.yaml
@@ -35,7 +35,7 @@ lecoffreBack:
 lecoffreCron:
   serviceAccountName: lecoffre-cron-sa
   envSecrets: stg-env
-  command: "'sh', '-c', 'export $(xargs </etc/env/.env) && npm run api:start'" 
+  command: "'sh', '-c', 'export $(xargs </etc/env/.env) && npm run cron'" 
   imagePullSecrets:
     - name: docker-pull-secret
   image:
diff --git a/devops/prd.values.yaml b/devops/prd.values.yaml
index 24d7fd6e..640914e1 100644
--- a/devops/prd.values.yaml
+++ b/devops/prd.values.yaml
@@ -35,7 +35,7 @@ lecoffreBack:
 lecoffreCron:
   serviceAccountName: lecoffre-cron-sa
   envSecrets: stg-env
-  command: "'sh', '-c', 'export $(xargs </etc/env/.env) && npm run api:start'" 
+  command: "'sh', '-c', 'export $(xargs </etc/env/.env) && npm run cron'" 
   imagePullSecrets:
     - name: docker-pull-secret
   image:
diff --git a/devops/stg.values.yaml b/devops/stg.values.yaml
index 4e1c898d..4bacb27d 100644
--- a/devops/stg.values.yaml
+++ b/devops/stg.values.yaml
@@ -36,7 +36,7 @@ lecoffreBack:
 lecoffreCron:
   serviceAccountName: lecoffre-cron-sa
   envSecrets: stg-env
-  command: "'sh', '-c', 'export $(xargs </etc/env/.env) && npm run api:start'" 
+  command: "'sh', '-c', 'export $(xargs </etc/env/.env) && npm run cron'" 
   imagePullSecrets:
     - name: docker-pull-secret
   image:
diff --git a/devops/templates/service-account.yaml b/devops/templates/service-account.yaml
index 9a2e2624..dbe9055d 100644
--- a/devops/templates/service-account.yaml
+++ b/devops/templates/service-account.yaml
@@ -11,4 +11,20 @@ metadata:
   name: {{ .Values.lecoffreBack.serviceAccountName }}-token
   annotations:
     kubernetes.io/service-account.name: {{ .Values.lecoffreBack.serviceAccountName }} 
+type: kubernetes.io/service-account-token
+
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Values.lecoffreCron.serviceAccountName }} 
+
+---
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.lecoffreCron.serviceAccountName }}-token
+  annotations:
+    kubernetes.io/service-account.name: {{ .Values.lecoffreCron.serviceAccountName }} 
 type: kubernetes.io/service-account-token
\ No newline at end of file