diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2016-10-02 16:34:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-02 16:34:37 +0200 |
commit | 0906a0f19718605a8074c1c1bf0b3368f8e0d09c (patch) | |
tree | 77d768b4693a4d5b05858609f22782c461c1b9bd /nixos/modules/services/cluster/kubernetes.nix | |
parent | c2ee2a723f4d97de650e972e69c03acb5c2197da (diff) | |
parent | fc0dc65f416ccc3e5cc4acfca7aaf93b50890670 (diff) | |
download | nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.gz nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.bz2 nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.lz nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.xz nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.zst nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.zip |
Merge pull request #18491 from groxxda/network-interfaces
Replace Network-interfaces.target
Diffstat (limited to 'nixos/modules/services/cluster/kubernetes.nix')
-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} \ |