From aafceb79fa72b42c44944f7fb57b9a5bf015fbd1 Mon Sep 17 00:00:00 2001 From: Alejandro Pedraza Date: Tue, 30 Jun 2026 15:16:09 -0500 Subject: [PATCH] chore(build): bump dev container to v50 https://github.com/linkerd/dev/releases/tag/v50 --- .devcontainer/devcontainer.json | 2 +- .github/workflows/actions.yml | 8 ++------ .github/workflows/cni-plugin-integration.yml | 12 +++--------- .github/workflows/go.yml | 6 +++--- .github/workflows/integration.yml | 4 +--- .github/workflows/release-cni-plugin.yml | 4 +--- .github/workflows/release-proxy-init.yml | 4 +--- .github/workflows/release-validator.yml | 4 ++-- .github/workflows/rust.yml | 2 +- .github/workflows/shell.yml | 4 +--- Dockerfile-cni-plugin | 2 +- 11 files changed, 17 insertions(+), 35 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9de1c9de..066e0391 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "linkerd2", - "image": "ghcr.io/linkerd/dev:v49", + "image": "ghcr.io/linkerd/dev:v50", "extensions": [ "DavidAnson.vscode-markdownlint", "golang.go", diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index a3ce64bd..1ae568c5 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -15,17 +15,13 @@ jobs: runs-on: ubuntu-24.04 timeout-minutes: 10 steps: - - uses: linkerd/dev/actions/setup-tools@v49 - with: - version: v49 + - uses: linkerd/dev/actions/setup-tools@v50 - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - run: just action-lint devcontainer-versions: runs-on: ubuntu-24.04 steps: - - uses: linkerd/dev/actions/setup-tools@v49 - with: - version: v49 + - uses: linkerd/dev/actions/setup-tools@v50 - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - run: just action-dev-check diff --git a/.github/workflows/cni-plugin-integration.yml b/.github/workflows/cni-plugin-integration.yml index 090db34f..89e07021 100644 --- a/.github/workflows/cni-plugin-integration.yml +++ b/.github/workflows/cni-plugin-integration.yml @@ -22,9 +22,7 @@ jobs: timeout-minutes: 15 runs-on: ubuntu-24.04 steps: - - uses: linkerd/dev/actions/setup-tools@v49 - with: - version: v49 + - uses: linkerd/dev/actions/setup-tools@v50 - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - name: Run CNI integration tests env: @@ -35,9 +33,7 @@ jobs: timeout-minutes: 15 runs-on: ubuntu-24.04 steps: - - uses: linkerd/dev/actions/setup-tools@v49 - with: - version: v49 + - uses: linkerd/dev/actions/setup-tools@v50 - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - name: Run CNI ordering tests run: just cni-plugin-test-ordering @@ -45,9 +41,7 @@ jobs: timeout-minutes: 15 runs-on: ubuntu-24.04 steps: - - uses: linkerd/dev/actions/setup-tools@v49 - with: - version: v49 + - uses: linkerd/dev/actions/setup-tools@v50 - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - name: Run repair-controller tests run: just cni-repair-controller-integration diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 6c76a13d..6f98842e 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -14,7 +14,7 @@ permissions: jobs: lint: runs-on: ubuntu-24.04 - container: ghcr.io/linkerd/dev:v49-go + container: ghcr.io/linkerd/dev:v50-go steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 @@ -25,7 +25,7 @@ jobs: fmt: runs-on: ubuntu-24.04 - container: ghcr.io/linkerd/dev:v49-go + container: ghcr.io/linkerd/dev:v50-go steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 @@ -36,7 +36,7 @@ jobs: unit-test: runs-on: ubuntu-24.04 - container: ghcr.io/linkerd/dev:v49-go + container: ghcr.io/linkerd/dev:v50-go steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index c10f4bab..8a1a8f9c 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -15,9 +15,7 @@ jobs: timeout-minutes: 15 runs-on: ubuntu-24.04 steps: - - uses: linkerd/dev/actions/setup-tools@v49 - with: - version: v49 + - uses: linkerd/dev/actions/setup-tools@v50 - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - name: Run proxy-init integration tests run: just proxy-init-test-integration diff --git a/.github/workflows/release-cni-plugin.yml b/.github/workflows/release-cni-plugin.yml index bca276b1..bc908f3c 100644 --- a/.github/workflows/release-cni-plugin.yml +++ b/.github/workflows/release-cni-plugin.yml @@ -41,9 +41,7 @@ jobs: - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 - - uses: linkerd/dev/actions/setup-tools@v49 - with: - version: v49 + - uses: linkerd/dev/actions/setup-tools@v50 - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - run: | just cni-plugin-image='${{ needs.meta.outputs.repo }}:${{ needs.meta.outputs.version }}' \ diff --git a/.github/workflows/release-proxy-init.yml b/.github/workflows/release-proxy-init.yml index 47f2b518..573faa5b 100644 --- a/.github/workflows/release-proxy-init.yml +++ b/.github/workflows/release-proxy-init.yml @@ -41,9 +41,7 @@ jobs: - uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 - - uses: linkerd/dev/actions/setup-tools@v49 - with: - version: v49 + - uses: linkerd/dev/actions/setup-tools@v50 - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - run: | just proxy-init-image='${{ needs.meta.outputs.repo }}:${{ needs.meta.outputs.version }}' \ diff --git a/.github/workflows/release-validator.yml b/.github/workflows/release-validator.yml index 558e9718..48cab964 100644 --- a/.github/workflows/release-validator.yml +++ b/.github/workflows/release-validator.yml @@ -14,7 +14,7 @@ jobs: meta: timeout-minutes: 15 runs-on: ubuntu-24.04 - container: ghcr.io/linkerd/dev:v49-rust + container: ghcr.io/linkerd/dev:v50-rust steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - uses: ./.github/actions/version-mode @@ -38,7 +38,7 @@ jobs: arch: arm64 timeout-minutes: 10 runs-on: ubuntu-24.04 - container: ghcr.io/linkerd/dev:v49-rust-musl + container: ghcr.io/linkerd/dev:v50-rust-musl steps: - name: Install MinGW if: matrix.os == 'windows' diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0f2faa77..12f53e18 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -14,7 +14,7 @@ jobs: check: timeout-minutes: 5 runs-on: ubuntu-24.04 - container: ghcr.io/linkerd/dev:v49-rust + container: ghcr.io/linkerd/dev:v50-rust steps: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - run: just rs-fetch diff --git a/.github/workflows/shell.yml b/.github/workflows/shell.yml index 1d00d8ae..fabd04ee 100644 --- a/.github/workflows/shell.yml +++ b/.github/workflows/shell.yml @@ -15,8 +15,6 @@ jobs: timeout-minutes: 5 runs-on: ubuntu-24.04 steps: - - uses: linkerd/dev/actions/setup-tools@v49 - with: - version: v49 + - uses: linkerd/dev/actions/setup-tools@v50 - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 - run: just sh-lint diff --git a/Dockerfile-cni-plugin b/Dockerfile-cni-plugin index 2a1986d0..a93419a6 100644 --- a/Dockerfile-cni-plugin +++ b/Dockerfile-cni-plugin @@ -12,7 +12,7 @@ ARG TARGETARCH RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH GO111MODULE=on \ go build -o /go/bin/linkerd-cni -mod=readonly -ldflags "-s -w" -v ./cni-plugin/ -FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v49-rust-musl as cni-repair-controller +FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v50-rust-musl as cni-repair-controller WORKDIR /build COPY --link justfile justfile-rust go.just . COPY --link Cargo.toml Cargo.lock .