Commit 0b572401 authored by Johan Thomsen's avatar Johan Thomsen Committed by zowoq
Browse files

nixos/kubernetes: kubelet --container-runtime flag has been removed

parent 477067a5

nixos/modules/services/cluster/kubernetes/kubelet.nix

+1 −7
Original line number Diff line number Diff line
@@ -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}