From b8244ee11dd4b233889319716139162ae5125dad Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Fri, 3 Nov 2023 03:54:08 +0000 Subject: [PATCH] dev: v42 --- .devcontainer/devcontainer.json | 2 +- .github/workflows/codecov.yml | 4 ++-- .github/workflows/devcontainer.yml | 2 +- .github/workflows/go.yml | 6 +++--- .github/workflows/integration.yml | 8 ++++---- .github/workflows/proto.yml | 2 +- .github/workflows/release.yml | 6 +++--- .github/workflows/rust.yml | 8 ++++---- Cargo.toml | 1 + cli/Dockerfile | 2 +- cni-plugin/Dockerfile | 2 +- controller/Dockerfile | 2 +- jaeger/injector/Dockerfile | 2 +- policy-controller/Dockerfile | 2 +- rust-toolchain.toml | 2 +- viz/metrics-api/Dockerfile | 2 +- viz/tap/Dockerfile | 2 +- web/Dockerfile | 2 +- 18 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 18d2529486446..141390e4b60b9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "linkerd2", - "image": "ghcr.io/linkerd/dev:v40", + "image": "ghcr.io/linkerd/dev:v42", // "dockerFile": "./Dockerfile", // "context": "..", "customizations": { diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index af3b483d2c5aa..319a8a6655985 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -14,7 +14,7 @@ jobs: timeout-minutes: 30 runs-on: ubuntu-20.04 container: - image: golang:1.19 + image: golang:1.21 steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - run: go install gotest.tools/gotestsum@v0.4.2 @@ -51,7 +51,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 container: - image: docker://rust:1.69.0 + image: docker://rust:1.73.0 options: --security-opt seccomp=unconfined steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml index b3f829663dc67..1391b1c6c65f0 100644 --- a/.github/workflows/devcontainer.yml +++ b/.github/workflows/devcontainer.yml @@ -15,7 +15,7 @@ permissions: jobs: rust-version: runs-on: ubuntu-latest - container: ghcr.io/linkerd/dev:v40-rust + container: ghcr.io/linkerd/dev:v42-rust steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - shell: bash diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 475df8e804280..428307fb47da5 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -16,7 +16,7 @@ jobs: go-lint: timeout-minutes: 10 runs-on: ubuntu-20.04 - container: ghcr.io/linkerd/dev:v40-go + container: ghcr.io/linkerd/dev:v42-go steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 @@ -25,7 +25,7 @@ jobs: go-format: timeout-minutes: 10 runs-on: ubuntu-20.04 - container: ghcr.io/linkerd/dev:v40-go + container: ghcr.io/linkerd/dev:v42-go steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 @@ -34,7 +34,7 @@ jobs: go-test: timeout-minutes: 10 runs-on: ubuntu-20.04 - container: ghcr.io/linkerd/dev:v40-go + container: ghcr.io/linkerd/dev:v42-go steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index e206aaff5d944..f56c155845f61 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -126,7 +126,7 @@ jobs: steps: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe with: - go-version: '1.19' + go-version: '1.21' - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a with: @@ -267,7 +267,7 @@ jobs: steps: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe with: - go-version: '1.19' + go-version: '1.21' - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a with: @@ -310,7 +310,7 @@ jobs: steps: - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe with: - go-version: '1.19' + go-version: '1.21' - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a with: @@ -361,7 +361,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe with: - go-version: '1.19' + go-version: '1.21' - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a with: diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml index 543441c93498e..5dc3406e611eb 100644 --- a/.github/workflows/proto.yml +++ b/.github/workflows/proto.yml @@ -15,7 +15,7 @@ jobs: proto-diff: timeout-minutes: 10 runs-on: ubuntu-20.04 - container: ghcr.io/linkerd/dev:v40-go + container: ghcr.io/linkerd/dev:v42-go steps: - run: apt update && apt install -y unzip - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e36db439a1d6a..603e4cd1b4c50 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -97,7 +97,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe with: - go-version: '1.19' + go-version: '1.21' - name: Download image archives uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a with: @@ -131,7 +131,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe with: - go-version: '1.19' + go-version: '1.21' - name: Set environment variables from scripts run: | TAG='${{ needs.tag.outputs.tag }}' @@ -155,7 +155,7 @@ jobs: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe with: - go-version: '1.19' + go-version: '1.21' - uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 - name: Pull linkerd binary run: | diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 10f09bfd7baaf..6a508d62fdf88 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -43,7 +43,7 @@ jobs: fmt: timeout-minutes: 5 runs-on: ubuntu-latest - container: ghcr.io/linkerd/dev:v40-rust + container: ghcr.io/linkerd/dev:v42-rust steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 @@ -52,7 +52,7 @@ jobs: clippy: timeout-minutes: 20 runs-on: ubuntu-latest - container: ghcr.io/linkerd/dev:v40-rust + container: ghcr.io/linkerd/dev:v42-rust steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - run: git config --global --add safe.directory "$PWD" # actions/runner#2033 @@ -63,7 +63,7 @@ jobs: check: timeout-minutes: 20 runs-on: ubuntu-latest - container: ghcr.io/linkerd/dev:v40-rust + container: ghcr.io/linkerd/dev:v42-rust steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - run: just rs-fetch @@ -73,7 +73,7 @@ jobs: name: test runs-on: ubuntu-latest timeout-minutes: 15 - container: ghcr.io/linkerd/dev:v40-rust + container: ghcr.io/linkerd/dev:v42-rust steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - run: just rs-fetch diff --git a/Cargo.toml b/Cargo.toml index a1492f87664d1..2bd3689b03f4d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "policy-controller", "policy-controller/core", diff --git a/cli/Dockerfile b/cli/Dockerfile index 57141faf759b9..166ee7ff38ca4 100644 --- a/cli/Dockerfile +++ b/cli/Dockerfile @@ -1,7 +1,7 @@ ARG BUILDPLATFORM=linux/amd64 # Precompile key slow-to-build dependencies -FROM --platform=$BUILDPLATFORM golang:1.19-alpine as go-deps +FROM --platform=$BUILDPLATFORM golang:1.21-alpine as go-deps WORKDIR /linkerd-build COPY go.mod go.sum ./ COPY bin/install-deps bin/ diff --git a/cni-plugin/Dockerfile b/cni-plugin/Dockerfile index b2ca49b0d301b..22aa5d063d69b 100644 --- a/cni-plugin/Dockerfile +++ b/cni-plugin/Dockerfile @@ -1,7 +1,7 @@ ARG BUILDPLATFORM=linux/amd64 # Precompile key slow-to-build dependencies -FROM --platform=$BUILDPLATFORM golang:1.19-alpine as go-deps +FROM --platform=$BUILDPLATFORM golang:1.21-alpine as go-deps WORKDIR /linkerd-build COPY go.mod go.sum ./ COPY bin/install-deps bin/ diff --git a/controller/Dockerfile b/controller/Dockerfile index 488edeed33eda..37faeecb3ceb8 100644 --- a/controller/Dockerfile +++ b/controller/Dockerfile @@ -1,7 +1,7 @@ ARG BUILDPLATFORM=linux/amd64 # Precompile key slow-to-build dependencies -FROM --platform=$BUILDPLATFORM golang:1.19-alpine as go-deps +FROM --platform=$BUILDPLATFORM golang:1.21-alpine as go-deps WORKDIR /linkerd-build COPY go.mod go.sum ./ COPY bin/install-deps bin/ diff --git a/jaeger/injector/Dockerfile b/jaeger/injector/Dockerfile index 3de3f05478aa1..94cceb8751bbd 100644 --- a/jaeger/injector/Dockerfile +++ b/jaeger/injector/Dockerfile @@ -1,7 +1,7 @@ ARG BUILDPLATFORM=linux/amd64 # Precompile key slow-to-build dependencies -FROM --platform=$BUILDPLATFORM golang:1.19-alpine as go-deps +FROM --platform=$BUILDPLATFORM golang:1.21-alpine as go-deps WORKDIR /linkerd-build COPY go.mod go.sum ./ COPY bin/install-deps bin/ diff --git a/policy-controller/Dockerfile b/policy-controller/Dockerfile index 74a979a47be24..c172d374ef791 100644 --- a/policy-controller/Dockerfile +++ b/policy-controller/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v40-rust-musl as controller +FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v42-rust-musl as controller ARG BUILD_TYPE="release" WORKDIR /build RUN mkdir -p target/bin diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f2415f8315ca8..8142c3012694b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.69.0" +channel = "1.73.0" diff --git a/viz/metrics-api/Dockerfile b/viz/metrics-api/Dockerfile index 3f79cd86caea4..6ff4145a29372 100644 --- a/viz/metrics-api/Dockerfile +++ b/viz/metrics-api/Dockerfile @@ -1,7 +1,7 @@ ARG BUILDPLATFORM=linux/amd64 # Precompile key slow-to-build dependencies -FROM --platform=$BUILDPLATFORM golang:1.19-alpine as go-deps +FROM --platform=$BUILDPLATFORM golang:1.21-alpine as go-deps WORKDIR /linkerd-build COPY go.mod go.sum ./ COPY bin/install-deps bin/ diff --git a/viz/tap/Dockerfile b/viz/tap/Dockerfile index c21f99c97383d..6de39e157ceaa 100644 --- a/viz/tap/Dockerfile +++ b/viz/tap/Dockerfile @@ -1,7 +1,7 @@ ARG BUILDPLATFORM=linux/amd64 # Precompile key slow-to-build dependencies -FROM --platform=$BUILDPLATFORM golang:1.19-alpine as go-deps +FROM --platform=$BUILDPLATFORM golang:1.21-alpine as go-deps WORKDIR /linkerd-build COPY go.mod go.sum ./ COPY bin/install-deps bin/ diff --git a/web/Dockerfile b/web/Dockerfile index 28d9a743d36e1..b18ee7648142c 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,7 +1,7 @@ ARG BUILDPLATFORM=linux/amd64 # Precompile key slow-to-build dependencies -FROM --platform=$BUILDPLATFORM golang:1.19-alpine as go-deps +FROM --platform=$BUILDPLATFORM golang:1.21-alpine as go-deps WORKDIR /linkerd-build COPY go.mod go.sum ./ COPY bin/install-deps bin/