fix(ci): autodevops-helm (#60)

SocialGouv · Feb 23, 2022 · 87ff025 · 87ff025
1 parent b013d79
commit 87ff025
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 42 deletions.
diff --git a/.github/workflows/preproduction.yml b/.github/workflows/preproduction.yml
@@ -32,34 +32,23 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
         imageName: nos1000jours/les1000jours-landing
 
-  ##############################################################################
-  ## 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:
     runs-on: ubuntu-latest
     name: Deploy application
-    needs: [register, manifests]
+    needs: [register]
     steps:
 
     - name: Use autodevops deployment
-      uses: SocialGouv/actions/autodevops-deploy@v1
+      uses: SocialGouv/actions/autodevops-helm-deploy@v1
       with:
         environment: preprod
         token: ${{ secrets.GITHUB_TOKEN }}
         kubeconfig: ${{ secrets.KUBECONFIG }}
         rancherId: ${{ secrets.RANCHER_PROJECT_ID }}
+        rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }}
+        socialgouvBaseDomain: ${{ secrets.SOCIALGOUV_BASE_DOMAIN }}
+        imageName: nos1000jours/les1000jours-landing
+        projectName: "les1000jours"
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -43,18 +43,15 @@ jobs:
       url: https://1000jours.fabrique.social.gouv.fr/
     steps:
 
-    - name: Use autodevops manifests generation
-      uses: SocialGouv/actions/autodevops-manifests@v1
-      with:
-        environment: prod
-        productionNamespace: "les1000jours-landing"
-        rancherId: ${{ secrets.RANCHER_PROJECT_ID }}
-        socialgouvBaseDomain: ${{ secrets.SOCIALGOUV_BASE_DOMAIN }}
-
     - name: Use autodevops deployment
       uses: SocialGouv/actions/autodevops-deploy@v1
       with:
         environment: prod
         token: ${{ secrets.GITHUB_TOKEN }}
         kubeconfig: ${{ secrets.KUBECONFIG }}
         rancherId: ${{ secrets.RANCHER_PROJECT_ID }}
+        rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }}
+        socialgouvBaseDomain: ${{ secrets.SOCIALGOUV_BASE_DOMAIN }}
+        imageName: nos1000jours/les1000jours-landing
+        projectName: "les1000jours"
+        productionHost: "1000jours.fabrique.social.gouv.fr"
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
@@ -31,34 +31,23 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
         imageName: nos1000jours/les1000jours-landing
 
-  ##############################################################################
-  ## 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: "dev"
-        rancherId: ${{ secrets.RANCHER_PROJECT_ID }}
-        socialgouvBaseDomain: ${{ secrets.SOCIALGOUV_BASE_DOMAIN }}
-
   ##############################################################################
   ## DEPLOY APPLICATION OVER KUBERNETES
   ##############################################################################
   deploy:
     runs-on: ubuntu-latest
     name: Deploy application
-    needs: [register, manifests]
+    needs: [register]
     steps:
 
     - name: Use autodevops deployment
-      uses: SocialGouv/actions/autodevops-deploy@v1
+      uses: SocialGouv/actions/autodevops-helm-deploy@v1
       with:
         environment: "dev"
         token: ${{ secrets.GITHUB_TOKEN }}
         kubeconfig: ${{ secrets.KUBECONFIG }}
         rancherId: ${{ secrets.RANCHER_PROJECT_ID }}
+        rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }}
+        socialgouvBaseDomain: ${{ secrets.SOCIALGOUV_BASE_DOMAIN }}
+        imageName: nos1000jours/les1000jours-landing
+        projectName: "les1000jours"