From c358b04c59931fa89ae5b5f8a705cabd8f25b97e Mon Sep 17 00:00:00 2001 From: Nick Baker Date: Tue, 10 Oct 2023 18:41:39 -0700 Subject: [PATCH 1/2] remove kubernetes versions file and use eksctl supported version list --- .github/workflows/ci-manual.yaml | 7 +++++-- kubernetes-versions.json | 8 -------- 2 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 kubernetes-versions.json diff --git a/.github/workflows/ci-manual.yaml b/.github/workflows/ci-manual.yaml index 6bffb2f8a..5b531ed10 100644 --- a/.github/workflows/ci-manual.yaml +++ b/.github/workflows/ci-manual.yaml @@ -36,14 +36,17 @@ jobs: build_id: ${{ steps.variables.outputs.build_id }} ci_step_name_prefix: ${{ steps.variables.outputs.ci_step_name_prefix }} steps: - - uses: actions/checkout@v3 - id: variables run: | echo "git_sha_short=$(echo ${{ inputs.git_sha }} | rev | cut -c-7 | rev)" >> $GITHUB_OUTPUT echo "workflow_run_url=https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_OUTPUT - echo "kubernetes_versions=$(cat kubernetes-versions.json | jq -c .)" >> $GITHUB_OUTPUT + # grab supported versions directly from eksctl + wget --no-verbose -O eksctl.tar.gz "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_Linux_amd64.tar.gz" + tar xf eksctl.tar.gz && chmod +x ./eksctl + echo "kubernetes_versions=$(./eksctl version --output json | jq -c .EKSServerSupportedVersions)" >> $GITHUB_OUTPUT echo "build_id=ci-${{ inputs.pr_number }}-${{ needs.setup.outputs.git_sha_short }}-${{ inputs.uuid }}" >> $GITHUB_OUTPUT echo 'ci_step_name_prefix=CI:' >> $GITHUB_OUTPUT + notify-start: runs-on: ubuntu-latest needs: diff --git a/kubernetes-versions.json b/kubernetes-versions.json deleted file mode 100644 index 97526a4ba..000000000 --- a/kubernetes-versions.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - "1.23", - "1.24", - "1.25", - "1.26", - "1.27", - "1.28" -] From d6afb8cf684e02ae32a8c709a15ee3a52c3c4bb6 Mon Sep 17 00:00:00 2001 From: Nick Baker Date: Tue, 10 Oct 2023 23:33:56 -0700 Subject: [PATCH 2/2] recognize compression Co-authored-by: Carter --- .github/workflows/ci-manual.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-manual.yaml b/.github/workflows/ci-manual.yaml index 5b531ed10..9d840747e 100644 --- a/.github/workflows/ci-manual.yaml +++ b/.github/workflows/ci-manual.yaml @@ -42,7 +42,7 @@ jobs: echo "workflow_run_url=https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_OUTPUT # grab supported versions directly from eksctl wget --no-verbose -O eksctl.tar.gz "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_Linux_amd64.tar.gz" - tar xf eksctl.tar.gz && chmod +x ./eksctl + tar xzf eksctl.tar.gz && chmod +x ./eksctl echo "kubernetes_versions=$(./eksctl version --output json | jq -c .EKSServerSupportedVersions)" >> $GITHUB_OUTPUT echo "build_id=ci-${{ inputs.pr_number }}-${{ needs.setup.outputs.git_sha_short }}-${{ inputs.uuid }}" >> $GITHUB_OUTPUT echo 'ci_step_name_prefix=CI:' >> $GITHUB_OUTPUT