diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5c40e7c0..0718731f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "linkerd2", - "image": "ghcr.io/linkerd/dev:v44", + "image": "ghcr.io/linkerd/dev:v45", "extensions": [ "DavidAnson.vscode-markdownlint", "golang.go", diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 62c6f383..c1605baa 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -14,7 +14,7 @@ permissions: jobs: lint: runs-on: ubuntu-22.04 - container: ghcr.io/linkerd/dev:v44-go + container: ghcr.io/linkerd/dev:v45-go steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 @@ -22,7 +22,7 @@ jobs: fmt: runs-on: ubuntu-22.04 - container: ghcr.io/linkerd/dev:v44-go + container: ghcr.io/linkerd/dev:v45-go steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 @@ -30,7 +30,7 @@ jobs: unit-test: runs-on: ubuntu-22.04 - container: ghcr.io/linkerd/dev:v44-go + container: ghcr.io/linkerd/dev:v45-go steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 diff --git a/.github/workflows/release-validator.yml b/.github/workflows/release-validator.yml index 1f5b9458..4c2fc8a8 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-22.04 - container: ghcr.io/linkerd/dev:v44-rust + container: ghcr.io/linkerd/dev:v45-rust steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: ./.github/actions/version-mode @@ -34,7 +34,7 @@ jobs: arch: [amd64, arm64, arm] timeout-minutes: 10 runs-on: ubuntu-22.04 - container: ghcr.io/linkerd/dev:v44-rust-musl + container: ghcr.io/linkerd/dev:v45-rust-musl steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: just validator arch=${{ matrix.arch }} profile=release version=${{ needs.meta.outputs.version }} package diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 69832f65..e169e736 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -14,7 +14,7 @@ jobs: check: timeout-minutes: 5 runs-on: ubuntu-22.04 - container: ghcr.io/linkerd/dev:v44-rust + container: ghcr.io/linkerd/dev:v45-rust steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: just rs-fetch diff --git a/Dockerfile-cni-plugin b/Dockerfile-cni-plugin index 18ebadd4..5dcf935d 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:v44-rust-musl as cni-repair-controller +FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v45-rust-musl as cni-repair-controller WORKDIR /build COPY --link justfile justfile-rust . COPY --link Cargo.toml Cargo.lock .