summaryrefslogtreecommitdiffstats
path: root/nixos/modules/services/cluster
diff options
context:
space:
mode:
authorJohan Thomsen <joho@nnit.com>2023-04-12 20:00:38 +0200
committerzowoq <59103226+zowoq@users.noreply.github.com>2023-04-13 07:21:56 +1000
commit0b572401112cee6cb959692944ed2062e2d71fa8 (patch)
tree0817bebf8c1c15f35d9448645da988a0b821e8ea /nixos/modules/services/cluster
parent477067a5d0d4efe9c78077bc74cc95570e44052d (diff)
nixos/kubernetes: kubelet --container-runtime flag has been removed
Diffstat (limited to 'nixos/modules/services/cluster')
-rw-r--r--nixos/modules/services/cluster/kubernetes/kubelet.nix8
1 files changed, 1 insertions, 7 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index 8e935d621be4..eebacb3f3ef3 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -63,6 +63,7 @@ in
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "")
(mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "networkPlugin" ] "")
+ (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "containerRuntime" ] "")
];
###### interface
@@ -134,12 +135,6 @@ in
};
};
- containerRuntime = mkOption {
- description = lib.mdDoc "Which container runtime type to use";
- type = enum ["docker" "remote"];
- default = "remote";
- };
-
containerRuntimeEndpoint = mkOption {
description = lib.mdDoc "Endpoint at which to find the container runtime api interface/socket";
type = str;
@@ -331,7 +326,6 @@ in
${optionalString (cfg.tlsKeyFile != null)
"--tls-private-key-file=${cfg.tlsKeyFile}"} \
${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
- --container-runtime=${cfg.containerRuntime} \
--container-runtime-endpoint=${cfg.containerRuntimeEndpoint} \
--cgroup-driver=systemd \
${cfg.extraOpts}