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:v46",
"image": "ghcr.io/linkerd/dev:v47",
// "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@6a7c903a70c8625ed6700fa299f5ddb4ca6022e9'
- uses: linkerd/dev/actions/setup-tools@v46
- uses: linkerd/dev/actions/setup-tools@v47
- 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@v46
- uses: linkerd/dev/actions/setup-tools@v47
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just-dev lint-actions

devcontainer-versions:
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
steps:
- uses: linkerd/dev/actions/setup-tools@v46
- uses: linkerd/dev/actions/setup-tools@v47
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just-dev check-action-images
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:v46-rust
container: ghcr.io/linkerd/dev:v47-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- 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@v46
- uses: linkerd/dev/actions/setup-tools@v47
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- 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:v46-go
container: ghcr.io/linkerd/dev:v47-go
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- 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:v46-go
container: ghcr.io/linkerd/dev:v47-go
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- 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:v46-go
container: ghcr.io/linkerd/dev:v47-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/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:v46-go
container: ghcr.io/linkerd/dev:v47-go
steps:
- run: apt update && apt install -y unzip
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
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:v46-rust
container: ghcr.io/linkerd/dev:v47-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:v46-rust
container: ghcr.io/linkerd/dev:v47-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- 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:v46-rust
container: ghcr.io/linkerd/dev:v47-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- 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:v46-rust
container: ghcr.io/linkerd/dev:v47-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- 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:v46-rust
container: ghcr.io/linkerd/dev:v47-rust
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/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@v46
- uses: linkerd/dev/actions/setup-tools@v47
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just sh-lint
5 changes: 3 additions & 2 deletions policy-controller/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v46-rust-musl AS controller
FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v47-rust-musl AS controller
ARG BUILD_TYPE="release"
WORKDIR /build
RUN mkdir -p target/bin
COPY Cargo.toml Cargo.lock .
COPY policy-controller policy-controller
RUN cargo new policy-test --lib
ENV CARGO="cargo auditable"
RUN --mount=type=cache,target=/usr/local/cargo/registry \
cargo fetch
just-cargo fetch
ARG TARGETARCH
# Enable tokio runtime metrics
ENV RUSTFLAGS="--cfg tokio_unstable"
Expand Down