Skip to content

Conversation

tgraf
Copy link
Member

@tgraf tgraf commented Mar 2, 2020

This change is Reviewable

@tgraf tgraf added the release-note/major This PR introduces major new functionality to Cilium. label Mar 2, 2020
@tgraf tgraf requested a review from a team March 2, 2020 12:27
@tgraf tgraf requested review from a team as code owners March 2, 2020 12:27
Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

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

Also, shouldn't we add something in the upgrade guide with regarding the default value of the ipam option?

@tgraf
Copy link
Member Author

tgraf commented Mar 2, 2020

Also, shouldn't we add something in the upgrade guide with regarding the default value of the ipam option?

Does anything change for the user? This should be invisible except for the help text and the logfile which now documents that the legacy hostscope is in use.

@tgraf tgraf force-pushed the pr/tgraf/kubernetes-ipam branch from 5e4726f to 156324c Compare March 2, 2020 13:47
@coveralls
Copy link

coveralls commented Mar 2, 2020

Coverage Status

Coverage increased (+0.007%) to 45.641% when pulling e79a9e4 on pr/tgraf/kubernetes-ipam into 23b165c on master.

@tgraf
Copy link
Member Author

tgraf commented Mar 2, 2020

test-me-please

@tgraf tgraf requested a review from aanm March 2, 2020 19:19
@aanm aanm added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Mar 3, 2020
@tgraf tgraf force-pushed the pr/tgraf/kubernetes-ipam branch from 156324c to e7f479e Compare March 4, 2020 10:04
tgraf added 3 commits March 4, 2020 11:04
In order to test different IPAM modes easily in the future, remove direct
access to option.Config in order to allow mocking the configuration interface.

Signed-off-by: Thomas Graf <thomas@cilium.io>
Explicitly set the current default IPAM mode in the viper option. This enables
introduction of a better default.

Signed-off-by: Thomas Graf <thomas@cilium.io>
This documents an IPAM mode which was already supported and widely used but
difficult to discover. The new "kubernete" IPAM mode requires the PodCIDR for
all enabled address families to be provided via the k8s Node resource and then
uses the standard hostscope allocator.

Signed-off-by: Thomas Graf <thomas@cilium.io>
@tgraf tgraf force-pushed the pr/tgraf/kubernetes-ipam branch from e7f479e to e79a9e4 Compare March 4, 2020 10:05
@tgraf
Copy link
Member Author

tgraf commented Mar 4, 2020

test-me-please

@tgraf tgraf removed the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Mar 4, 2020
@tgraf tgraf merged commit ced4ad0 into master Mar 4, 2020
@tgraf tgraf deleted the pr/tgraf/kubernetes-ipam branch March 4, 2020 12:24
tklauser added a commit that referenced this pull request Mar 4, 2020
This was introduced by #10407 and makes the spell checker fail.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
tgraf pushed a commit that referenced this pull request Mar 4, 2020
This was introduced by #10407 and makes the spell checker fail.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/major This PR introduces major new functionality to Cilium.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants