Skip to content
Merged
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:v47",
"image": "ghcr.io/linkerd/dev:v48",
// "dockerFile": "./Dockerfile",
// "context": "..",
"features": {
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/helm-publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ runs:
steps:
- name: Set up Cloud SDK
uses: 'google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db'
- uses: linkerd/dev/actions/setup-tools@v47
- uses: linkerd/dev/actions/setup-tools@v48
- shell: bash
run: |
mkdir -p target/helm
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
timeout-minutes: 10
steps:
- uses: linkerd/dev/actions/setup-tools@v47
- uses: linkerd/dev/actions/setup-tools@v48
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- run: just-dev lint-actions

devcontainer-versions:
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
steps:
- uses: linkerd/dev/actions/setup-tools@v47
- uses: linkerd/dev/actions/setup-tools@v48
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- run: just-dev check-action-images
4 changes: 2 additions & 2 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
timeout-minutes: 30
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
container:
image: golang:1.24
image: golang:1.25
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- run: go install gotest.tools/[email protected]
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
timeout-minutes: 15
container:
image: docker://rust:1.88.0
image: docker://rust:1.90.0
options: --security-opt seccomp=unconfined
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
with:
go-version: "1.24"
go-version-file: go.mod

- name: Initialize
# Unpinned action version so that we automatically get analyzer updates.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permissions:
jobs:
rust-version:
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
container: ghcr.io/linkerd/dev:v47-rust
container: ghcr.io/linkerd/dev:v48-rust
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- shell: bash
Expand All @@ -39,6 +39,6 @@ jobs:
devcontainer-image:
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
steps:
- uses: linkerd/dev/actions/setup-tools@v47
- uses: linkerd/dev/actions/setup-tools@v48
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- run: just-dev pull-dev-image
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
if: needs.meta.outputs.changed == 'true'
timeout-minutes: 10
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
container: ghcr.io/linkerd/dev:v47-go
container: ghcr.io/linkerd/dev:v48-go
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -40,7 +40,7 @@ jobs:
if: needs.meta.outputs.changed == 'true'
timeout-minutes: 10
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
container: ghcr.io/linkerd/dev:v47-go
container: ghcr.io/linkerd/dev:v48-go
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -51,7 +51,7 @@ jobs:
if: needs.meta.outputs.changed == 'true'
timeout-minutes: 30
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
container: ghcr.io/linkerd/dev:v47-go
container: ghcr.io/linkerd/dev:v48-go
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
with:
go-version: "1.24"
go-version-file: go.mod
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
with:
pattern: image-archives-*
Expand Down Expand Up @@ -275,7 +275,7 @@ jobs:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
with:
go-version: "1.24"
go-version-file: go.mod
- uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4
if: matrix.integration_test == 'helm-upgrade'
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
Expand Down Expand Up @@ -305,7 +305,7 @@ jobs:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
with:
go-version: "1.24"
go-version-file: go.mod
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
with:
pattern: image-archives-*
Expand Down Expand Up @@ -344,7 +344,7 @@ jobs:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
with:
go-version: "1.24"
go-version-file: go.mod
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
with:
pattern: image-archives-*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
proto-diff:
timeout-minutes: 10
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
container: ghcr.io/linkerd/dev:v47-go
container: ghcr.io/linkerd/dev:v48-go
steps:
- run: apt update && apt install -y unzip
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00
with:
go-version: "1.24"
go-version-file: go.mod
- uses: ./.github/actions/cli-setup
with:
artifact-id: ${{ needs.cli.outputs.artifact-id }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
audit:
timeout-minutes: 10
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
container: ghcr.io/linkerd/dev:v47-rust
container: ghcr.io/linkerd/dev:v48-rust
strategy:
matrix:
checks:
Expand All @@ -43,7 +43,7 @@ jobs:
fmt:
timeout-minutes: 5
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
container: ghcr.io/linkerd/dev:v47-rust
container: ghcr.io/linkerd/dev:v48-rust
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -52,7 +52,7 @@ jobs:
clippy:
timeout-minutes: 20
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
container: ghcr.io/linkerd/dev:v47-rust
container: ghcr.io/linkerd/dev:v48-rust
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -63,7 +63,7 @@ jobs:
check:
timeout-minutes: 20
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
container: ghcr.io/linkerd/dev:v47-rust
container: ghcr.io/linkerd/dev:v48-rust
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand All @@ -74,7 +74,7 @@ jobs:
name: test
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
timeout-minutes: 15
container: ghcr.io/linkerd/dev:v47-rust
container: ghcr.io/linkerd/dev:v48-rust
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
timeout-minutes: 10
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
steps:
- uses: linkerd/dev/actions/setup-tools@v47
- uses: linkerd/dev/actions/setup-tools@v48
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
- run: just sh-lint
2 changes: 1 addition & 1 deletion Dockerfile-proxy
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG RUNTIME_IMAGE=gcr.io/distroless/cc-debian12
ARG BUILDPLATFORM=linux/amd64

# Precompile key slow-to-build dependencies
FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS go-deps
FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS go-deps
WORKDIR /linkerd-build
COPY go.mod go.sum ./
COPY bin/install-deps bin/
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.controller
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Precompile key slow-to-build dependencies
FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS go-deps
FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS go-deps
WORKDIR /linkerd-build
COPY go.mod go.sum ./
COPY bin/install-deps bin/
Expand All @@ -21,7 +21,7 @@ COPY multicluster multicluster
ARG TARGETARCH
RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -o /out/controller -tags prod -mod=readonly -ldflags "-s -w" ./controller/cmd

FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v47-rust-musl AS policy
FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v48-rust-musl AS policy
ARG BUILD_TYPE="release"
WORKDIR /build
RUN mkdir -p target/bin
Expand All @@ -46,7 +46,7 @@ RUN --mount=type=cache,target=target \
arm64) echo aarch64-unknown-linux-musl ;; \
*) echo "unsupported architecture: $TARGETARCH" >&2; exit 1 ;; \
esac) && \
just-cargo CFLAGS_aarch64_unknown_linux_musl="" profile=$BUILD_TYPE target=$target build --package=linkerd-policy-controller && \
just-cargo profile=$BUILD_TYPE target=$target build --package=linkerd-policy-controller && \
mkdir /out && mv "target/$target/$BUILD_TYPE/linkerd-policy-controller" /out/

