v1.13 Backports 2023-08-03 #27239
Merged
v1.13 Backports 2023-08-03 #27239
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ upstream commit fded1ab ] We want to block any configurations that enable ingress controllers when using delegated IPAM. Cilium allocates its own IP address for sending and differentiating ingress traffic, which is not possible with delegated IPAM. This change will provide a clearer error message for this. Signed-off-by: Ricky Ho <horicky78@gmail.com> Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit 685439c ] We recently added a call to "sed" in Documentation's Makefile, as part of the generation process for the Helm reference. We use the "-i" option to edit the file in-place; but this option is not portable, and the command fails when running BSD versions of sed, for example on MacOS, as opposed to GNU sed. We have two options to fix this: using $(SED), which is set to gsed when available, and using an additional temporary file. Let's use both to have the Makefile as portable as possible. Fixes: 2e9b20f ("docs: Ignore Helm value names for spellcheck") Reported-by: Liz Rice <liz@lizrice.com> Signed-off-by: Quentin Monnet <quentin@isovalent.com> Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit 6f19a80 ] Adds docs for changing IPAM mode and cluster pool CIDR settings. Signed-off-by: darox <maderdario@gmail.com> Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit f50c51a ] Co-authored-by: ZSC <zacharysarah@users.noreply.github.com> Signed-off-by: Dario Mader <maderdario@gmail.com>
[ upstream commit 953b26f ] Co-authored-by: Joe Stringer <joestringernz@gmail.com> Signed-off-by: Dario Mader <maderdario@gmail.com>
[ upstream commit 8f4c98b ] The use of a /9 here as an example instead of the /8 was confusing various users. Reuse the /8 instead. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras
added
kind/backports
qmonnet
approved these changes
Aug 3, 2023
|
/test-backport-1.13 |
joestringer
approved these changes
Aug 3, 2023
|
Most of the reviews are in, CIs are all good, marking this ready to merge. |
sayboras
added
the
ready-to-merge
dylandreimerink
approved these changes
Aug 4, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Once this PR is merged, you can update the PR labels via:
or with