Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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:v48",
"image": "ghcr.io/linkerd/dev:v49",
"extensions": [
"DavidAnson.vscode-markdownlint",
"golang.go",
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@ jobs:
runs-on: ubuntu-24.04
timeout-minutes: 10
steps:
- uses: linkerd/dev/actions/setup-tools@v48
- uses: linkerd/dev/actions/setup-tools@v49
with:
version: v49
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: just action-lint

devcontainer-versions:
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v48
- uses: linkerd/dev/actions/setup-tools@v49
with:
version: v49
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: just action-dev-check
12 changes: 9 additions & 3 deletions .github/workflows/cni-plugin-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v48
- uses: linkerd/dev/actions/setup-tools@v49
with:
version: v49
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- name: Run CNI integration tests
env:
Expand All @@ -33,15 +35,19 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v48
- uses: linkerd/dev/actions/setup-tools@v49
with:
version: v49
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- name: Run CNI ordering tests
run: just cni-plugin-test-ordering
repair-controller:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v48
- uses: linkerd/dev/actions/setup-tools@v49
with:
version: v49
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- 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,7 +14,7 @@ permissions:
jobs:
lint:
runs-on: ubuntu-24.04
container: ghcr.io/linkerd/dev:v48-go
container: ghcr.io/linkerd/dev:v49-go
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -25,7 +25,7 @@ jobs:

fmt:
runs-on: ubuntu-24.04
container: ghcr.io/linkerd/dev:v48-go
container: ghcr.io/linkerd/dev:v49-go
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -36,7 +36,7 @@ jobs:

unit-test:
runs-on: ubuntu-24.04
container: ghcr.io/linkerd/dev:v48-go
container: ghcr.io/linkerd/dev:v49-go
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v48
- uses: linkerd/dev/actions/setup-tools@v49
with:
version: v49
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- name: Run proxy-init integration tests
run: just proxy-init-test-integration
4 changes: 3 additions & 1 deletion .github/workflows/release-cni-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ jobs:

- uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
- uses: linkerd/dev/actions/setup-tools@v48
- uses: linkerd/dev/actions/setup-tools@v49
with:
version: v49
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: |
just cni-plugin-image='${{ needs.meta.outputs.repo }}:${{ needs.meta.outputs.version }}' \
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release-proxy-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ jobs:

- uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a
- uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
- uses: linkerd/dev/actions/setup-tools@v48
- uses: linkerd/dev/actions/setup-tools@v49
with:
version: v49
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- 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-24.04
container: ghcr.io/linkerd/dev:v48-rust
container: ghcr.io/linkerd/dev:v49-rust
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- uses: ./.github/actions/version-mode
Expand All @@ -38,7 +38,7 @@ jobs:
arch: arm64
timeout-minutes: 10
runs-on: ubuntu-24.04
container: ghcr.io/linkerd/dev:v48-rust-musl
container: ghcr.io/linkerd/dev:v49-rust-musl
steps:
- name: Install MinGW
if: matrix.os == 'windows'
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-24.04
container: ghcr.io/linkerd/dev:v48-rust
container: ghcr.io/linkerd/dev:v49-rust
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- run: just rs-fetch
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/shell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
timeout-minutes: 5
runs-on: ubuntu-24.04
steps:
- uses: linkerd/dev/actions/setup-tools@v48
- uses: linkerd/dev/actions/setup-tools@v49
with:
version: v49
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
- 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:v48-rust-musl as cni-repair-controller
FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v49-rust-musl as cni-repair-controller
WORKDIR /build
COPY --link justfile justfile-rust .
COPY --link Cargo.toml Cargo.lock .
Expand Down
11 changes: 0 additions & 11 deletions cni-plugin/integration/calico-k3s-images.json

This file was deleted.

Loading
Loading