Skip to content

test(deps): use setup-rust in cni-plugin-integration/repair-controller #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 20, 2025
Merged

test(deps): use setup-rust in cni-plugin-integration/repair-controller #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31c0020
test(deps): use setup-rust in cni-plugin-integration/repair-controller
alpeb Feb 18, 2025
256e1bc
Add .github/workflows/release-cni-plugin.yml to workflow's path triggers
alpeb Feb 18, 2025
7d4783d
Still requires setup-tools anyways
alpeb Feb 18, 2025
c2ddcc6
ubuntu-22.04
alpeb Feb 18, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ permissions:

jobs:
actionlint:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- uses: linkerd/dev/actions/setup-tools@v45
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: just action-lint

devcontainer-versions:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: linkerd/dev/actions/setup-tools@v45
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/cni-plugin-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
workflow_dispatch:
pull_request:
paths:
- .github/workflows/cni-plugin-integration.yml
- Dockerfile-cni-plugin
- cni-plugin/integration/flannel/Dockerfile-tester
- cni-plugin/integration/run.sh
Expand All @@ -18,7 +19,7 @@ jobs:
cni: [flannel, calico, cilium]
iptables-mode: [legacy, nft]
timeout-minutes: 15
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: linkerd/dev/actions/setup-tools@v45
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand All @@ -29,16 +30,17 @@ jobs:
ordering-test:
continue-on-error: true
timeout-minutes: 15
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: linkerd/dev/actions/setup-tools@v45
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- name: Run CNI ordering tests
run: just cni-plugin-test-ordering
repair-controller:
timeout-minutes: 15
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can use 24.04 if we're using v45?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately not. I've tried merging here my branch from #483 and using ubuntu-24.04, and it fails with the unhelpful message

error: could not compile `linkerd-cni-repair-controller` (bin "linkerd-cni-repair-controller") due to 1 previous error

https://github.com/linkerd/linkerd2-proxy-init/actions/runs/13414955803/job/37473425884?pr=484

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok it seems fine to me... but I'm worried that we're hiding a problem that will come back to bite us.

The underlying issue is:

   Compiling linkerd-cni-repair-controller v0.1.0 (/home/runner/work/linkerd2-proxy-init/linkerd2-proxy-init/cni-repair-controller)
   Compiling linkerd-network-validator v0.1.2 (/home/runner/work/linkerd2-proxy-init/linkerd2-proxy-init/validator)
error: linking with `cc` failed: exit status: 1
  |
  = note: /usr/bin/ld: /home/runner/work/linkerd2-proxy-init/linkerd2-proxy-init/target/x86_64-unknown-linux-musl/debug/deps/libopenssl_sys-445faf95f9f4260c.rlib(libdefault-lib-rand_unix.o): in function `atoi':
          /usr/include/stdlib.h:483:(.text.ossl_pool_acquire_entropy+0x15a): undefined reference to `__isoc23_strtol'
          /usr/bin/ld: /usr/include/stdlib.h:483:(.text.ossl_pool_acquire_entropy+0x181): undefined reference to `__isoc23_strtol'
          collect2: error: ld returned 1 exit status
          
  = note: some `extern` functions couldn't be found; some native libraries may need to be installed or have their path specified
  = note: use the `-l` flag to specify native libraries to link

I suspect that we're going to need to resolve this sooner than later, but I don't think we have to block CNI changes on that.

In that case, we probably want to pin all of this repos's action usage to usage 22.04 to maintain consistency.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried with other compiler tweaks but no luck. So I've pinned all the actions to ubuntu-22.04, and this PR should be ready to go.

steps:
- uses: linkerd/dev/actions/setup-rust@v45
- uses: linkerd/dev/actions/setup-tools@v45
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- name: Run repair-controller tests
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ permissions:

jobs:
lint:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v44-go
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
- run: just go-lint --verbose --timeout=10m

fmt:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v44-go
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- run: git config --global --add safe.directory "$PWD" # actions/runner#2033
- run: just go-fmt-check

unit-test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v44-go
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
proxy-init-integration:
timeout-minutes: 15
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: linkerd/dev/actions/setup-tools@v45
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/markdown.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
md-lint:
timeout-minutes: 5
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: DavidAnson/markdownlint-cli2-action@05f32210e84442804257b2a6f20b273450ec8265
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-cni-plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:
jobs:
meta:
timeout-minutes: 3
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- id: meta
Expand All @@ -27,7 +27,7 @@ jobs:

docker-publish:
needs: meta
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 25
permissions:
id-token: write # needed for signing the images with GitHub OIDC token
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
timeout-minutes: 5
permissions:
contents: write
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- if: needs.meta.outputs.mode == 'release'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-proxy-init.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:
jobs:
meta:
timeout-minutes: 3
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: ./.github/actions/version-mode
Expand All @@ -27,7 +27,7 @@ jobs:

docker-publish:
needs: meta
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 10
permissions:
id-token: write # needed for signing the images with GitHub OIDC token
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
timeout-minutes: 5
permissions:
contents: write
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- if: needs.meta.outputs.mode == 'release'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-validator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:
jobs:
meta:
timeout-minutes: 15
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v44-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand All @@ -33,7 +33,7 @@ jobs:
matrix:
arch: [amd64, arm64, arm]
timeout-minutes: 10
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v44-rust-musl
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand All @@ -48,7 +48,7 @@ jobs:
timeout-minutes: 5
permissions:
contents: write
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
check:
timeout-minutes: 5
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container: ghcr.io/linkerd/dev:v44-rust
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand All @@ -25,7 +25,7 @@ jobs:

audit:
timeout-minutes: 5
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
checks:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
sh-lint:
timeout-minutes: 5
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: linkerd/dev/actions/setup-tools@v45
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand Down
Loading