diff options
| author | Yc.Shen <onixie@gmail.com> | 2021-04-13 21:54:53 +0900 |
|---|---|---|
| committer | Yc.Shen <onixie@gmail.com> | 2021-04-13 21:54:53 +0900 |
| commit | d43f88e3df1c5f686ec24947571ff29d2a6efbcf (patch) | |
| tree | 4068d98c0cbf52c5776541e1419928d8d476b812 | |
| parent | c7695f95d92067646c7cbfcd16dc795cd93475fe (diff) | |
| download | nixpkgs-d43f88e3df1c5f686ec24947571ff29d2a6efbcf.tar nixpkgs-d43f88e3df1c5f686ec24947571ff29d2a6efbcf.tar.gz nixpkgs-d43f88e3df1c5f686ec24947571ff29d2a6efbcf.tar.bz2 nixpkgs-d43f88e3df1c5f686ec24947571ff29d2a6efbcf.tar.lz nixpkgs-d43f88e3df1c5f686ec24947571ff29d2a6efbcf.tar.xz nixpkgs-d43f88e3df1c5f686ec24947571ff29d2a6efbcf.tar.zst nixpkgs-d43f88e3df1c5f686ec24947571ff29d2a6efbcf.zip | |
nixos/kubernetes: allow merging multiple definitions of extraOpts
5 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix index a5b13215476..f1531caa754 100644 --- a/nixos/modules/services/cluster/kubernetes/apiserver.nix +++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -145,7 +145,7 @@ in extraOpts = mkOption { description = "Kubernetes apiserver extra command line options."; default = ""; - type = str; + type = separatedString " "; }; extraSANs = mkOption { diff --git a/nixos/modules/services/cluster/kubernetes/controller-manager.nix b/nixos/modules/services/cluster/kubernetes/controller-manager.nix index a99ef6640e9..0c81fa9ae49 100644 --- a/nixos/modules/services/cluster/kubernetes/controller-manager.nix +++ b/nixos/modules/services/cluster/kubernetes/controller-manager.nix @@ -38,7 +38,7 @@ in extraOpts = mkOption { description = "Kubernetes controller manager extra command line options."; default = ""; - type = str; + type = separatedString " "; }; featureGates = mkOption { diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index b5346b1cd44..a428a60800c 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -142,7 +142,7 @@ in extraOpts = mkOption { description = "Kubernetes kubelet extra command line options."; default = ""; - type = str; + type = separatedString " "; }; featureGates = mkOption { diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixos/modules/services/cluster/kubernetes/proxy.nix index 86d1dc2439b..7aa449f9aa2 100644 --- a/nixos/modules/services/cluster/kubernetes/proxy.nix +++ b/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -25,7 +25,7 @@ in extraOpts = mkOption { description = "Kubernetes proxy extra command line options."; default = ""; - type = str; + type = separatedString " "; }; featureGates = mkOption { diff --git a/nixos/modules/services/cluster/kubernetes/scheduler.nix b/nixos/modules/services/cluster/kubernetes/scheduler.nix index 5f6113227d9..454c689759d 100644 --- a/nixos/modules/services/cluster/kubernetes/scheduler.nix +++ b/nixos/modules/services/cluster/kubernetes/scheduler.nix @@ -21,7 +21,7 @@ in extraOpts = mkOption { description = "Kubernetes scheduler extra command line options."; default = ""; - type = str; + type = separatedString " "; }; featureGates = mkOption { |