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.13 backports 2023-03-18 #24441

Merged
merged 4 commits into from
Mar 21, 2023
Merged

Conversation

sayboras
Copy link
Member

@sayboras sayboras commented Mar 18, 2023

Once this PR is merged, you can update the PR labels via:

$ for pr in 24025 24388; do contrib/backporting/set-labels.py $pr done 1.13; done

@sayboras sayboras requested review from a team as code owners March 18, 2023 01:23
@sayboras sayboras added kind/backports This PR provides functionality previously merged into master. backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. labels Mar 18, 2023
@sayboras sayboras requested a review from meyskens March 18, 2023 01:23
@sayboras
Copy link
Member Author

Manual backport these two 2 as there are conflicts

@sayboras sayboras force-pushed the pr/v1.13-backport-2023-03-18 branch from afd27c3 to 4521029 Compare March 18, 2023 02:08
@sayboras sayboras requested a review from a team as a code owner March 18, 2023 02:08
@sayboras sayboras marked this pull request as draft March 18, 2023 02:21
@sayboras sayboras force-pushed the pr/v1.13-backport-2023-03-18 branch 3 times, most recently from 2df62a9 to 3d77502 Compare March 18, 2023 08:27
sayboras and others added 4 commits March 18, 2023 19:41
[ upstream commit 4909b03 ]

Use GHA matrix to avoid repetitive code

Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit f028d7c ]

There is issue with coredns rollout in mentioned github issue, it could
be related on minikube, however, we can just switch to kind clusters for
consistency and faster feedback. As the conformance test is relying on
LB service, metallb installation is added.

Fixes: cilium#23960

Suggested-by: Nicolas Busseneau <nicolas@isovalent.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit c11c9f7 ]

There is issue with coredns rollout in mentioned github issue, it could
be related on minikube, however, we can just switch to kind clusters for
consistency and faster feedback. As the conformance test is relying on
LB service, metallb installation is added.

Fixes: cilium#23960

Suggested-by: Nicolas Busseneau <nicolas@isovalent.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit 166d480 ]

This doubles the timeout that the ingress conformance will wait on
pods becoming ready.
In a kind cluster that has a lot of scheduling going on the 30s timeout
caused flakes by 1 container still being created when it timed out.
The default is 5 minutes in the code, this is still less to fail faster.

Signed-off-by: Maartje Eyskens <maartje.eyskens@isovalent.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras sayboras force-pushed the pr/v1.13-backport-2023-03-18 branch 2 times, most recently from f435f6a to 9031b25 Compare March 18, 2023 08:46
@sayboras sayboras marked this pull request as ready for review March 18, 2023 08:48
@sayboras
Copy link
Member Author

Full CI is not required as the changes are only related to GHA

Copy link
Member

@meyskens meyskens left a comment

Choose a reason for hiding this comment

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

LGTM

@aanm aanm merged commit de0e8d4 into cilium:v1.13 Mar 21, 2023
@sayboras sayboras deleted the pr/v1.13-backport-2023-03-18 branch March 21, 2023 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants