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

kubernetes: fix breakage introduced by upgrade to 1.22

Browse Source
This commit is contained in:
Alexandru Scvortov
2021-08-13 17:42:27 +01:00
parent e67c07f098
commit 6c38bb6d5d
4 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,12 +190,6 @@ in
type = nullOr path;
};
kubeletHttps = mkOption {
description = "Whether to use https for connections to kubelet.";
default = true;
type = bool;
};
preferredAddressTypes = mkOption {
description = "List of the preferred NodeAddressTypes to use for kubelet connections.";
type = nullOr str;
@@ -365,7 +359,6 @@ in
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
${optionalString (cfg.basicAuthFile != null)
"--basic-auth-file=${cfg.basicAuthFile}"} \
--kubelet-https=${boolToString cfg.kubeletHttps} \
${optionalString (cfg.kubeletClientCaFile != null)
"--kubelet-certificate-authority=${cfg.kubeletClientCaFile}"} \
${optionalString (cfg.kubeletClientCertFile != null)