fix(deps): update dependency victory to v36 - autoclosed

.github/workflows/preproduction.yml

@@ -0,0 +1,87 @@
+name: Preproduction
+
+on:
+  push:
+    branches:
+      - master
+    tags-ignore:
+      - v*
+
+concurrency:
+  group: preproduction
+  cancel-in-progress: true
+
+jobs:
+
+  ##############################################################################
+  ## BUILD AND REGISTER APPLICATION IMAGE
+  ##############################################################################
+  register:
+    name: Build & Register application
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Get project name
+      run: |
+        echo "project=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV
+
+    - name: Use autodevops build and register
+      uses: SocialGouv/actions/autodevops-build-register@v1
+      with:
+        environment: preprod
+        imageName: fabrique/carnets
+        project: ${{ env.project }}
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+  ##############################################################################
+  ## BUILD AND REGISTER HASURA IMAGE
+  ##############################################################################
+  register-hasura:
+    name: Build & Register Hasura
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Get project name
+      run: |
+        echo "project=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV
+
+    - name: Use autodevops build and register
+      uses: SocialGouv/actions/autodevops-build-register@v1
+      with:
+        environment: preprod
+        imageName: fabrique/hasura
+        project: ${{ env.project }}
+        token: ${{ secrets.GITHUB_TOKEN }}
+        dockerfile: ./packages/hasura/Dockerfile
+
+  ##############################################################################
+  ## GENERATE KUBERNETES MANIFESTS
+  ##############################################################################
+  manifests:
+    name: Generate k8s manifests
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Use autodevops manifests generation
+      uses: SocialGouv/actions/autodevops-manifests@v1
+      with:
+        environment: preprod
+        rancherId: ${{ secrets.RANCHER_PROJECT_ID }}
+        socialgouvBaseDomain: ${{ secrets.SOCIALGOUV_BASE_DOMAIN }}
+
+  ##############################################################################
+  ## DEPLOY APPLICATION OVER KUBERNETES
+  ##############################################################################
+  deploy:
+    name: Deploy application
+    runs-on: ubuntu-latest
+    needs: [register, register-hasura, manifests]
+    steps:
+
+    - name: Use autodevops deployment
+      uses: SocialGouv/actions/autodevops-deploy@v1
+      with:
+        environment: preprod
+        token: ${{ secrets.GITHUB_TOKEN }}
+        kubeconfig: ${{ secrets.KUBECONFIG }}
+        rancherId: ${{ secrets.RANCHER_PROJECT_ID }}

.github/workflows/production.yml

@@ -26,6 +26,7 @@ jobs:
     - name: Use autodevops build and register
       uses: SocialGouv/actions/autodevops-build-register@v1
       with:
+        environment: prod
         imageName: fabrique/carnets
         project: ${{ env.project }}
         token: ${{ secrets.GITHUB_TOKEN }}
@@ -45,71 +46,36 @@ jobs:
     - name: Use autodevops build and register
       uses: SocialGouv/actions/autodevops-build-register@v1
       with:
+        environment: prod
         imageName: fabrique/hasura
         project: ${{ env.project }}
         token: ${{ secrets.GITHUB_TOKEN }}
         dockerfile: ./packages/hasura/Dockerfile
 
-  ##############################################################################
-  ## GENERATE PREPRODUCTION MANIFESTS
-  ##############################################################################
-  manifests:
-    name: Preproduction manifests
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Use autodevops manifests generation
-      uses: SocialGouv/actions/autodevops-manifests@v1
-      with:
-        environment: "preprod"
-        rancherId: ${{ secrets.RANCHER_PROJECT_ID }}
-        socialgouvBaseDomain: ${{ secrets.SOCIALGOUV_BASE_DOMAIN }}
-
-  ##############################################################################
-  ## DEPLOY PREPRODUCTION APPLICATION
-  ##############################################################################
-  deploy-preprod:
-    name: Deploy preproduction
-    runs-on: ubuntu-latest
-    needs: [register, register-hasura, manifests]
-    environment:
-      name: preproduction
-      url: ${{ steps.deploy-preprod.outputs.url }}
-    steps:
-
-    - name: Use autodevops deployment
-      uses: SocialGouv/actions/autodevops-deploy@v1
-      id: deploy-preprod
-      with:
-        environment: "preprod"
-        token: ${{ secrets.GITHUB_TOKEN }}
-        kubeconfig: ${{ secrets.KUBECONFIG }}
-        rancherId: ${{ secrets.RANCHER_PROJECT_ID }}
-
   ##############################################################################
   ## DEPLOY PRODUCTION APPLICATION
   ##############################################################################
-  deploy-prod:
+  deploy:
     name: Deploy production
     runs-on: ubuntu-latest
-    needs: [deploy-preprod]
+    needs: [register, register-hasura]
     environment:
       name: production
