diff options
| author | Alexander Ried <ried@mytum.de> | 2016-09-12 16:34:38 +0200 |
|---|---|---|
| committer | Alexander Ried <ried@mytum.de> | 2016-09-13 11:19:22 +0200 |
| commit | 42312930100e700eece6f54a74cd2ce2126fa03e (patch) | |
| tree | 2fcf29b7dd67314477b5a9cbcc6d6da108cc0018 /nixos/modules | |
| parent | 5481831263b6dde4a33d8fa6f20dff38646a1949 (diff) | |
| download | nixlib-42312930100e700eece6f54a74cd2ce2126fa03e.tar nixlib-42312930100e700eece6f54a74cd2ce2126fa03e.tar.gz nixlib-42312930100e700eece6f54a74cd2ce2126fa03e.tar.bz2 nixlib-42312930100e700eece6f54a74cd2ce2126fa03e.tar.lz nixlib-42312930100e700eece6f54a74cd2ce2126fa03e.tar.xz nixlib-42312930100e700eece6f54a74cd2ce2126fa03e.tar.zst nixlib-42312930100e700eece6f54a74cd2ce2126fa03e.zip | |
cluster.kubernetes: fix service ordering
Requires does NOT imply After, so I added the missing ordering.
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 42efde36678f..4bdd7f95f774 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -421,7 +421,7 @@ in { description = "Kubernetes Api Server"; wantedBy = [ "multi-user.target" ]; requires = ["kubernetes-setup.service"]; - after = [ "network-interfaces.target" "etcd.service" ]; + after = [ "network.target" "etcd.service" "kubernetes-setup.service" ]; serviceConfig = { ExecStart = let authorizationPolicyFile = @@ -468,7 +468,7 @@ in { systemd.services.kube-scheduler = { description = "Kubernetes Scheduler Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" "kubernetes-apiserver.service" ]; + after = [ "network.target" "kubernetes-apiserver.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-scheduler \ --address=${cfg.scheduler.address} \ @@ -487,7 +487,7 @@ in { systemd.services.kube-controller-manager = { description = "Kubernetes Controller Manager Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" "kubernetes-apiserver.service" ]; + after = [ "network.target" "kubernetes-apiserver.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-controller-manager \ --address=${cfg.controllerManager.address} \ @@ -511,7 +511,7 @@ in { description = "Kubernetes Kubelet Service"; wantedBy = [ "multi-user.target" ]; requires = ["kubernetes-setup.service"]; - after = [ "network-interfaces.target" "etcd.service" "docker.service" ]; + after = [ "network.target" "etcd.service" "docker.service" "kubernetes-setup.service" ]; path = [ pkgs.gitMinimal pkgs.openssh ]; script = '' export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH" @@ -542,7 +542,7 @@ in { systemd.services.kube-proxy = { description = "Kubernetes Proxy Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" "etcd.service" ]; + after = [ "network.target" "etcd.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-proxy \ --master=${cfg.proxy.master} \ |