fix: cje-app to app

SocialGouv · Jan 5, 2024 · 6c03b81 · 6c03b81
1 parent 80fa2b1
commit 6c03b81
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 32 deletions.
diff --git a/.../env/dev/templates/cja-app.configmap.yaml → ...uous/env/dev/templates/app.configmap.yaml b/.../env/dev/templates/cja-app.configmap.yaml → ...uous/env/dev/templates/app.configmap.yaml
diff --git a/.../dev/templates/cja-app.sealed-secret.yaml → .../env/dev/templates/app.sealed-secret.yaml b/.../dev/templates/cja-app.sealed-secret.yaml → .../env/dev/templates/app.sealed-secret.yaml
diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml
@@ -1,8 +1,8 @@
-cje-app:
+app:
   envFrom:
     - secretRef:
         name: pg-app
     - secretRef:
-        name: cje-app-sealed-secret
+        name: app-sealed-secret
     - configMapRef:
-        name: cje-app-configmap
+        name: app-configmap
diff --git a/.../preprod/templates/cje-app.configmap.yaml → .../env/preprod/templates/app.configmap.yaml b/.../preprod/templates/cje-app.configmap.yaml → .../env/preprod/templates/app.configmap.yaml
@@ -1,6 +1,6 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: cje-app-configmap
+  name: app-configmap
 data:
   PAYLOAD_CONFIG_PATH: payload/payload.config.ts
diff --git a/...prod/templates/cje-app.sealed-secret.yaml → .../preprod/templates/app.sealed-secret.yaml b/...prod/templates/cje-app.sealed-secret.yaml → .../preprod/templates/app.sealed-secret.yaml
@@ -3,13 +3,13 @@ kind: SealedSecret
 metadata:
   annotations:
     sealedsecrets.bitnami.com/cluster-wide: 'true'
-  name: cje-app-sealed-secret
+  name: app-sealed-secret
 spec:
   encryptedData:
     PAYLOAD_SECRET: AgCQia35m739XEnXdFJ0/nqUxp81To0Ad5CWsRPQ3endkD+hJYK+Q7NR+B6JgyoHIoG9OGWeFmM06MOJTLh6lbLz2GiZKUThU9MGi9WNzlTYxGjDTwHf14exRCGlLR+cNUgBChiTaQgwcXOJd8c606gmQhvZ20y7ph2+tGWjhcFfPsmclZIzT5VkFylG0BLoBAFjeWIqvxKPxn+75SOkhzzZ5xfueHWINPk7el4u74ymKs+gNnnKOoa4Qx8zG96FgMBMWUYzAvB10FNtVpt9OWNVWfGp53P3eCUhqO++fEz9RPlofYL0gcYYAezQFyna3O+I03oJWN6mdZcmzom9stbRG6+xN8JVR2r0X5S86cSlSfFlrFwlsuhef4XD7Dk4yi9Ur0Dew+5MCdsUjy/r9rP20zUHhOt628XONLKkzUNN5/QtCSOVlwR9/X+4D26u8cR1O2ZzrmKmbMU44KMz+AynR4jSawGF3+flpc971yP69r3QR2plHaPLGqvPjIWipp5D7wueqzlZ0UC4GXSwhHhdDAnlWPhmt6CyLFHPinG5LS1NoTNALUkZTEtG16ZJ1POyhXkh0MIkoJ6tHoj4QcLjrZTKrRn+LxigXahU+HR065MmJbhuBZcmLTlN/BDLRnaJMy5Q+aUySye59JTqYpnUK+d9MW4adurJNEU4CrbNK0GvH5NcfjJLpARzFRL9x6FBW+FVENntO8YGs3oW0rdk
   template:
     metadata:
       annotations:
         sealedsecrets.bitnami.com/cluster-wide: 'true'
-      name: cje-app-sealed-secret
+      name: app-sealed-secret
     type: Opaque
diff --git a/.kontinuous/env/preprod/values.yaml b/.kontinuous/env/preprod/values.yaml
@@ -1,2 +1,2 @@
-cje-app:
+app:
   host: "cje-preprod.ovh.fabrique.social.gouv.fr"
diff --git a/...env/prod/templates/cje-app.configmap.yaml → ...ous/env/prod/templates/app.configmap.yaml b/...env/prod/templates/cje-app.configmap.yaml → ...ous/env/prod/templates/app.configmap.yaml
@@ -1,6 +1,6 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: cje-app-configmap
+  name: app-configmap
 data:
   PAYLOAD_CONFIG_PATH: payload/payload.config.ts
diff --git a/...prod/templates/cje-app.sealed-secret.yaml → ...env/prod/templates/app.sealed-secret.yaml b/...prod/templates/cje-app.sealed-secret.yaml → ...env/prod/templates/app.sealed-secret.yaml
@@ -3,7 +3,7 @@ kind: SealedSecret
 metadata:
   annotations:
     sealedsecrets.bitnami.com/namespace-wide: 'true'
-  name: cje-app-sealed-secret
+  name: app-sealed-secret
   namespace: carte-jeune-engage
 spec:
   encryptedData:
@@ -12,5 +12,5 @@ spec:
     metadata:
       annotations:
         sealedsecrets.bitnami.com/namespace-wide: 'true'
-      name: cje-app-sealed-secret
+      name: app-sealed-secret
     type: Opaque
diff --git a/.kontinuous/env/prod/values.yaml b/.kontinuous/env/prod/values.yaml
@@ -1,12 +1,12 @@
-cje-app:
+app:
   host: cje.fabrique.social.gouv.fr
   envFrom:
     - secretRef:
         name: pg-app
     - secretRef:
-        name: cje-app-sealed-secret
+        name: app-sealed-secret
     - configMapRef:
-        name: cje-app-configmap
+        name: app-configmap
     - secretRef:
         name: azure-cje-volume
 

diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
@@ -1,10 +1,10 @@
-cje-app:
-  ~chart: cje-app
-  ~needs: [build-cje-app, pg]
-  host: "cje-app-{{ $.Values.global.host }}"
-  imagePackage: cje-app
+app:
+  ~chart: app
+  ~needs: [build-app, pg]
+  host: "app-{{ $.Values.global.host }}"
+  imagePackage: app
   containerPort: 8080
-  probesPath: /_health
+  probesPath: /api/health
   resources:
     requests:
       cpu: 0.3
@@ -19,25 +19,16 @@ cje-app:
     - secretRef:
         name: pg-app
     - secretRef:
-        name: cje-app-sealed-secret
-    - secretRef:
-        name: azure-cje-volume
+        name: app-sealed-secret
     - configMapRef:
-        name: cje-app-configmap
-  volumeMounts:
-    - name: uploads
-      mountPath: /app/public/uploads
-  volumes:
-    - name: uploads
-      persistentVolumeClaim:
-        claimName: uploads
+        name: app-configmap
 
 pg:
   ~chart: pg
 
 jobs:
   runs:
-    build-cje-app:
+    build-app:
       use: build
       with:
-        imagePackage: cje-app
+        imagePackage: app