diff --git a/.github/workflows/preproduction.yml b/.github/workflows/preproduction.yml index 5328f7ff..05d8bd5e 100644 --- a/.github/workflows/preproduction.yml +++ b/.github/workflows/preproduction.yml @@ -42,18 +42,10 @@ jobs: name: preproduction url: https://mon-psy-sante-preprod.dev.fabrique.social.gouv.fr steps: - - name: Use k8s manifests generation - uses: SocialGouv/actions/autodevops-manifests@v1 + - uses: SocialGouv/kube-workflow@master with: - environment: "preprod" - rancherId: ${{ secrets.RANCHER_PROJECT_ID }} - socialgouvBaseDomain: ${{ secrets.SOCIALGOUV_BASE_DOMAIN }} - pgUserSecretPrefix: pg-user - - - name: Use autodevops deployment - uses: SocialGouv/actions/autodevops-deploy@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 }} \ No newline at end of file diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 07b21630..a580b1a5 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -41,20 +41,10 @@ jobs: name: production url: https://monpsy.sante.gouv.fr steps: - - name: Use k8s manifests generation - uses: SocialGouv/actions/autodevops-manifests@v1 + - uses: SocialGouv/kube-workflow@master with: - environment: "prod" - rancherId: ${{ secrets.RANCHER_PROJECT_ID }} - socialgouvBaseDomain: sante.gouv.fr - pgUserSecretPrefix: pg-user - env: - SOCIALGOUV_PRODUCTION_NAMESPACE: monpsy - - - name: Use autodevops deployment - uses: SocialGouv/actions/autodevops-deploy@v1 - with: - environment: "prod" + environment: prod token: ${{ secrets.GITHUB_TOKEN }} kubeconfig: ${{ secrets.KUBECONFIG }} - rancherId: ${{ secrets.RANCHER_PROJECT_ID }} + rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }} + rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }} diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml index f5a04d2f..4fcb2224 100644 --- a/.github/workflows/review.yml +++ b/.github/workflows/review.yml @@ -12,17 +12,6 @@ concurrency: group: ${{ github.ref }} jobs: - ############################################################################## - ## CREATE POSTGRES DATABASE - ############################################################################## - create-db: - name: Create postgres database - runs-on: ubuntu-latest - steps: - - uses: SocialGouv/actions/autodevops-create-db@v1 - with: - kubeconfig: ${{ secrets.KUBECONFIG }} - rancherId: ${{ secrets.RANCHER_PROJECT_ID }} ############################################################################## ## BUILD AND REGISTER DOCKER IMAGES @@ -64,10 +53,10 @@ jobs: runs-on: ubuntu-latest needs: [register, manifests] steps: - - name: Use autodevops deployment - uses: SocialGouv/actions/autodevops-deploy@v1 + - uses: SocialGouv/kube-workflow@master with: - environment: "dev" + environment: dev token: ${{ secrets.GITHUB_TOKEN }} kubeconfig: ${{ secrets.KUBECONFIG }} - rancherId: ${{ secrets.RANCHER_PROJECT_ID }} + rancherProjectId: ${{ secrets.RANCHER_PROJECT_ID }} + rancherProjectName: ${{ secrets.RANCHER_PROJECT_NAME }}