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.

Sign up for GitHub

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

Jump to bottom

nixos/kubernetes: allow to disable clusterCidr #51061

Merged
merged 1 commit into from
Nov 26, 2018
Merged

nixos/kubernetes: allow to disable clusterCidr #51061

merged 1 commit into from
Nov 26, 2018
+4 −4

Conversation

eonpatapon
Copy link
Contributor

Fix option type and set --allocate-node-cidr to false if no clusterCidr
is defined.

Motivation for this change

Using calico we don't need k8s to allocate cidr, it is all done by calico.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@GrahamcOfBorg GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Nov 26, 2018
nlewo
nlewo previously requested changes Nov 26, 2018
View reviewed changes
Copy link
Member

@nlewo nlewo left a comment

Choose a reason for hiding this comment

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

Otherwise, +1 on this change.

@eonpatapon
nixos/kubernetes: allow to disable clusterCidr

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Learn about vigilant mode
8264f23 
Fix option type and set --allocate-node-cidr to false if no clusterCidr
is defined.
@globin globin merged commit cdacdc0 into NixOS:master Nov 26, 2018
@eonpatapon eonpatapon deleted the k8s-cluster-cidr branch November 26, 2018 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@globin globin

@nlewo nlewo

@infinisil infinisil

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@eonpatapon @globin @nlewo @GrahamcOfBorg