Skip to content

Commit

Permalink
build(deps-dev): bump linkerd/dev from v43 to v44
Browse files Browse the repository at this point in the history
  • Loading branch information
olix0r committed Dec 5, 2024
1 parent 1bde837 commit ed8357d
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "linkerd2",
"image": "ghcr.io/linkerd/dev:v43",
"image": "ghcr.io/linkerd/dev:v44",
"extensions": [
"DavidAnson.vscode-markdownlint",
"golang.go",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@fafb04020caec499ffdfc78641ea308b44fb151f
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just action-lint

devcontainer-versions:
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@fafb04020caec499ffdfc78641ea308b44fb151f
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just action-dev-check
6 changes: 3 additions & 3 deletions .github/workflows/cni-plugin-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@fafb04020caec499ffdfc78641ea308b44fb151f
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- name: Run CNI integration tests
env:
Expand All @@ -31,15 +31,15 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@fafb04020caec499ffdfc78641ea308b44fb151f
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- name: Run CNI ordering tests
run: just cni-plugin-test-ordering
repair-controller:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@fafb04020caec499ffdfc78641ea308b44fb151f
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- name: Run repair-controller tests
run: just cni-repair-controller-integration
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@ permissions:
jobs:
lint:
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v43-go
container: ghcr.io/linkerd/dev:v44-go
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
- run: just go-lint --verbose --timeout=10m

fmt:
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v43-go
container: ghcr.io/linkerd/dev:v44-go
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
- run: just go-fmt-check

unit-test:
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v43-go
container: ghcr.io/linkerd/dev:v44-go
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@fafb04020caec499ffdfc78641ea308b44fb151f
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- name: Run proxy-init integration tests
run: just proxy-init-test-integration
2 changes: 1 addition & 1 deletion .github/workflows/release-cni-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
restore-keys: cni-plugin-${{ needs.meta.outputs.mode }}-

- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@fafb04020caec499ffdfc78641ea308b44fb151f
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: |
just cni-plugin-image='${{ needs.meta.outputs.repo }}:${{ needs.meta.outputs.version }}' \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-proxy-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
restore-keys: proxy-init-${{ needs.meta.outputs.mode }}-

- uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@fafb04020caec499ffdfc78641ea308b44fb151f
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: |
just proxy-init-image='${{ needs.meta.outputs.repo }}:${{ needs.meta.outputs.version }}' \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-validator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
meta:
timeout-minutes: 15
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v43-rust
container: ghcr.io/linkerd/dev:v44-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: ./.github/actions/version-mode
Expand All @@ -34,7 +34,7 @@ jobs:
arch: [amd64, arm64, arm]
timeout-minutes: 10
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v43-rust-musl
container: ghcr.io/linkerd/dev:v44-rust-musl
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just validator arch=${{ matrix.arch }} profile=release version=${{ needs.meta.outputs.version }} package
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
check:
timeout-minutes: 5
runs-on: ubuntu-latest
container: ghcr.io/linkerd/dev:v43-rust
container: ghcr.io/linkerd/dev:v44-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just rs-fetch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- uses: linkerd/dev/actions/setup-tools@v43
- uses: linkerd/dev/actions/setup-tools@fafb04020caec499ffdfc78641ea308b44fb151f
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just sh-lint
2 changes: 1 addition & 1 deletion Dockerfile-cni-plugin
Original file line number Diff line number Diff line change
Expand Up @@ -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:v43-rust-musl as cni-repair-controller
FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v44-rust-musl as cni-repair-controller
WORKDIR /build
COPY --link justfile justfile-rust .
COPY --link Cargo.toml Cargo.lock .
Expand Down
2 changes: 1 addition & 1 deletion cni-plugin/integration/Dockerfile-tester
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# 1) a specific k3d cluster configured with CNI
# 2) a test suite (e.g. `flannel.go`) runs with a configured CNI plugin.

FROM golang:1.22-alpine as build
FROM golang:1.23-alpine as build
RUN apk add build-base
ENV GOCACHE=/tmp/
WORKDIR /src
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/linkerd/linkerd2-proxy-init

go 1.22.0
go 1.23.0

toolchain go1.22.3
toolchain go1.23.3

require (
github.com/containernetworking/cni v1.2.3
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.76.0"
channel = "1.82.0"

0 comments on commit ed8357d

Please sign in to comment.