feat(kube-workflow): upgrade (#604)

* feat(kube-workflow): upgrade * feat(kube-workflow): upgrade
SocialGouv · Mar 15, 2022 · 1382765 · 1382765
1 parent af1cb4d
commit 1382765
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 18 deletions.
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Application
         uses: SocialGouv/actions/autodevops-build-register@v1
         with:
-          imageName: sample-next-app/app
+          imagePackage: app
           token: ${{ secrets.GITHUB_TOKEN }}
 
   build-hasura:
@@ -33,18 +33,18 @@ jobs:
           dockercontext: ./hasura
           dockerfile: ./hasura/Dockerfile
           token: ${{ secrets.GITHUB_TOKEN }}
-          imageName: sample-next-app/hasura
+          imagePackage: hasura
 
   deploy:
     name: Deploy application
     runs-on: ubuntu-latest
     needs: [build-app,build-hasura]
     steps:
       - name: Use autodevops deployment
-        uses: SocialGouv/actions/autodevops-helm-deploy@v1
+        uses: SocialGouv/kube-workflow@master
         with:
           environment: "dev"
           token: ${{ secrets.GITHUB_TOKEN }}
           kubeconfig: ${{ secrets.KUBECONFIG }}
-          rancherId: ${{ secrets.RANCHER_PROJECT_ID }}
-          socialgouvBaseDomain: ${{ secrets.SOCIALGOUV_BASE_DOMAIN }}
+          rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }}
+          rancherProjectName: ${{ secrets.RANCHER_PROJECT_Name }}
diff --git a/.socialgouv/chart/values.project.yaml → .kube-workflow/common/values.yaml b/.socialgouv/chart/values.project.yaml → .kube-workflow/common/values.yaml
@@ -1,9 +1,5 @@
-components:
-  app: true
-  hasura: true
-  pgweb: true
-
 app:
+  enabled: true
   imagePackage: app
   probesPath: /healthz
   certSecretName: app-crt
@@ -16,6 +12,7 @@ app:
         name: app-configmap
 
 hasura:
+  enabled: true
   # waitForPostgres: true
   envFrom:
     - secretRef:
@@ -26,4 +23,5 @@ hasura:
         name: hasura-configmap
 
 pgweb:
+  enabled: true
   certSecretName: pgweb-crt
diff --git a/...lgouv/environments/dev/app.configmap.yaml → ...flow/env/dev/templates/app.configmap.yaml b/...lgouv/environments/dev/app.configmap.yaml → ...flow/env/dev/templates/app.configmap.yaml
diff --git a/...v/environments/dev/app.sealed-secret.yaml → .../env/dev/templates/app.sealed-secret.yaml b/...v/environments/dev/app.sealed-secret.yaml → .../env/dev/templates/app.sealed-secret.yaml
diff --git a/...uv/environments/dev/hasura.configmap.yaml → ...w/env/dev/templates/hasura.configmap.yaml b/...uv/environments/dev/hasura.configmap.yaml → ...w/env/dev/templates/hasura.configmap.yaml
diff --git a/...nvironments/dev/hasura.sealed-secret.yaml → ...v/dev/templates/hasura.sealed-secret.yaml b/...nvironments/dev/hasura.sealed-secret.yaml → ...v/dev/templates/hasura.sealed-secret.yaml
diff --git a/.socialgouv/chart/values.dev.yaml → .kube-workflow/env/dev/values.yaml b/.socialgouv/chart/values.dev.yaml → .kube-workflow/env/dev/values.yaml
@@ -1,15 +1,13 @@
-components:
-  jobs: true
-
 hasura:
   needs: [db]
 
 pgweb:
   needs: [db]
 
 jobs:
+  enabled: true
   runs:
     - name: db
-      use: SocialGouv/actions/uses/create-db@v1
+      use: SocialGouv/kube-workflow/jobs/create-db@master
       with:
         pgAdminSecretRefName: pg-scaleway
diff --git a/.kube-workflow/env/preprod/templates/app.configmap.yaml b/.kube-workflow/env/preprod/templates/app.configmap.yaml
@@ -0,0 +1 @@
+../../dev/templates/app.configmap.yaml
diff --git a/.kube-workflow/env/preprod/templates/app.sealed-secret.yaml b/.kube-workflow/env/preprod/templates/app.sealed-secret.yaml
@@ -0,0 +1 @@
+../../dev/templates/app.sealed-secret.yaml
diff --git a/.kube-workflow/env/preprod/templates/hasura.configmap.yaml b/.kube-workflow/env/preprod/templates/hasura.configmap.yaml
@@ -0,0 +1 @@
+../../dev/templates/hasura.configmap.yaml
diff --git a/.kube-workflow/env/preprod/templates/hasura.sealed-secret.yaml b/.kube-workflow/env/preprod/templates/hasura.sealed-secret.yaml
@@ -0,0 +1 @@
+../../dev/templates/hasura.sealed-secret.yaml
diff --git a/.socialgouv/chart/values.preprod.yaml → .kube-workflow/env/preprod/values.yaml b/.socialgouv/chart/values.preprod.yaml → .kube-workflow/env/preprod/values.yaml
diff --git a/...gouv/environments/prod/app.configmap.yaml → ...low/env/prod/templates/app.configmap.yaml b/...gouv/environments/prod/app.configmap.yaml → ...low/env/prod/templates/app.configmap.yaml
diff --git a/.../environments/prod/app.sealed-secret.yaml → ...env/prod/templates/app.sealed-secret.yaml b/.../environments/prod/app.sealed-secret.yaml → ...env/prod/templates/app.sealed-secret.yaml
diff --git a/...v/environments/prod/hasura.configmap.yaml → .../env/prod/templates/hasura.configmap.yaml b/...v/environments/prod/hasura.configmap.yaml → .../env/prod/templates/hasura.configmap.yaml
diff --git a/...vironments/prod/hasura.sealed-secret.yaml → .../prod/templates/hasura.sealed-secret.yaml b/...vironments/prod/hasura.sealed-secret.yaml → .../prod/templates/hasura.sealed-secret.yaml
diff --git a/.socialgouv/environments/preprod/app.configmap.yaml b/.socialgouv/environments/preprod/app.configmap.yaml
diff --git a/.socialgouv/environments/preprod/app.sealed-secret.yaml b/.socialgouv/environments/preprod/app.sealed-secret.yaml
diff --git a/.socialgouv/environments/preprod/hasura.configmap.yaml b/.socialgouv/environments/preprod/hasura.configmap.yaml
diff --git a/.socialgouv/environments/preprod/hasura.sealed-secret.yaml b/.socialgouv/environments/preprod/hasura.sealed-secret.yaml