-      url: ${{ steps.deploy-prod.outputs.url }}
+      url: ${{ steps.deploy.outputs.url }}
     steps:
 
     - name: Use autodevops manifests generation
       uses: SocialGouv/actions/autodevops-manifests@v1
       with:
-        environment: "prod"
+        environment: prod
         rancherId: ${{ secrets.RANCHER_PROJECT_ID }}
         socialgouvBaseDomain: ${{ secrets.SOCIALGOUV_BASE_DOMAIN }}
 
     - name: Use autodevops deployment
       uses: SocialGouv/actions/autodevops-deploy@v1
-      id: deploy-prod
+      id: deploy
       with:
-        environment: "prod"
+        environment: prod
         token: ${{ secrets.GITHUB_TOKEN }}
         kubeconfig: ${{ secrets.KUBECONFIG }}
         rancherId: ${{ secrets.RANCHER_PROJECT_ID }}

.github/workflows/review.yml

@@ -2,8 +2,8 @@ name: Review
 
 on:
   push:
-    branches:
-      - '**'
+    branches-ignore:
+      - master
     tags-ignore:
       - v*
 

.socialgouv/environments/dev/carnets.configmap.yaml

@@ -1,7 +1,7 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: app-configmap
+  name: carnets-configmap
 data:
   GITHUB_ORGANIZATION: "SocialGouv"
   AUTH0_AUDIENCE: "hasura"

.socialgouv/environments/dev/carnets.sealed-secret.yaml

@@ -3,7 +3,7 @@ kind: SealedSecret
 metadata:
   annotations:
     sealedsecrets.bitnami.com/cluster-wide: 'true'
-  name: app-sealed-secret
+  name: carnets-sealed-secret
   namespace: carnets
 spec:
   encryptedData:
@@ -31,5 +31,5 @@ spec:
     metadata:
       annotations:
         sealedsecrets.bitnami.com/cluster-wide: 'true'
-      name: app-sealed-secret
+      name: carnets-sealed-secret
     type: Opaque

.socialgouv/environments/preprod/carnets.configmap.yaml

@@ -1,7 +1,7 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: app-configmap
+  name: carnets-configmap
 data:
   GITHUB_ORGANIZATION: "SocialGouv"
   AUTH0_AUDIENCE: "hasura"

.socialgouv/environments/preprod/carnets.sealed-secret.yaml

@@ -3,7 +3,7 @@ kind: SealedSecret
 metadata:
   annotations:
     sealedsecrets.bitnami.com/cluster-wide: 'true'
-  name: app-sealed-secret
+  name: carnets-sealed-secret
   namespace: carnets
 spec:
   encryptedData:
@@ -31,5 +31,5 @@ spec:
     metadata:
       annotations:
         sealedsecrets.bitnami.com/cluster-wide: 'true'
-      name: app-sealed-secret
+      name: carnets-sealed-secret
     type: Opaque

.socialgouv/environments/prod/carnets.configmap.yaml

@@ -1,7 +1,7 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: app-configmap
+  name: carnets-configmap
 data:
   GITHUB_ORGANIZATION: "SocialGouv"
   AUTH0_AUDIENCE: "hasura"

.socialgouv/environments/prod/carnets.sealed-secret.yaml

@@ -2,7 +2,7 @@ apiVersion: bitnami.com/v1alpha1
 kind: SealedSecret
 metadata:
   annotations: {}
-  name: app-sealed-secret
+  name: carnets-sealed-secret
   namespace: carnets
 spec:
   encryptedData:
@@ -29,5 +29,5 @@ spec:
   template:
     metadata:
       annotations: {}
-      name: app-sealed-secret
+      name: carnets-sealed-secret
     type: Opaque

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.6.15](https://github.com/SocialGouv/carnets/compare/v1.6.14...v1.6.15) (2021-11-29)
+
+
+### Bug Fixes
+
+* **workflows:** Rename configmaps and secrets ([50846a4](https://github.com/SocialGouv/carnets/commit/50846a4bb395d465d886b4004a6fbb3befba9f3b))
+
+## [1.6.14](https://github.com/SocialGouv/carnets/compare/v1.6.13...v1.6.14) (2021-11-29)
+
+
+### Bug Fixes
+
+* **workflows:** Split preprod and prod workflows ([f26feaa](https://github.com/SocialGouv/carnets/commit/f26feaa0811aa0d79abb2151f3731f383e8244d0))
+
 ## [1.6.13](https://github.com/SocialGouv/carnets/compare/v1.6.12...v1.6.13) (2021-09-27)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "carnets",
-  "version": "1.6.13",
+  "version": "1.6.15",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -42,7 +42,7 @@
     "swr": "^0.4.2",
     "use-debounce": "^5.2.1",
     "uuid": "^8.3.2",
-    "victory": "^35.11.4"
+    "victory": "^36.0.0"
   },
   "devDependencies": {
     "@socialgouv/eslint-config-react": "^1.52.0",