mirror of https://github.com/linkerd/linkerd2.git
build(deps): bump linkerd/dev from v44 to v45 (#13525)
This commit is contained in:
parent
9b146af46a
commit
cf4a456e59
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "linkerd2",
|
||||
"image": "ghcr.io/linkerd/dev:v44",
|
||||
"image": "ghcr.io/linkerd/dev:v45",
|
||||
// "dockerFile": "./Dockerfile",
|
||||
// "context": "..",
|
||||
"features": {
|
||||
|
|
|
@ -5,7 +5,7 @@ runs:
|
|||
steps:
|
||||
- name: Set up Cloud SDK
|
||||
uses: 'google-github-actions/setup-gcloud@e30db14379863a8c79331b04a9969f4c1e225e0b'
|
||||
- uses: linkerd/dev/actions/setup-tools@v44
|
||||
- uses: linkerd/dev/actions/setup-tools@v45
|
||||
- shell: bash
|
||||
run: |
|
||||
mkdir -p target/helm
|
||||
|
|
|
@ -11,7 +11,7 @@ permissions:
|
|||
|
||||
jobs:
|
||||
actionlint:
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
- uses: linkerd/dev/actions/setup-tools@v45
|
||||
|
@ -19,7 +19,7 @@ jobs:
|
|||
- run: just-dev lint-actions
|
||||
|
||||
devcontainer-versions:
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: linkerd/dev/actions/setup-tools@v45
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
|
|
|
@ -11,7 +11,7 @@ permissions:
|
|||
jobs:
|
||||
choco-psscript-lint:
|
||||
timeout-minutes: 10
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- uses: devblackops/github-action-psscriptanalyzer@854038567344559afaaa8ccb7a014452b99d86ee
|
||||
|
|
|
@ -12,7 +12,7 @@ jobs:
|
|||
go:
|
||||
name: Go
|
||||
timeout-minutes: 30
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
container:
|
||||
image: golang:1.23
|
||||
steps:
|
||||
|
@ -27,7 +27,7 @@ jobs:
|
|||
js:
|
||||
name: JS
|
||||
timeout-minutes: 30
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
container:
|
||||
image: node:20-stretch
|
||||
steps:
|
||||
|
@ -48,7 +48,7 @@ jobs:
|
|||
|
||||
rust:
|
||||
name: Rust
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 15
|
||||
container:
|
||||
image: docker://rust:1.83.0
|
||||
|
|
|
@ -22,7 +22,7 @@ on:
|
|||
jobs:
|
||||
analyze:
|
||||
name: Analyze
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
actions: read
|
||||
contents: read
|
||||
|
|
|
@ -14,8 +14,8 @@ permissions:
|
|||
|
||||
jobs:
|
||||
rust-version:
|
||||
runs-on: ubuntu-22.04
|
||||
container: ghcr.io/linkerd/dev:v44-rust
|
||||
runs-on: ubuntu-24.04
|
||||
container: ghcr.io/linkerd/dev:v45-rust
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- shell: bash
|
||||
|
@ -37,7 +37,7 @@ jobs:
|
|||
fi
|
||||
|
||||
devcontainer-image:
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: linkerd/dev/actions/setup-tools@v45
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
|
|
|
@ -6,7 +6,7 @@ permissions:
|
|||
|
||||
jobs:
|
||||
meta:
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- uses: tj-actions/changed-files@d6e91a2266cdb9d62096cebf1e8546899c6aa18f
|
||||
|
@ -28,8 +28,8 @@ jobs:
|
|||
needs: meta
|
||||
if: needs.meta.outputs.changed == 'true'
|
||||
timeout-minutes: 10
|
||||
runs-on: ubuntu-22.04
|
||||
container: ghcr.io/linkerd/dev:v44-go
|
||||
runs-on: ubuntu-24.04
|
||||
container: ghcr.io/linkerd/dev:v45-go
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
|
||||
|
@ -39,8 +39,8 @@ jobs:
|
|||
needs: meta
|
||||
if: needs.meta.outputs.changed == 'true'
|
||||
timeout-minutes: 10
|
||||
runs-on: ubuntu-22.04
|
||||
container: ghcr.io/linkerd/dev:v44-go
|
||||
runs-on: ubuntu-24.04
|
||||
container: ghcr.io/linkerd/dev:v45-go
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
|
||||
|
@ -50,8 +50,8 @@ jobs:
|
|||
needs: meta
|
||||
if: needs.meta.outputs.changed == 'true'
|
||||
timeout-minutes: 10
|
||||
runs-on: ubuntu-22.04
|
||||
container: ghcr.io/linkerd/dev:v44-go
|
||||
runs-on: ubuntu-24.04
|
||||
container: ghcr.io/linkerd/dev:v45-go
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
|
||||
|
@ -63,7 +63,7 @@ jobs:
|
|||
go-test-retry:
|
||||
needs: go-test
|
||||
if: failure() && fromJSON(github.run_attempt) < 3
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
actions: write
|
||||
env:
|
||||
|
@ -77,7 +77,7 @@ jobs:
|
|||
go-ok:
|
||||
needs: [go-lint, go-format, go-test]
|
||||
if: always()
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- name: Results
|
||||
run: |
|
||||
|
|
|
@ -23,7 +23,7 @@ concurrency:
|
|||
|
||||
jobs:
|
||||
meta:
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- id: tag
|
||||
|
@ -52,7 +52,7 @@ jobs:
|
|||
|
||||
info:
|
||||
needs: meta
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 2
|
||||
steps:
|
||||
- name: Info
|
||||
|
@ -63,7 +63,7 @@ jobs:
|
|||
build-cli:
|
||||
needs: meta
|
||||
if: needs.meta.outputs.changed == 'true'
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
|
@ -95,7 +95,7 @@ jobs:
|
|||
build-core:
|
||||
needs: meta
|
||||
if: needs.meta.outputs.changed == 'true'
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
strategy:
|
||||
matrix:
|
||||
component:
|
||||
|
@ -132,7 +132,7 @@ jobs:
|
|||
- cni-calico-deep
|
||||
- deep
|
||||
- deep-native-sidecar
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
|
@ -158,7 +158,7 @@ jobs:
|
|||
test-policy:
|
||||
needs: [meta, build-cli, build-core]
|
||||
if: needs.meta.outputs.changed == 'true'
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 20
|
||||
strategy:
|
||||
matrix:
|
||||
|
@ -218,7 +218,7 @@ jobs:
|
|||
build-ext:
|
||||
needs: meta
|
||||
if: needs.meta.outputs.changed == 'true'
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
strategy:
|
||||
matrix:
|
||||
component:
|
||||
|
@ -259,7 +259,7 @@ jobs:
|
|||
- helm-upgrade
|
||||
- uninstall
|
||||
- upgrade-edge
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
|
@ -284,7 +284,7 @@ jobs:
|
|||
test-viz:
|
||||
needs: [meta, build-cli, build-core, build-ext]
|
||||
if: needs.meta.outputs.changed == 'true'
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 30
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
|
@ -310,7 +310,7 @@ jobs:
|
|||
test-multicluster:
|
||||
needs: [meta, build-cli, build-core, build-ext]
|
||||
if: needs.meta.outputs.changed == 'true'
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 30
|
||||
strategy:
|
||||
matrix:
|
||||
|
@ -358,7 +358,7 @@ jobs:
|
|||
build-ok:
|
||||
needs: [build-cli, build-core, build-ext]
|
||||
if: always()
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- name: Results
|
||||
run: |
|
||||
|
@ -375,7 +375,7 @@ jobs:
|
|||
needs:
|
||||
[build-ok, test-core, test-policy, test-ext, test-viz, test-multicluster]
|
||||
if: failure() && fromJSON(github.run_attempt) < 3 && needs.build-ok.result == 'success'
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
actions: write
|
||||
env:
|
||||
|
@ -390,7 +390,7 @@ jobs:
|
|||
needs:
|
||||
[build-ok, test-core, test-policy, test-ext, test-viz, test-multicluster]
|
||||
if: always()
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- name: Results
|
||||
run: |
|
||||
|
|
|
@ -13,7 +13,7 @@ permissions:
|
|||
jobs:
|
||||
js-web-test:
|
||||
timeout-minutes: 30
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
container:
|
||||
image: node:20-bookworm
|
||||
env:
|
||||
|
|
|
@ -9,7 +9,7 @@ permissions:
|
|||
|
||||
jobs:
|
||||
action:
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771
|
||||
with:
|
||||
|
|
|
@ -12,7 +12,7 @@ on:
|
|||
jobs:
|
||||
markdownlint:
|
||||
timeout-minutes: 5
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- uses: DavidAnson/markdownlint-cli2-action@a23dae216ce3fee4db69da41fed90d2a4af801cf
|
||||
|
|
|
@ -14,8 +14,8 @@ permissions:
|
|||
jobs:
|
||||
proto-diff:
|
||||
timeout-minutes: 10
|
||||
runs-on: ubuntu-22.04
|
||||
container: ghcr.io/linkerd/dev:v44-go
|
||||
runs-on: ubuntu-24.04
|
||||
container: ghcr.io/linkerd/dev:v45-go
|
||||
steps:
|
||||
- run: apt update && apt install -y unzip
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
|
|
|
@ -19,7 +19,7 @@ jobs:
|
|||
# especially the TAG variable. And it would be great to stop relying
|
||||
# on the root-tag script altogether.
|
||||
tag:
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- run: echo "tag=$(CI_FORCE_CLEAN=1 bin/root-tag)" >> "$GITHUB_OUTPUT"
|
||||
|
@ -30,7 +30,7 @@ jobs:
|
|||
docker_build:
|
||||
name: Docker build
|
||||
needs: [tag]
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
id-token: write # needed for signing the images with GitHub OIDC Token
|
||||
strategy:
|
||||
|
@ -124,7 +124,7 @@ jobs:
|
|||
- uninstall
|
||||
- upgrade-edge
|
||||
timeout-minutes: 60
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
|
@ -182,7 +182,7 @@ jobs:
|
|||
# TODO(ver) choco packages are not produced for edge releases...
|
||||
# - choco_pack
|
||||
timeout-minutes: 30
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
|
@ -216,7 +216,7 @@ jobs:
|
|||
needs: [gh_release]
|
||||
if: startsWith(github.ref, 'refs/tags/stable') || startsWith(github.ref, 'refs/tags/edge')
|
||||
timeout-minutes: 30
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
|
@ -232,7 +232,7 @@ jobs:
|
|||
needs: [tag, website_publish]
|
||||
timeout-minutes: 30
|
||||
if: startsWith(github.ref, 'refs/tags/stable') || startsWith(github.ref, 'refs/tags/edge')
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- name: Set install target for stable
|
||||
|
@ -259,7 +259,7 @@ jobs:
|
|||
name: Helm chart deploy
|
||||
needs: [gh_release]
|
||||
timeout-minutes: 30
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
|
|
|
@ -15,7 +15,7 @@ concurrency:
|
|||
|
||||
jobs:
|
||||
rerun:
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 5
|
||||
permissions:
|
||||
actions: write
|
||||
|
|
|
@ -26,7 +26,7 @@ env:
|
|||
jobs:
|
||||
audit:
|
||||
timeout-minutes: 10
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
strategy:
|
||||
matrix:
|
||||
checks:
|
||||
|
@ -42,8 +42,8 @@ jobs:
|
|||
|
||||
fmt:
|
||||
timeout-minutes: 5
|
||||
runs-on: ubuntu-22.04
|
||||
container: ghcr.io/linkerd/dev:v44-rust
|
||||
runs-on: ubuntu-24.04
|
||||
container: ghcr.io/linkerd/dev:v45-rust
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
|
||||
|
@ -51,8 +51,8 @@ jobs:
|
|||
|
||||
clippy:
|
||||
timeout-minutes: 20
|
||||
runs-on: ubuntu-22.04
|
||||
container: ghcr.io/linkerd/dev:v44-rust
|
||||
runs-on: ubuntu-24.04
|
||||
container: ghcr.io/linkerd/dev:v45-rust
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
|
||||
|
@ -62,8 +62,8 @@ jobs:
|
|||
|
||||
check:
|
||||
timeout-minutes: 20
|
||||
runs-on: ubuntu-22.04
|
||||
container: ghcr.io/linkerd/dev:v44-rust
|
||||
runs-on: ubuntu-24.04
|
||||
container: ghcr.io/linkerd/dev:v45-rust
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
|
||||
|
@ -72,9 +72,9 @@ jobs:
|
|||
|
||||
test:
|
||||
name: test
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 15
|
||||
container: ghcr.io/linkerd/dev:v44-rust
|
||||
container: ghcr.io/linkerd/dev:v45-rust
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
|
||||
|
@ -84,7 +84,7 @@ jobs:
|
|||
|
||||
rust-toolchain:
|
||||
name: rust toolchain
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 2
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
|
|
|
@ -14,7 +14,7 @@ jobs:
|
|||
# https://github.com/koalaman/shellcheck/wiki/Checks
|
||||
shellcheck:
|
||||
timeout-minutes: 10
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: linkerd/dev/actions/setup-tools@v45
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
|
|
|
@ -14,7 +14,7 @@ concurrency:
|
|||
|
||||
jobs:
|
||||
meta:
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 5
|
||||
env:
|
||||
GH_REPO: ${{ vars.LINKERD2_PROXY_REPO || 'linkerd/linkerd2-proxy' }}
|
||||
|
@ -59,7 +59,7 @@ jobs:
|
|||
|
||||
changed:
|
||||
needs: meta
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 5
|
||||
env:
|
||||
VERSION: ${{ needs.meta.outputs.name }}
|
||||
|
@ -81,7 +81,7 @@ jobs:
|
|||
sync-proxy:
|
||||
needs: [meta, changed]
|
||||
if: needs.changed.outputs.changed == 'true'
|
||||
runs-on: ubuntu-22.04
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 5
|
||||
permissions:
|
||||
checks: read
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v44-rust-musl AS controller
|
||||
FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v45-rust-musl AS controller
|
||||
ARG BUILD_TYPE="release"
|
||||
WORKDIR /build
|
||||
RUN mkdir -p target/bin
|
||||
|
|
Loading…
Reference in New Issue