fix(ci): use kube-workflow (#62)

* fix(ci): use kube-workflow * fix preprod url * fix: url * Update values.yaml
SocialGouv · Mar 23, 2022 · 9056399 · 9056399
1 parent eff3e9e
commit 9056399
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 110 deletions.
diff --git a/.github/workflows/preproduction.yml b/.github/workflows/preproduction.yml
@@ -4,33 +4,25 @@ on:
   push:
     branches:
       - master
+    tags-ignore:
+      - v*
 
 concurrency:
   cancel-in-progress: true
   group: preproduction
 
 jobs:
-  ##############################################################################
-  ## BUILD AND REGISTER DOCKER IMAGES
-  ##############################################################################
   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"
-          project: ${{ env.project }}
+          environment: preprod
+          imagePackage: app
           token: ${{ secrets.GITHUB_TOKEN }}
-          imageName: monsuivipsy/monsuivipsy-site
 
-  ##############################################################################
-  ## DEPLOY APPLICATION OVER KUBERNETES
-  ##############################################################################
   deploy:
     name: Deploy application
     runs-on: ubuntu-latest
@@ -39,13 +31,11 @@ jobs:
       name: preproduction
       url: https://monsuivipsy-site-preprod.dev.fabrique.social.gouv.fr
     steps:
-      - name: Use autodevops deployment
-        uses: SocialGouv/actions/autodevops-helm-deploy@v1
+      - name: Use kube-workflow deployment
+        uses: SocialGouv/kube-workflow@v1
         with:
-          environment: "preprod"
+          environment: preprod
           token: ${{ secrets.GITHUB_TOKEN }}
           kubeconfig: ${{ secrets.KUBECONFIG }}
-          rancherId: ${{ secrets.RANCHER_PROJECT_ID }}
+          rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }}
           rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }}
-          socialgouvBaseDomain: ${{ secrets.SOCIALGOUV_BASE_DOMAIN }}
-          imageName: monsuivipsy/monsuivipsy-site
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -10,47 +10,30 @@ concurrency:
   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@master
-      with:
-        environment: prod
-        project: ${{ env.project }}
-        token: ${{ secrets.GITHUB_TOKEN }}
-        imageName: monsuivipsy/monsuivipsy-site
-
-
-  ##############################################################################
-  ## DEPLOY PRODUCTION APPLICATION
-  ##############################################################################
-  deploy-prod:
-    name: Deploy production
+      - name: Use autodevops build and register
+        uses: SocialGouv/actions/autodevops-build-register@v1
+        with:
+          environment: prod
+          imagePackage: app
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+  deploy:
+    name: Deploy application
     runs-on: ubuntu-latest
     needs: [register]
     environment:
       name: production
       url: https://monsuivipsy.fabrique.social.gouv.fr
     steps:
-
-    - name: Use autodevops deployment
-      uses: SocialGouv/actions/autodevops-helm-deploy@v1
-      with:
-        environment: "prod"
-        token: ${{ secrets.GITHUB_TOKEN }}
-        kubeconfig: ${{ secrets.SOCIALGOUV_KUBE_CONFIG_PROD }}
-        rancherId: ${{ secrets.RANCHER_PROJECT_ID }}
-        rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }}
-        imageName: monsuivipsy/monsuivipsy-site
-        productionHost: monsuivipsy.fabrique.social.gouv.fr
+      - name: Use kube-workflow deployment
+        uses: SocialGouv/kube-workflow@v1
+        with:
+          environment: prod
+          token: ${{ secrets.GITHUB_TOKEN }}
+          kubeconfig: ${{ secrets.KUBECONFIG }}
+          rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }}
+          rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }}
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
@@ -8,46 +8,31 @@ on:
       - v*
 
 concurrency:
-  group: ${{ github.ref }}
   cancel-in-progress: true
+  group: review-${{ github.ref }}
 
 jobs:
-
-  ##############################################################################
-  ## BUILD AND REGISTER APPLICATION IMAGE
-  ##############################################################################
   register:
     name: Build & Register application
     runs-on: ubuntu-latest
     steps:
+      - name: Use autodevops build and register
+        uses: SocialGouv/actions/autodevops-build-register@v1
+        with:
+          environment: dev
+          imagePackage: app
+          token: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Get project name
-      run: |
-        echo "project=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV
-
-    - name: Use autodevops build and register
-      uses: SocialGouv/actions/autodevops-build-register@master
-      with:
-        project: ${{ env.project }}
-        token: ${{ secrets.GITHUB_TOKEN }}
-        imageName: monsuivipsy/monsuivipsy-site
-
-  ##############################################################################
-  ## DEPLOY APPLICATION OVER KUBERNETES
-  ##############################################################################
   deploy:
-    name: Deploy application
+    name: Deploy review branch
     runs-on: ubuntu-latest
     needs: [register]
     steps:
-
-    - name: Use autodevops deployment
-      uses: SocialGouv/actions/autodevops-helm-deploy@v1
-      with:
-        environment: "dev"
-        token: ${{ secrets.GITHUB_TOKEN }}
-        kubeconfig: ${{ secrets.SOCIALGOUV_KUBE_CONFIG_DEV }}
-        rancherId: ${{ secrets.RANCHER_PROJECT_ID }}
-        rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }}
-        socialgouvBaseDomain: ${{ secrets.SOCIALGOUV_BASE_DOMAIN }}
-        imageName: monsuivipsy/monsuivipsy-site
+      - name: Use kube-workflow deployment
+        uses: SocialGouv/kube-workflow@v1
+        with:
+          environment: dev
+          token: ${{ secrets.GITHUB_TOKEN }}
+          kubeconfig: ${{ secrets.KUBECONFIG }}
+          rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }}
+          rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }}
diff --git a/.kube-workflow/common/values.yaml b/.kube-workflow/common/values.yaml
@@ -0,0 +1,3 @@
+app:
+  enabled: true
+  probesPath: /api/healthz
diff --git a/...s/dev/monsuivipsy-site.sealed-secret.yaml → ...lates/monsuivipsy-site.sealed-secret.yaml b/...s/dev/monsuivipsy-site.sealed-secret.yaml → ...lates/monsuivipsy-site.sealed-secret.yaml
diff --git a/...eprod/monsuivipsy-site.sealed-secret.yaml → ...lates/monsuivipsy-site.sealed-secret.yaml b/...eprod/monsuivipsy-site.sealed-secret.yaml → ...lates/monsuivipsy-site.sealed-secret.yaml
diff --git a/.../prod/monsuivipsy-site.sealed-secret.yaml → ...lates/monsuivipsy-site.sealed-secret.yaml b/.../prod/monsuivipsy-site.sealed-secret.yaml → ...lates/monsuivipsy-site.sealed-secret.yaml
diff --git a/.kube-workflow/env/prod/values.yaml b/.kube-workflow/env/prod/values.yaml
@@ -0,0 +1,2 @@
+app:
+  host: monsuivipsy.fabrique.social.gouv.fr
diff --git a/.socialgouv/config.json b/.socialgouv/config.json
diff --git a/.socialgouv/environments/prod/yaml/redirect.yaml b/.socialgouv/environments/prod/yaml/redirect.yaml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		app:
		host: monsuivipsy.fabrique.social.gouv.fr