Skip to content
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.

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

v1.14 Backports 2024-01-23 #30371

Merged
merged 4 commits into from
Jan 24, 2024
Merged

v1.14 Backports 2024-01-23 #30371

merged 4 commits into from
Jan 24, 2024

Conversation

giorio94
Copy link
Member

@giorio94 giorio94 commented Jan 23, 2024

Backporting ci-verifier fixes to address the failure observed in #30355:

go: errors parsing go.mod:
/host/go.mod:4: invalid go version '1.21.0': must match format 1.23

Once this PR is merged, a GitHub action will update the labels of these PRs:

 27857 27869 29549 29633

[ upstream commit bb3eec4 ]

Currently, the verifier tests are built and run with whatever Go
toolchain version the LVH images ship. To make sure these tests are run
with the same Go toolchain version as the rest of the tests install a
copy of that Go toolchain before running the test.

This wasn't caught in CI on #27820
because the verifier workflow wasn't run passed on the ariane exclusion
list.

Reported-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
[ upstream commit bb4c241 ]

The LVH images don't have GCC, so we need to explicitly disable cgo.
This fixes the following failure:

	# runtime/cgo
	_cgo_export.c:3:10: fatal error: stdlib.h: No such file or directory
	    3 | #include <stdlib.h>
	      |          ^~~~~~~~~~
	compilation terminated.

Fixes: bb3eec4 ("ci: run verifier tests with proper Go toolchain version")

Signed-off-by: Tobias Klauser <tobias@cilium.io>
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
[ upstream commit e263ddf ]

Directly access golang.org/dl to avoid errors such as

> go: golang.org/dl/go1.21.4@latest: module golang.org/dl/go1.21.4: Get "https://proxy.golang.org/golang.org/dl/go1.21.4/@v/list": dial tcp: lookup proxy.golang.org on 127.0.0.53:53: server misbehaving
> Error: Process completed with exit code 1.

Reported-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Tobias Klauser <tobias@cilium.io>
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
@giorio94 giorio94 added kind/backports This PR provides functionality previously merged into master. backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. labels Jan 23, 2024
@giorio94
Copy link
Member Author

/ci-verifier

[ upstream commit 8c82b9e ]

This commit adds a temporary connectivity test to the LVH GitHub
Action command.

This checks whether golang.org is resolvable - and therefore
`systemd-resolved` ready.

This prevents the actual download of Go to fail.

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
@giorio94
Copy link
Member Author

/ci-verifier

@giorio94 giorio94 marked this pull request as ready for review January 23, 2024 09:31
@giorio94 giorio94 requested review from a team as code owners January 23, 2024 09:31
@giorio94 giorio94 mentioned this pull request Jan 23, 2024
11 tasks
Copy link
Member

@mhofstetter mhofstetter left a comment

Choose a reason for hiding this comment

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

Thanks Marco!

Copy link
Member

@tklauser tklauser left a comment

Choose a reason for hiding this comment

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

Thanks Marco!

@giorio94
Copy link
Member Author

The Datapath BPF Complexity (ci-verifier) workflows is green, and reviews are in. Marking as ready to merge

@giorio94 giorio94 added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jan 23, 2024
@giorio94
Copy link
Member Author

/test-backport-1.14

@giorio94
Copy link
Member Author

Conformance AKS and Cilium IPsec upgrade failed, but both are not marked as required. I'd not consider them blocking for merging this PR, given that it only touches another unrelated workflow. In any case, I'll triage them in a while.

@giorio94
Copy link
Member Author

Conformance AKS failed due to hitting the one hour timeout.
Cilium IPsec upgrade hit #27762, #29846, #29987

@julianwiedmann julianwiedmann merged commit be69d86 into v1.14 Jan 24, 2024
220 of 222 checks passed
@julianwiedmann julianwiedmann deleted the pr/v1.14-backport-2024-01-23 branch January 24, 2024 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants