From e148cb040b84a55229e097cb9c6b1af3c2a5484f Mon Sep 17 00:00:00 2001 From: Christian Albrecht Date: Wed, 6 Mar 2019 17:17:20 +0100 Subject: nixos/kubernetes: Address review: rename node-online target --- nixos/modules/services/cluster/kubernetes/flannel.nix | 4 ++-- nixos/modules/services/cluster/kubernetes/kubelet.nix | 10 +++++----- nixos/modules/services/cluster/kubernetes/proxy.nix | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index f85ebdafa31..4c5fe7559eb 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -71,8 +71,8 @@ in }; systemd.targets.flannel = { - wantedBy = [ "node-online.target" ]; - before = [ "node-online.target" ]; + wantedBy = [ "kube-node-online.target" ]; + before = [ "kube-node-online.target" ]; }; systemd.services.flannel = { diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index c4ecb2417e2..01cdfccccf9 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -340,9 +340,9 @@ in }; systemd.services.kubelet-online = { - wantedBy = [ "node-online.target" ]; + wantedBy = [ "kube-node-online.target" ]; after = [ "flannel.target" "kubelet.target" ]; - before = [ "node-online.target" ]; + before = [ "kube-node-online.target" ]; # it is complicated. flannel needs kubelet to run the pause container before # it discusses the node CIDR with apiserver and afterwards configures and restarts # dockerd. Until then prevent creating any pods because they have to be recreated anyway @@ -407,11 +407,11 @@ in { systemd.targets.kubelet = { - wantedBy = [ "node-online.target" ]; - before = [ "node-online.target" ]; + wantedBy = [ "kube-node-online.target" ]; + before = [ "kube-node-online.target" ]; }; - systemd.targets.node-online = { + systemd.targets.kube-node-online = { wantedBy = [ "kubernetes.target" ]; before = [ "kubernetes.target" ]; }; diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixos/modules/services/cluster/kubernetes/proxy.nix index 01d59e9ac88..65d4f9ccbfc 100644 --- a/nixos/modules/services/cluster/kubernetes/proxy.nix +++ b/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -48,9 +48,9 @@ in config = mkIf cfg.enable { systemd.services.kube-proxy = { description = "Kubernetes Proxy Service"; - wantedBy = [ "node-online.target" ]; + wantedBy = [ "kube-node-online.target" ]; after = [ "kubelet-online.service" ]; - before = [ "node-online.target" ]; + before = [ "kube-node-online.target" ]; path = with pkgs; [ iptables conntrack_tools ]; preStart = '' ${top.lib.mkWaitCurl ( with config.systemd.services.kube-proxy; { -- cgit 1.4.1