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 2023-07-25 #27055

Merged
merged 4 commits into from Jul 25, 2023
Merged

v1.14 Backports 2023-07-25 #27055

merged 4 commits into from Jul 25, 2023

Conversation

nbusseneau
Copy link
Member

@nbusseneau nbusseneau commented Jul 25, 2023

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

for pr in 27005 26950 26967 27039; do contrib/backporting/set-labels.py $pr done 1.14; done

or with

make add-labels BRANCH=v1.14 ISSUES=27005,26950,26967,27039

ldelossa and others added 4 commits July 25, 2023 14:38
[ upstream commit 6d6d1eb ]

As a suggested follow up, further clarify that the MetalLB based BGP
control plane is being deprecated.

Signed-off-by: Louis DeLosSantos <louis.delos@isovalent.com>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 33c2726 ]

Make it clear that this option applies to iptables-driven masquerading,
not BPF-driven masquerading.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit f9198a0 ]

- Updates the nginx image that includes curl.
- Adds a step to test connectivity by curl'ing between pods.
- Adds a reference to #26966

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
[ upstream commit 4863f81 ]

In the example policy for l2-announcements, the example was using a
label selector that said: `role: worker`. While it is possible to add
such a label, most people will not do that and want to rely on the
existing `node-role.kubernetes.io/<role>` labels added by kubeadm and
similar tools.

If an inexperienced user copies and pastes our example without modifying
the node label selector, it will likely not work. This commit updates
the example to be more realistic.

Signed-off-by: Dylan Reimerink <dylan.reimerink@isovalent.com>
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
@nbusseneau nbusseneau 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 Jul 25, 2023
@nbusseneau nbusseneau marked this pull request as ready for review July 25, 2023 14:41
@nbusseneau nbusseneau requested a review from a team as a code owner July 25, 2023 14:42
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Acking the multi-pool changes

@gandro gandro removed the request for review from danehans July 25, 2023 14:43
@nbusseneau
Copy link
Member Author

nbusseneau commented Jul 25, 2023

This quick backport round was fast-tracked in preparation for the 1.14 release, it only makes changes to the documentation and helper strings, so we do not need to run any additional CI for this one.

@nbusseneau
Copy link
Member Author

nbusseneau commented Jul 25, 2023

Documentation CI and Helm checks CI passed. This has got to be the fastest backport round in the history of backport rounds, maybe ever. Marking as ready-to-merge.

@nbusseneau nbusseneau added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jul 25, 2023
@joestringer joestringer merged commit 58a40d8 into v1.14 Jul 25, 2023
54 checks passed
@joestringer joestringer deleted the pr/v1.14-backport-2023-07-25 branch July 25, 2023 21:30
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

7 participants