From 5cf597d506eb2aea6aed969c929ca6a40b0545d3 Mon Sep 17 00:00:00 2001 From: minottic Date: Thu, 7 Dec 2023 16:47:08 +0100 Subject: [PATCH 1/2] Open ssh tunnel for deployment --- .github/workflows/be.yml | 4 +++- .github/workflows/fe.yml | 4 +++- .github/workflows/proposal-sync.yml | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/be.yml b/.github/workflows/be.yml index 3d9860a..e0aab0e 100644 --- a/.github/workflows/be.yml +++ b/.github/workflows/be.yml @@ -42,7 +42,7 @@ jobs: needs: - check_changed - set_env - uses: paulscherrerinstitute/scicat-ci/.github/workflows/reusable.build-deploy.yml@main + uses: paulscherrerinstitute/scicat-ci/.github/workflows/reusable.build-deploy.yml@bastion_ssh with: context: scilog/sci-log-db/. image_name: ${{ github.repository }}/be @@ -56,3 +56,5 @@ jobs: secrets: KUBECONFIG: ${{ secrets.KUBECONFIG }} JSON_SECRETS: ${{ toJSON(secrets) }} + BASTION_USER: ${{ secrets.BASTION_USER }} + BASTION_SSH_KEY: ${{ secrets.BASTION_SSH_KEY }} diff --git a/.github/workflows/fe.yml b/.github/workflows/fe.yml index 59d2f60..624c3fa 100644 --- a/.github/workflows/fe.yml +++ b/.github/workflows/fe.yml @@ -42,7 +42,7 @@ jobs: needs: - check_changed - set_env - uses: paulscherrerinstitute/scicat-ci/.github/workflows/reusable.build-deploy.yml@main + uses: paulscherrerinstitute/scicat-ci/.github/workflows/reusable.build-deploy.yml@bastion_ssh with: context: scilog/scilog/. image_name: ${{ github.repository }}/fe @@ -55,3 +55,5 @@ jobs: submodule: scilog secrets: KUBECONFIG: ${{ secrets.KUBECONFIG }} + BASTION_USER: ${{ secrets.BASTION_USER }} + BASTION_SSH_KEY: ${{ secrets.BASTION_SSH_KEY }} diff --git a/.github/workflows/proposal-sync.yml b/.github/workflows/proposal-sync.yml index 1ab03df..38b9f25 100644 --- a/.github/workflows/proposal-sync.yml +++ b/.github/workflows/proposal-sync.yml @@ -43,7 +43,7 @@ jobs: needs: - check_changed - set_env - uses: paulscherrerinstitute/scicat-ci/.github/workflows/reusable.build-deploy.yml@main + uses: paulscherrerinstitute/scicat-ci/.github/workflows/reusable.build-deploy.yml@bastion_ssh with: context: scilog/importTools/. image_name: ${{ github.repository }}/proposal-sync @@ -58,3 +58,5 @@ jobs: secrets: KUBECONFIG: ${{ secrets.KUBECONFIG }} JSON_SECRETS: ${{ toJSON(secrets) }} + BASTION_USER: ${{ secrets.BASTION_USER }} + BASTION_SSH_KEY: ${{ secrets.BASTION_SSH_KEY }} From 56c9ac7abd2690a85a233fecbc42799946cfe842 Mon Sep 17 00:00:00 2001 From: minottic Date: Thu, 4 Jan 2024 12:05:02 +0100 Subject: [PATCH 2/2] Use workflow from main --- .github/workflows/be.yml | 2 +- .github/workflows/fe.yml | 2 +- .github/workflows/proposal-sync.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/be.yml b/.github/workflows/be.yml index e0aab0e..beeb794 100644 --- a/.github/workflows/be.yml +++ b/.github/workflows/be.yml @@ -42,7 +42,7 @@ jobs: needs: - check_changed - set_env - uses: paulscherrerinstitute/scicat-ci/.github/workflows/reusable.build-deploy.yml@bastion_ssh + uses: paulscherrerinstitute/scicat-ci/.github/workflows/reusable.build-deploy.yml@main with: context: scilog/sci-log-db/. image_name: ${{ github.repository }}/be diff --git a/.github/workflows/fe.yml b/.github/workflows/fe.yml index 624c3fa..3d1cb1d 100644 --- a/.github/workflows/fe.yml +++ b/.github/workflows/fe.yml @@ -42,7 +42,7 @@ jobs: needs: - check_changed - set_env - uses: paulscherrerinstitute/scicat-ci/.github/workflows/reusable.build-deploy.yml@bastion_ssh + uses: paulscherrerinstitute/scicat-ci/.github/workflows/reusable.build-deploy.yml@main with: context: scilog/scilog/. image_name: ${{ github.repository }}/fe diff --git a/.github/workflows/proposal-sync.yml b/.github/workflows/proposal-sync.yml index 38b9f25..898f07d 100644 --- a/.github/workflows/proposal-sync.yml +++ b/.github/workflows/proposal-sync.yml @@ -43,7 +43,7 @@ jobs: needs: - check_changed - set_env - uses: paulscherrerinstitute/scicat-ci/.github/workflows/reusable.build-deploy.yml@bastion_ssh + uses: paulscherrerinstitute/scicat-ci/.github/workflows/reusable.build-deploy.yml@main with: context: scilog/importTools/. image_name: ${{ github.repository }}/proposal-sync