## package runtime
Expand Down
2 changes: 1 addition & 1 deletion cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BUILDPLATFORM=linux/amd64

# Precompile key slow-to-build dependencies
FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS go-deps
FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS go-deps
WORKDIR /linkerd-build
COPY go.mod go.sum ./
RUN go mod download
Expand Down
2 changes: 1 addition & 1 deletion controller/gen/common/net/net.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/linkerd/linkerd2

go 1.24.0
go 1.25.0

require (
contrib.go.opencensus.io/exporter/ocagent v0.7.0
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.88.0"
channel = "1.90.0"
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ spec:
spec:
containers:
- image: ghcr.io/alpeb/family-server:v1
image: golang:1.24-alpine
name: ipfamilies-server
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion viz/metrics-api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BUILDPLATFORM=linux/amd64

# Precompile key slow-to-build dependencies
FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS go-deps
FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS go-deps
WORKDIR /linkerd-build
COPY go.mod go.sum ./
COPY bin/install-deps bin/
Expand Down
2 changes: 1 addition & 1 deletion viz/metrics-api/gen/viz/viz.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion viz/metrics-api/gen/viz/viz_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion viz/tap/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BUILDPLATFORM=linux/amd64

# Precompile key slow-to-build dependencies
FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS go-deps
FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS go-deps
WORKDIR /linkerd-build
COPY go.mod go.sum ./
COPY bin/install-deps bin/
Expand Down
2 changes: 1 addition & 1 deletion viz/tap/gen/tap/viz_tap.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion viz/tap/gen/tap/viz_tap_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BUILDPLATFORM=linux/amd64

# Precompile key slow-to-build dependencies
FROM --platform=$BUILDPLATFORM golang:1.24-alpine AS go-deps
FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS go-deps
WORKDIR /linkerd-build
COPY go.mod go.sum ./
COPY bin/install-deps bin/
Expand Down