Skip to content

Commit 17f47bd

Browse files
olix0rolix0r
authored
chore(ci): enable overriding the runner in workflows (#14256)
We use the ubuntu-24.04 runner by default, but in forks this may not be appropriate. This change updates the runners to support overriding via the LINKERD2_RUNNER variable.
1 parent 26755d2 commit 17f47bd

File tree

15 files changed

+49
-49
lines changed

15 files changed

+49
-49
lines changed

‎.github/workflows/actions.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ permissions:
1111

1212
jobs:
1313
actionlint:
14-
runs-on: ubuntu-24.04
14+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
1515
timeout-minutes: 10
1616
steps:
1717
- uses: linkerd/dev/actions/setup-tools@v46
1818
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1919
- run: just-dev lint-actions
2020

2121
devcontainer-versions:
22-
runs-on: ubuntu-24.04
22+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
2323
steps:
2424
- uses: linkerd/dev/actions/setup-tools@v46
2525
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

‎.github/workflows/codecov.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
go:
1313
name: Go
1414
timeout-minutes: 30
15-
runs-on: ubuntu-24.04
15+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
1616
container:
1717
image: golang:1.24
1818
steps:
@@ -27,7 +27,7 @@ jobs:
2727
js:
2828
name: JS
2929
timeout-minutes: 30
30-
runs-on: ubuntu-24.04
30+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
3131
container:
3232
image: node:20-stretch
3333
steps:
@@ -48,7 +48,7 @@ jobs:
4848

4949
rust:
5050
name: Rust
51-
runs-on: ubuntu-24.04
51+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
5252
timeout-minutes: 15
5353
container:
5454
image: docker://rust:1.88.0

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
jobs:
2323
analyze:
2424
name: Analyze
25-
runs-on: ubuntu-24.04
25+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
2626
permissions:
2727
actions: read
2828
contents: read

‎.github/workflows/devcontainer.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414

1515
jobs:
1616
rust-version:
17-
runs-on: ubuntu-24.04
17+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
1818
container: ghcr.io/linkerd/dev:v46-rust
1919
steps:
2020
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -37,7 +37,7 @@ jobs:
3737
fi
3838
3939
devcontainer-image:
40-
runs-on: ubuntu-24.04
40+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
4141
steps:
4242
- uses: linkerd/dev/actions/setup-tools@v46
4343
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

‎.github/workflows/go.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ permissions:
66

77
jobs:
88
meta:
9-
runs-on: ubuntu-24.04
9+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
1010
steps:
1111
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1212
- uses: tj-actions/changed-files@055970845dd036d7345da7399b7e89f2e10f2b04
@@ -28,7 +28,7 @@ jobs:
2828
needs: meta
2929
if: needs.meta.outputs.changed == 'true'
3030
timeout-minutes: 10
31-
runs-on: ubuntu-24.04
31+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
3232
container: ghcr.io/linkerd/dev:v46-go
3333
steps:
3434
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -39,7 +39,7 @@ jobs:
3939
needs: meta
4040
if: needs.meta.outputs.changed == 'true'
4141
timeout-minutes: 10
42-
runs-on: ubuntu-24.04
42+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
4343
container: ghcr.io/linkerd/dev:v46-go
4444
steps:
4545
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -50,7 +50,7 @@ jobs:
5050
needs: meta
5151
if: needs.meta.outputs.changed == 'true'
5252
timeout-minutes: 30
53-
runs-on: ubuntu-24.04
53+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
5454
container: ghcr.io/linkerd/dev:v46-go
5555
steps:
5656
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -63,7 +63,7 @@ jobs:
6363
go-test-retry:
6464
needs: go-test
6565
if: failure() && fromJSON(github.run_attempt) < 3
66-
runs-on: ubuntu-24.04
66+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
6767
permissions:
6868
actions: write
6969
env:
@@ -77,7 +77,7 @@ jobs:
7777
go-ok:
7878
needs: [go-lint, go-format, go-test]
7979
if: always()
80-
runs-on: ubuntu-24.04
80+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
8181
steps:
8282
- name: Results
8383
run: |

‎.github/workflows/integration.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ concurrency:
2424

2525
jobs:
2626
meta:
27-
runs-on: ubuntu-24.04
27+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
2828
steps:
2929
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3030
- id: tag
@@ -54,7 +54,7 @@ jobs:
5454

5555
info:
5656
needs: meta
57-
runs-on: ubuntu-24.04
57+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
5858
timeout-minutes: 2
5959
steps:
6060
- name: Info
@@ -65,7 +65,7 @@ jobs:
6565
build-cli:
6666
needs: meta
6767
if: needs.meta.outputs.changed == 'true'
68-
runs-on: ubuntu-24.04
68+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
6969
timeout-minutes: 15
7070
steps:
7171
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -97,7 +97,7 @@ jobs:
9797
build-core:
9898
needs: meta
9999
if: needs.meta.outputs.changed == 'true'
100-
runs-on: ubuntu-24.04
100+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
101101
strategy:
102102
matrix:
103103
component:
@@ -134,7 +134,7 @@ jobs:
134134
- cni-calico-deep
135135
- deep
136136
- deep-native-sidecar
137-
runs-on: ubuntu-24.04
137+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
138138
timeout-minutes: 15
139139
steps:
140140
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -160,7 +160,7 @@ jobs:
160160
test-policy:
161161
needs: [meta, build-cli, build-core]
162162
if: needs.meta.outputs.changed == 'true'
163-
runs-on: ubuntu-24.04
163+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
164164
timeout-minutes: 20
165165
strategy:
166166
matrix:
@@ -239,7 +239,7 @@ jobs:
239239
build-ext:
240240
needs: meta
241241
if: needs.meta.outputs.changed == 'true'
242-
runs-on: ubuntu-24.04
242+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
243243
strategy:
244244
matrix:
245245
component:
@@ -280,7 +280,7 @@ jobs:
280280
- helm-upgrade
281281
- uninstall
282282
- upgrade-edge
283-
runs-on: ubuntu-24.04
283+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
284284
timeout-minutes: 15
285285
steps:
286286
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -307,7 +307,7 @@ jobs:
307307
test-viz:
308308
needs: [meta, build-cli, build-core, build-ext]
309309
if: needs.meta.outputs.changed == 'true'
310-
runs-on: ubuntu-24.04
310+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
311311
timeout-minutes: 30
312312
steps:
313313
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -333,7 +333,7 @@ jobs:
333333
test-multicluster:
334334
needs: [meta, build-cli, build-core, build-ext]
335335
if: needs.meta.outputs.changed == 'true'
336-
runs-on: ubuntu-24.04
336+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
337337
timeout-minutes: 30
338338
strategy:
339339
matrix:
@@ -383,7 +383,7 @@ jobs:
383383
build-ok:
384384
needs: [build-cli, build-core, build-ext]
385385
if: always()
386-
runs-on: ubuntu-24.04
386+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
387387
steps:
388388
- name: Results
389389
run: |
@@ -400,7 +400,7 @@ jobs:
400400
needs:
401401
[build-ok, test-core, test-policy, test-ext, test-viz, test-multicluster]
402402
if: failure() && fromJSON(github.run_attempt) < 3 && needs.build-ok.result == 'success'
403-
runs-on: ubuntu-24.04
403+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
404404
permissions:
405405
actions: write
406406
env:
@@ -415,7 +415,7 @@ jobs:
415415
needs:
416416
[build-ok, test-core, test-policy, test-ext, test-viz, test-multicluster]
417417
if: always()
418-
runs-on: ubuntu-24.04
418+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
419419
steps:
420420
- name: Results
421421
run: |

‎.github/workflows/js.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313
jobs:
1414
js-web-test:
1515
timeout-minutes: 30
16-
runs-on: ubuntu-24.04
16+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
1717
container:
1818
image: node:20-bookworm
1919
env:

‎.github/workflows/lock.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99

1010
jobs:
1111
action:
12-
runs-on: ubuntu-24.04
12+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
1313
steps:
1414
- uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771
1515
with:

‎.github/workflows/markdown.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
markdownlint:
1414
timeout-minutes: 5
15-
runs-on: ubuntu-24.04
15+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
1616
steps:
1717
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1818
- uses: DavidAnson/markdownlint-cli2-action@992badcdf24e3b8eb7e87ff9287fe931bcb00c6e

‎.github/workflows/proto.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414
jobs:
1515
proto-diff:
1616
timeout-minutes: 10
17-
runs-on: ubuntu-24.04
17+
runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
1818
container: ghcr.io/linkerd/dev:v46-go
1919
steps:
2020
- run: apt update && apt install -y unzip

0 commit comments

Comments
 (0)