diff options
author | Johan Thomsen <jth@dbc.dk> | 2019-08-24 12:52:32 +0200 |
---|---|---|
committer | Sarah Brofeldt <sbrofeldt@gmail.com> | 2019-09-04 17:37:02 +0200 |
commit | 00975b5628a840b8452bf1d01fdc722cf3dad923 (patch) | |
tree | 6b05417d21a888179a40cd848da330296cb214da /nixos/modules/services/cluster/kubernetes/scheduler.nix | |
parent | 432e55242e232b1872f77944933027b6d6dc2656 (diff) | |
download | nixpkgs-00975b5628a840b8452bf1d01fdc722cf3dad923.tar nixpkgs-00975b5628a840b8452bf1d01fdc722cf3dad923.tar.gz nixpkgs-00975b5628a840b8452bf1d01fdc722cf3dad923.tar.bz2 nixpkgs-00975b5628a840b8452bf1d01fdc722cf3dad923.tar.lz nixpkgs-00975b5628a840b8452bf1d01fdc722cf3dad923.tar.xz nixpkgs-00975b5628a840b8452bf1d01fdc722cf3dad923.tar.zst nixpkgs-00975b5628a840b8452bf1d01fdc722cf3dad923.zip |
Revert "Merge pull request #56789 from mayflower/upstream-k8s-refactor"
This reverts commit 7dc6e77bc2a03e660cab2c4cbf52f235bc52683e, reversing changes made to bce47ea9d5fa962736ddd4a254a27a5fd2cdee9a. Motivation for the revert in #67563
Diffstat (limited to 'nixos/modules/services/cluster/kubernetes/scheduler.nix')
-rw-r--r-- | nixos/modules/services/cluster/kubernetes/scheduler.nix | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/scheduler.nix b/nixos/modules/services/cluster/kubernetes/scheduler.nix index a0e48454295..5f6113227d9 100644 --- a/nixos/modules/services/cluster/kubernetes/scheduler.nix +++ b/nixos/modules/services/cluster/kubernetes/scheduler.nix @@ -56,35 +56,18 @@ in }; ###### implementation - config = let - - schedulerPaths = filter (a: a != null) [ - cfg.kubeconfig.caFile - cfg.kubeconfig.certFile - cfg.kubeconfig.keyFile - ]; - - in mkIf cfg.enable { - systemd.services.kube-scheduler = rec { + config = mkIf cfg.enable { + systemd.services.kube-scheduler = { description = "Kubernetes Scheduler Service"; - wantedBy = [ "kube-control-plane-online.target" ]; + wantedBy = [ "kubernetes.target" ]; after = [ "kube-apiserver.service" ]; - before = [ "kube-control-plane-online.target" ]; - environment.KUBECONFIG = top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig; - path = [ pkgs.kubectl ]; - preStart = '' - until kubectl auth can-i get /api -q 2>/dev/null; do - echo kubectl auth can-i get /api: exit status $? - sleep 2 - done - ''; serviceConfig = { Slice = "kubernetes.slice"; ExecStart = ''${top.package}/bin/kube-scheduler \ --address=${cfg.address} \ ${optionalString (cfg.featureGates != []) "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ - --kubeconfig=${environment.KUBECONFIG} \ + --kubeconfig=${top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \ --leader-elect=${boolToString cfg.leaderElect} \ --port=${toString cfg.port} \ ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ @@ -96,15 +79,6 @@ in Restart = "on-failure"; RestartSec = 5; }; - unitConfig.ConditionPathExists = schedulerPaths; - }; - - systemd.paths.kube-scheduler = { - wantedBy = [ "kube-scheduler.service" ]; - pathConfig = { - PathExists = schedulerPaths; - PathChanged = schedulerPaths; - }; }; services.kubernetes.pki.certs = { |