From c5cd1fd773a7ef9c33bb55cd9b0a2fea4a6154bf Mon Sep 17 00:00:00 2001 From: katelyn martin Date: Tue, 17 Feb 2026 00:00:00 +0000 Subject: [PATCH] chore: update to dev v49 https://github.com/linkerd/dev/pull/80 updated the k3d/k3s images. this commit pulls in this change, via the new v49 release. Signed-off-by: katelyn martin --- .github/workflows/coverage.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/pr.yml | 8 ++++---- .github/workflows/release.yml | 2 +- .github/workflows/shellcheck.yml | 2 +- .github/workflows/toolchain.yml | 4 ++-- Dockerfile | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index f18917a6d5..7623f303c3 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -43,7 +43,7 @@ jobs: runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} timeout-minutes: 30 container: - image: docker://ghcr.io/linkerd/dev:v48-rust + image: docker://ghcr.io/linkerd/dev:v49-rust options: --security-opt seccomp=unconfined # 🤷 env: CXX: "/usr/bin/clang++-19" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 081da9f958..a36293c73e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -23,7 +23,7 @@ permissions: jobs: build: runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} - container: ghcr.io/linkerd/dev:v48-rust + container: ghcr.io/linkerd/dev:v49-rust timeout-minutes: 20 continue-on-error: true steps: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 70255e0a59..1dd1e9a517 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -76,7 +76,7 @@ jobs: if: needs.meta.outputs.actions_changed == 'true' runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - - uses: linkerd/dev/actions/setup-tools@v48 + - uses: linkerd/dev/actions/setup-tools@v49 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd - run: just action-lint - run: just action-dev-check @@ -85,7 +85,7 @@ jobs: needs: meta if: needs.meta.outputs.cargo_changed == 'true' || needs.meta.outputs.rust_changed == 'true' runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} - container: ghcr.io/linkerd/dev:v48-rust + container: ghcr.io/linkerd/dev:v49-rust permissions: contents: read timeout-minutes: 20 @@ -108,7 +108,7 @@ jobs: if: needs.meta.outputs.cargo_changed == 'true' timeout-minutes: 20 runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} - container: ghcr.io/linkerd/dev:v48-rust + container: ghcr.io/linkerd/dev:v49-rust strategy: matrix: crate: ${{ fromJson(needs.meta.outputs.cargo_crates) }} @@ -127,7 +127,7 @@ jobs: env: WAIT_TIMEOUT: 2m steps: - - uses: linkerd/dev/actions/setup-tools@v48 + - uses: linkerd/dev/actions/setup-tools@v49 - name: scurl https://run.linkerd.io/install-edge | sh run: | scurl https://run.linkerd.io/install-edge | sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 18269b4985..0918d4c579 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -155,7 +155,7 @@ jobs: continue-on-error: ${{ needs.meta.outputs.publish != 'true' }} runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} timeout-minutes: 40 - container: docker://ghcr.io/linkerd/dev:v48-rust-musl + container: docker://ghcr.io/linkerd/dev:v49-rust-musl env: LINKERD2_PROXY_VENDOR: ${{ github.repository_owner }} LINKERD2_PROXY_VERSION: ${{ needs.meta.outputs.version }} diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 07da9e18d4..f8d395575a 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -15,6 +15,6 @@ jobs: timeout-minutes: 5 runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - - uses: linkerd/dev/actions/setup-tools@v48 + - uses: linkerd/dev/actions/setup-tools@v49 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd - run: just sh-lint diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml index 075a345d46..45288f7b78 100644 --- a/.github/workflows/toolchain.yml +++ b/.github/workflows/toolchain.yml @@ -14,7 +14,7 @@ permissions: jobs: devcontainer: runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} - container: ghcr.io/linkerd/dev:v48-rust + container: ghcr.io/linkerd/dev:v49-rust steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 @@ -37,7 +37,7 @@ jobs: workflows: runs-on: ${{ vars.LINKERD2_PROXY_RUNNER || 'ubuntu-24.04' }} steps: - - uses: linkerd/dev/actions/setup-tools@v48 + - uses: linkerd/dev/actions/setup-tools@v49 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd - shell: bash run: | diff --git a/Dockerfile b/Dockerfile index a12aa2942b..0f6026c234 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # This is intended **DEVELOPMENT ONLY**, i.e. so that proxy developers can # easily test the proxy in the context of the larger `linkerd2` project. -ARG RUST_IMAGE=ghcr.io/linkerd/dev:v48-rust +ARG RUST_IMAGE=ghcr.io/linkerd/dev:v49-rust # Use an arbitrary ~recent edge release image to get the proxy # identity-initializing and linkerd-await wrappers.