public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #119426 from onixie/master

Browse Source 
nixos/kubernetes: allow merging multiple definitions of extraOpts
This commit is contained in:
Silvan Mosberger
2021-05-03 14:32:00 +02:00
committed by GitHub
parent 5a1c84c526 d43f88e3df
commit 1245d855b8
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/cluster/kubernetes/apiserver.nix
View File

@@ -145,7 +145,7 @@ in
extraOpts = mkOption {
description = "Kubernetes apiserver extra command line options.";
default = "";
type = str;
type = separatedString " ";
};
extraSANs = mkOption {

2
nixos/modules/services/cluster/kubernetes/controller-manager.nix
View File

@@ -38,7 +38,7 @@ in
extraOpts = mkOption {
description = "Kubernetes controller manager extra command line options.";
default = "";
type = str;
type = separatedString " ";
};
featureGates = mkOption {

2
nixos/modules/services/cluster/kubernetes/kubelet.nix
View File

@@ -142,7 +142,7 @@ in
extraOpts = mkOption {
description = "Kubernetes kubelet extra command line options.";
default = "";
type = str;
type = separatedString " ";
};
featureGates = mkOption {

2
nixos/modules/services/cluster/kubernetes/proxy.nix
View File

@@ -25,7 +25,7 @@ in
extraOpts = mkOption {
description = "Kubernetes proxy extra command line options.";
default = "";
type = str;
type = separatedString " ";
};
featureGates = mkOption {

2
nixos/modules/services/cluster/kubernetes/scheduler.nix
View File

@@ -21,7 +21,7 @@ in
extraOpts = mkOption {
description = "Kubernetes scheduler extra command line options.";
default = "";
type = str;
type = separatedString " ";
};
featureGates = mkOption {