v1.8 backports 2020-10-08 #13459
Merged
v1.8 backports 2020-10-08 #13459
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 2c759a2 ] The operator is involved in various IPAM modes, a more specific name for the ClusterPool mode makes the code more readable. [ Backport note: Do _not_ rename ipamOption.IPAMHostScopeLegacy, which remains the default on v1.8, and has only be replaced with ipamOption.IPAMOperator for v1.9 with commit 175bd96 ("cleanup/ipam: Remove hostscope-legacy IPAM option") ] Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit dff42c6 ] Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit d292904 ] This help detect instances when creating or updating the resource is delayed or hangs. It also helps validate the correct behavior of the cluster-pool IPAM implementation. Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit d011b3b ] The function has grown and supports both CiliumNode and Kubernetes Node and thus the original name is misleading at this point. Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 3af54a1 ] When using ClusterPool IPAM, the reference to Kubernetes node is misleading to users. Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 17aabf4 ] There is no need to require special Helm logic to set `k8s-require-ipv4-pod-cidr` correctly in combination with `ipam: cluster-pool`. The existing `enable-ipv4` and `enable-ipv6` options are more user friendly and ensure that cluster-pool also functions properly without Helm. Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 71a6094 ] Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 96ca106 ] Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit e613b59 ] Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit c3d8ca0 ] Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
… set [ upstream commit 5ce94ef ] The existing logic reported an error if both IPv4 and IPv6 CIDRs were not provided. This is insufficient when both IPv4 and IPv6 are enabled but only an IPv4 ClusterPool CIDR is specified. It lead to a situation where agents won't start up while waiting for the CiliumNode to to provide an IPv6 address. Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit ca601cd ] Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
[ upstream commit 9d08cc6 ] Rearrange the flags in the CLI and command output alphabetically, and fix a spelling error in the README. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Quentin Monnet <quentin@isovalent.com>
qmonnet
added
backport/1.8
kind/backports
|
test-backport-1.8 |
joestringer
approved these changes
Oct 8, 2020
There was a problem hiding this comment.
My commits look good. I did not review the clusterpool IPAM changes, probably makes sense to make sure @tgraf takes a look before merging.
|
test-1.18-4.9 |
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.
ipam: Rename IPAMOperator to IPAMClusterPool).This is due to
ipamOption.IPAMHostScopeLegacystill being present in v1.8, it is replaced for v1.9 only withipamOption.IPAMOperator(commit 175bd96 from cleanup/ipam: Remove hostscope-legacy IPAM option #12984).Fixed by not renaming
ipamOption.IPAMHostScopeLegacy, which remains the default IPAM module on this branch.Once this PR is merged, you can update the PR labels via: