From d8625e9b0faf5b3414ec7d79c7013961d589c536 Mon Sep 17 00:00:00 2001 From: mamutmk5 <3045922+mamutmk5@users.noreply.github.com> Date: Mon, 11 Dec 2023 15:21:40 +0100 Subject: [PATCH 1/3] BC-6013 - update workflows for dev cluster by tenant --- .github/workflows/clean.yml | 5 ++++- .github/workflows/push.yml | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 25ca0c2e..68a19f09 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -12,5 +12,8 @@ jobs: branch: ${{ github.event.ref }} secrets: token: ${{ secrets.GITHUB_TOKEN }} - DEV_KUBE_CONFIG: ${{ secrets.DEV_KUBE_CONFIG }} + DEV_KUBE_CONFIG_BRB: ${{ secrets.DEV_KUBE_CONFIG_BRB }} + DEV_KUBE_CONFIG_NBC: ${{ secrets.DEV_KUBE_CONFIG_NBC }} + DEV_KUBE_CONFIG_THR: ${{ secrets.DEV_KUBE_CONFIG_THR }} + DEV_KUBE_CONFIG_DBC: ${{ secrets.DEV_KUBE_CONFIG_DBC }} BINGO_REPO_TOKEN: ${{ secrets.BINGO_REPO_TOKEN }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 53e9a5d8..4572da87 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -78,8 +78,14 @@ jobs: branch: ${{ needs.branch_meta.outputs.branch }} secrets: token: ${{ secrets.GITHUB_TOKEN }} - DEV_VAULT: ${{ secrets.DEV_VAULT }} - DEV_KUBE_CONFIG: ${{ secrets.DEV_KUBE_CONFIG }} + DEV_VAULT_BRB: ${{ secrets.DEV_VAULT_BRB }} + DEV_VAULT_NBC: ${{ secrets.DEV_VAULT_NBC }} + DEV_VAULT_THR: ${{ secrets.DEV_VAULT_THR }} + DEV_VAULT_DBC: ${{ secrets.DEV_VAULT_DBC }} + DEV_KUBE_CONFIG_BRB: ${{ secrets.DEV_KUBE_CONFIG_BRB }} + DEV_KUBE_CONFIG_NBC: ${{ secrets.DEV_KUBE_CONFIG_NBC }} + DEV_KUBE_CONFIG_THR: ${{ secrets.DEV_KUBE_CONFIG_THR }} + DEV_KUBE_CONFIG_DBC: ${{ secrets.DEV_KUBE_CONFIG_DBC }} BINGO_REPO_TOKEN: ${{ secrets.BINGO_REPO_TOKEN }} deploy-successful: From 5bf700c7aadab54794800cf8a5f2640f3e4d3ead Mon Sep 17 00:00:00 2001 From: mamutmk5 <3045922+mamutmk5@users.noreply.github.com> Date: Mon, 11 Dec 2023 15:43:49 +0100 Subject: [PATCH 2/3] BC-6013 - change workflow use for deploy to branch BC-6013-split --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 4572da87..af1fb267 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -73,7 +73,7 @@ jobs: needs: - build_and_push - branch_meta - uses: hpi-schul-cloud/dof_app_deploy/.github/workflows/deploy.yml@main + uses: hpi-schul-cloud/dof_app_deploy/.github/workflows/deploy.yml@BC-6013-split with: branch: ${{ needs.branch_meta.outputs.branch }} secrets: From c7a08856be93be52549bb163231852d414468fc0 Mon Sep 17 00:00:00 2001 From: mamutmk5 <3045922+mamutmk5@users.noreply.github.com> Date: Tue, 12 Dec 2023 16:29:42 +0100 Subject: [PATCH 3/3] Back to Main --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index af1fb267..4572da87 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -73,7 +73,7 @@ jobs: needs: - build_and_push - branch_meta - uses: hpi-schul-cloud/dof_app_deploy/.github/workflows/deploy.yml@BC-6013-split + uses: hpi-schul-cloud/dof_app_deploy/.github/workflows/deploy.yml@main with: branch: ${{ needs.branch_meta.outputs.branch }} secrets: