From cacd24ee6312ba56e6eb51e42ada315db2b6f836 Mon Sep 17 00:00:00 2001 From: Donald Hutchison Date: Thu, 14 Dec 2023 14:43:43 +0100 Subject: [PATCH 1/3] Set org runners for helmfile. --- .github/workflows/helm_deploy_call.yml | 2 +- .github/workflows/helm_deploy_dispatch.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm_deploy_call.yml b/.github/workflows/helm_deploy_call.yml index 81117805f0b1..c5eaaae9dd94 100644 --- a/.github/workflows/helm_deploy_call.yml +++ b/.github/workflows/helm_deploy_call.yml @@ -42,7 +42,7 @@ env: jobs: helmfile: name: Auth, Setup + Run helmfile ${{ inputs.action }} - runs-on: ubuntu-latest + runs-on: ['self-hosted', 'org', '8-cpu'] permissions: id-token: write contents: read diff --git a/.github/workflows/helm_deploy_dispatch.yml b/.github/workflows/helm_deploy_dispatch.yml index f9ea92d1e8c7..6608729aa0b8 100644 --- a/.github/workflows/helm_deploy_dispatch.yml +++ b/.github/workflows/helm_deploy_dispatch.yml @@ -37,7 +37,7 @@ on: jobs: set-config: - runs-on: ubuntu-latest + runs-on: ['self-hosted', 'org', '8-cpu'] outputs: change-cause: ${{ steps.set-config.outputs.change-cause }} cluster: ${{ steps.set-config.outputs.cluster }} @@ -93,6 +93,7 @@ jobs: fi helmfile-run: + runs-on: [ 'self-hosted', 'org', '8-cpu' ] uses: ./.github/workflows/helm_deploy_call.yml needs: set-config name: "helmfile ${{ github.event.inputs.action }}" From a25b64cf572eda2f014082f0eb51c8a88fa5e598 Mon Sep 17 00:00:00 2001 From: Donald Hutchison Date: Thu, 14 Dec 2023 14:55:21 +0100 Subject: [PATCH 2/3] Remove incompatible fields. --- .github/workflows/helm_deploy_dispatch.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/helm_deploy_dispatch.yml b/.github/workflows/helm_deploy_dispatch.yml index 6608729aa0b8..9b751fe2f37b 100644 --- a/.github/workflows/helm_deploy_dispatch.yml +++ b/.github/workflows/helm_deploy_dispatch.yml @@ -93,7 +93,6 @@ jobs: fi helmfile-run: - runs-on: [ 'self-hosted', 'org', '8-cpu' ] uses: ./.github/workflows/helm_deploy_call.yml needs: set-config name: "helmfile ${{ github.event.inputs.action }}" From eea56a442677151019f8e765d947de8673c797cd Mon Sep 17 00:00:00 2001 From: Donald Hutchison Date: Thu, 14 Dec 2023 15:48:08 +0100 Subject: [PATCH 3/3] Use helm runner. --- .github/workflows/helm_deploy_call.yml | 2 +- .github/workflows/helm_deploy_dispatch.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm_deploy_call.yml b/.github/workflows/helm_deploy_call.yml index c5eaaae9dd94..26db5361caf0 100644 --- a/.github/workflows/helm_deploy_call.yml +++ b/.github/workflows/helm_deploy_call.yml @@ -42,7 +42,7 @@ env: jobs: helmfile: name: Auth, Setup + Run helmfile ${{ inputs.action }} - runs-on: ['self-hosted', 'org', '8-cpu'] + runs-on: ['self-hosted', 'org', 'helm'] permissions: id-token: write contents: read diff --git a/.github/workflows/helm_deploy_dispatch.yml b/.github/workflows/helm_deploy_dispatch.yml index 9b751fe2f37b..a736868106ca 100644 --- a/.github/workflows/helm_deploy_dispatch.yml +++ b/.github/workflows/helm_deploy_dispatch.yml @@ -37,7 +37,7 @@ on: jobs: set-config: - runs-on: ['self-hosted', 'org', '8-cpu'] + runs-on: ['self-hosted', 'org', 'helm'] outputs: change-cause: ${{ steps.set-config.outputs.change-cause }} cluster: ${{ steps.set-config.outputs.cluster }}