Skip to content

Conversation

joamaki
Copy link
Contributor

@joamaki joamaki commented May 30, 2024

Fixed minor conflict in #32725 due to filename renames. Diff looks the same.

With #32654 there were some lines in the diff that did not exist in v1.14 version of conformance-clustermesh.yaml,
so fixed up manually. Please double-check that this patch makes sense for v1.14.

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

 32654 32725 32746

giorio94 and others added 4 commits May 30, 2024 10:13
[ upstream commit 7afb7c6 ]

Make sure to test all the three supported certificate generation methods
(i.e., helm, cronJob and certmanager) to prevent possible regressions
affecting only one of them.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
[ upstream commit 6a014ff ]

This aids in troubleshooting, as the list of ports is not visible
anywhere else in the sysdump.

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
Signed-off-by: Jussi Maki <jussi@isovalent.com>
[ upstream commit 76ecb4b ]

This fixes a bug where the port reservation of ports which can conflict
with transparent DNS proxy where only reserved if IPv6 was enabled.

The call to `reserveLocalIPPorts` was accidentally added in the
"IPv6-only" branch. This commit fixes that by unconditionally
reserving local ports.

Fixes: 11fe7cc ("cilium-cni: Reserve ports that can conflict with transparent DNS proxy")

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 4cda262 ]

In the latest state, lint-build-commits takes over 90min. While it is
not desirable to take many time, bump it to 180min as a workaround.

Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
Signed-off-by: Jussi Maki <jussi@isovalent.com>
@joamaki joamaki 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 May 30, 2024
@joamaki
Copy link
Contributor Author

joamaki commented May 30, 2024

/test-backport-1.14

Copy link
Member

@giorio94 giorio94 left a comment

Choose a reason for hiding this comment

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

My commit look good, thanks!

@joamaki joamaki marked this pull request as ready for review May 30, 2024 12:14
@joamaki joamaki requested review from a team as code owners May 30, 2024 12:14
@joamaki joamaki requested review from aanm and nebril and removed request for gandro May 30, 2024 12:14
@joamaki joamaki merged commit 738ead6 into v1.14 May 31, 2024
@joamaki joamaki deleted the pr/v1.14-backport-2024-05-30-10-09 branch May 31, 2024 10:18
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.
Projects
No open projects
Status: Released
Development

Successfully merging this pull request may close these issues.

6 participants