From 2ae7425ff499c6552cd1fed45074add83ae502a2 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Thu, 23 Jan 2025 09:12:33 +0100 Subject: [PATCH] Bump Ubuntu runners to 24.04 Also don't use latest, to not let distro version upgrades break the builds in any case. Signed-off-by: Tom Wieczorek --- .github/workflows/backport.yaml | 2 +- .github/workflows/build-airgap-image-bundle.yml | 2 +- .github/workflows/build-docs.yml | 4 ++-- .github/workflows/build-k0s.yml | 2 +- .github/workflows/check-network.yaml | 2 +- .github/workflows/commit.yaml | 2 +- .github/workflows/conflicts.yaml | 2 +- .github/workflows/dco.yaml | 2 +- .github/workflows/dependabot-prs.yaml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/go.yml | 6 +++--- .github/workflows/lint.yaml | 4 ++-- .github/workflows/ostests-e2e.yaml | 2 +- .github/workflows/ostests-nightly.yaml | 2 +- .github/workflows/publish-docs-manual.yml | 2 +- .github/workflows/publish-docs.yml | 2 +- .github/workflows/release.yml | 10 +++++----- .github/workflows/sbom-upload.yml | 2 +- .github/workflows/smoketest.yaml | 2 +- .github/workflows/stale.yml | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml index d2953d287497..b9399e14fe59 100644 --- a/.github/workflows/backport.yaml +++ b/.github/workflows/backport.yaml @@ -24,7 +24,7 @@ jobs: && startsWith(github.event.label.name, 'backport/') ) ) - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/build-airgap-image-bundle.yml b/.github/workflows/build-airgap-image-bundle.yml index 71464cdb7cfc..8858cbfdfb1d 100644 --- a/.github/workflows/build-airgap-image-bundle.yml +++ b/.github/workflows/build-airgap-image-bundle.yml @@ -21,7 +21,7 @@ env: jobs: build: name: "${{ inputs.target-os }}-${{ inputs.target-arch }}" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 env: TARGET_OS: ${{ inputs.target-os }} diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 330977ccbb3d..e1cda767d763 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -17,7 +17,7 @@ env: jobs: build: name: Build docs - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout k0s uses: actions/checkout@v4 @@ -53,7 +53,7 @@ jobs: dev-container: name: Build docs dev container - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout k0s uses: actions/checkout@v4 diff --git a/.github/workflows/build-k0s.yml b/.github/workflows/build-k0s.yml index 4f1528eb0b85..ac4000ef5ca3 100644 --- a/.github/workflows/build-k0s.yml +++ b/.github/workflows/build-k0s.yml @@ -22,7 +22,7 @@ jobs: ${{ inputs.target-arch == 'arm' && fromJSON('["self-hosted", "linux", "arm"]') || inputs.target-arch == 'arm64' && fromJSON('["self-hosted", "linux", "arm64"]') - || 'ubuntu-22.04' + || 'ubuntu-24.04' }} env: diff --git a/.github/workflows/check-network.yaml b/.github/workflows/check-network.yaml index 54defaf42f6d..7fdaede2c740 100644 --- a/.github/workflows/check-network.yaml +++ b/.github/workflows/check-network.yaml @@ -22,7 +22,7 @@ jobs: name: "K8s Network Conformance Testing" if: github.repository == 'k0sproject/k0s' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 outputs: k0s_version: ${{ steps.bin_info.outputs.K0S_VERSION }} kubernetes_version: ${{ steps.k0s_build.outputs.KUBERNETES_VERSION }} diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml index a6448ce31bf5..ade93670cabc 100644 --- a/.github/workflows/commit.yaml +++ b/.github/workflows/commit.yaml @@ -6,7 +6,7 @@ on: jobs: check_for_merge_commit: name: mergeable - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Run git checkout uses: actions/checkout@v4 diff --git a/.github/workflows/conflicts.yaml b/.github/workflows/conflicts.yaml index 14d665af390a..49121fb31e7e 100644 --- a/.github/workflows/conflicts.yaml +++ b/.github/workflows/conflicts.yaml @@ -20,7 +20,7 @@ permissions: jobs: main: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Check for merge conflicts uses: eps1lon/actions-label-merge-conflict@v3.0.3 diff --git a/.github/workflows/dco.yaml b/.github/workflows/dco.yaml index a7ff7a3136d0..ebafb52d62a0 100644 --- a/.github/workflows/dco.yaml +++ b/.github/workflows/dco.yaml @@ -12,7 +12,7 @@ permissions: jobs: check: name: DCO check - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout k0s uses: actions/checkout@v4 diff --git a/.github/workflows/dependabot-prs.yaml b/.github/workflows/dependabot-prs.yaml index 937b6d283552..9fe27db430ee 100644 --- a/.github/workflows/dependabot-prs.yaml +++ b/.github/workflows/dependabot-prs.yaml @@ -9,7 +9,7 @@ jobs: auto-merge: name: Auto-merge version updates if: github.actor == 'dependabot[bot]' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Fetch Dependabot metadata diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ffa2f425fef6..1dd2aae0cc5f 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -20,7 +20,7 @@ on: jobs: lint: name: Lint markdown - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: articulate/actions-markdownlint@v1 diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 7988aae65bdd..cb1dfb64010d 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -35,7 +35,7 @@ env: jobs: prepare: name: Prepare - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 outputs: smoketest-matrix: ${{ steps.generate-smoketest-matrix.outputs.smoketests }} @@ -99,7 +99,7 @@ jobs: name: "Build :: SBOM" needs: [build-k0s] - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check out code into the Go module directory @@ -122,7 +122,7 @@ jobs: matrix: include: - name: linux-amd64 - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 - name: windows-amd64 runs-on: windows-2022 target-os: windows diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 6b4c33a9021f..466a3af9f014 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -35,7 +35,7 @@ env: jobs: lint: name: Lint - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 with: @@ -66,7 +66,7 @@ jobs: validate-os-tests: name: Validate OS tests - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 env: TERRAFORM_VERSION: 1.4.6 diff --git a/.github/workflows/ostests-e2e.yaml b/.github/workflows/ostests-e2e.yaml index 6272afec6970..95e6f7cf551f 100644 --- a/.github/workflows/ostests-e2e.yaml +++ b/.github/workflows/ostests-e2e.yaml @@ -59,7 +59,7 @@ env: jobs: e2e-tests: name: e2e tests - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 env: E2E_FOCUS: ${{ inputs.e2e-focus }} diff --git a/.github/workflows/ostests-nightly.yaml b/.github/workflows/ostests-nightly.yaml index 839bb01e8309..8f03d5752816 100644 --- a/.github/workflows/ostests-nightly.yaml +++ b/.github/workflows/ostests-nightly.yaml @@ -36,7 +36,7 @@ env: jobs: select: name: Select - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 outputs: os: ${{ steps.select.outputs.os }} diff --git a/.github/workflows/publish-docs-manual.yml b/.github/workflows/publish-docs-manual.yml index d368274296ee..0965809aaf01 100644 --- a/.github/workflows/publish-docs-manual.yml +++ b/.github/workflows/publish-docs-manual.yml @@ -14,7 +14,7 @@ env: jobs: build: name: Deploy docs - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout k0s main uses: actions/checkout@v4 diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index f1e9d805ee91..26dc3de5f126 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -14,7 +14,7 @@ env: jobs: build: name: Deploy docs - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout k0s uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fcd698bdbbdb..f71dcde5e012 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: TF_VAR_k0s_binary_path: "${{ github.workspace }}/k0s" KUBECONFIG: ${{ github.workspace }}/kubeconfig name: release - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 outputs: upload_url: ${{ steps.create_release.outputs.upload_url }} tag_name: ${{ steps.branch_name.outputs.TAG_NAME }} @@ -425,7 +425,7 @@ jobs: - x64 - arm64 - armv7 - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Download assets for generating checksums uses: robinraju/release-downloader@v1.11 @@ -452,7 +452,7 @@ jobs: - x64 - arm64 - armv7 - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -512,7 +512,7 @@ jobs: sbom: needs: - release - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Run git checkout uses: actions/checkout@v4 @@ -558,7 +558,7 @@ jobs: KUBECONFIG: ${{ github.workspace }}/kubeconfig name: "K8s Conformance Testing" - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 defaults: run: working-directory: ./inttest/sonobuoy/terraform diff --git a/.github/workflows/sbom-upload.yml b/.github/workflows/sbom-upload.yml index 9c8445bb1176..3dd94a761a1e 100644 --- a/.github/workflows/sbom-upload.yml +++ b/.github/workflows/sbom-upload.yml @@ -11,7 +11,7 @@ env: jobs: sbom-upload: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: id-token: write contents: write diff --git a/.github/workflows/smoketest.yaml b/.github/workflows/smoketest.yaml index c6f77e4bfd0e..70dcf6206d4f 100644 --- a/.github/workflows/smoketest.yaml +++ b/.github/workflows/smoketest.yaml @@ -28,7 +28,7 @@ permissions: jobs: smoketest: name: ${{ inputs.job-name }} - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check out code into the Go module directory diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 1b56eabea1cd..ed65e201193b 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -5,7 +5,7 @@ on: jobs: stale: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/stale@v9 with: