diff options
| author | Alexandru Scvortov <code@scvalex.net> | 2021-08-13 17:42:27 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <code@scvalex.net> | 2021-08-13 17:55:03 +0100 |
| commit | 6c38bb6d5d34b53bd98cfa6936a1d56c43368782 (patch) | |
| tree | 30bd770a71eb6d1915f70d0a4ce10afb326a7db1 /nixos/modules/services/cluster | |
| parent | e67c07f09824c3e57c2b4db9e36cd446d099241a (diff) | |
| download | nixpkgs-6c38bb6d5d34b53bd98cfa6936a1d56c43368782.tar nixpkgs-6c38bb6d5d34b53bd98cfa6936a1d56c43368782.tar.gz nixpkgs-6c38bb6d5d34b53bd98cfa6936a1d56c43368782.tar.bz2 nixpkgs-6c38bb6d5d34b53bd98cfa6936a1d56c43368782.tar.lz nixpkgs-6c38bb6d5d34b53bd98cfa6936a1d56c43368782.tar.xz nixpkgs-6c38bb6d5d34b53bd98cfa6936a1d56c43368782.tar.zst nixpkgs-6c38bb6d5d34b53bd98cfa6936a1d56c43368782.zip | |
kubernetes: fix breakage introduced by upgrade to 1.22
Diffstat (limited to 'nixos/modules/services/cluster')
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/apiserver.nix | 7 | ||||
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/flannel.nix | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix index f1531caa754..f842f784b34 100644 --- a/nixos/modules/services/cluster/kubernetes/apiserver.nix +++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -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) diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index 3f55719027f..fecea7a15f3 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -58,7 +58,7 @@ in services.kubernetes.addonManager.bootstrapAddons = mkIf ((storageBackend == "kubernetes") && (elem "RBAC" top.apiserver.authorizationMode)) { flannel-cr = { - apiVersion = "rbac.authorization.k8s.io/v1beta1"; + apiVersion = "rbac.authorization.k8s.io/v1"; kind = "ClusterRole"; metadata = { name = "flannel"; }; rules = [{ @@ -79,7 +79,7 @@ in }; flannel-crb = { - apiVersion = "rbac.authorization.k8s.io/v1beta1"; + apiVersion = "rbac.authorization.k8s.io/v1"; kind = "ClusterRoleBinding"; metadata = { name = "flannel"; }; roleRef = { |