Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1ec18b032cb1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cdacdc068679
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 26, 2018

  1. nixos/kubernetes: allow to disable clusterCidr 

    Fix option type and set --allocate-node-cidr to false if no clusterCidr
is defined.
    @eonpatapon @globin
    eonpatapon authored and globin committed Nov 26, 2018
    Copy the full SHA
    cdacdc0 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 nixos/modules/services/cluster/kubernetes/default.nix
8 changes: 4 additions & 4 deletions nixos/modules/services/cluster/kubernetes/default.nix
View file
Original file line number Diff line number Diff line change
@@ -784,7 +784,7 @@ in {
clusterCidr = mkOption {
description = "Kubernetes controller manager and proxy CIDR Range for Pods in cluster.";
default = "10.1.0.0/16";
type = types.str;
type = types.nullOr types.str;
};

flannel.enable = mkOption {
@@ -1018,9 +1018,9 @@ in {
${if (cfg.controllerManager.rootCaFile!=null)
then "--root-ca-file=${cfg.controllerManager.rootCaFile}"
else "--root-ca-file=/var/run/kubernetes/apiserver.crt"} \
${optionalString (cfg.clusterCidr!=null)
"--cluster-cidr=${cfg.clusterCidr}"} \
--allocate-node-cidrs=true \
${if (cfg.clusterCidr!=null)
then "--cluster-cidr=${cfg.clusterCidr} --allocate-node-cidrs=true"
else "--allocate-node-cidrs=false"} \
${optionalString (cfg.controllerManager.featureGates != [])
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.controllerManager.featureGates}"} \
${optionalString cfg.verbose "--v=6"} \