public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/kubernetes: Address review: Rename targets and move proxy to node-online.target

Browse Source
This commit is contained in:
Christian Albrecht 2019-03-06 16:40:27 +01:00
parent 74962bf767
commit ff91d5818c
No known key found for this signature in database
GPG Key ID: 866AF4B25DF7EB00
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/cluster/kubernetes/addon-manager.nix
View File

@ -71,8 +71,8 @@ in
systemd.services.kube-addon-manager = { systemd.services.kube-addon-manager = {
description = "Kubernetes addon manager"; description = "Kubernetes addon manager";
wantedBy = [ "kubernetes.target" ]; wantedBy = [ "kube-control-plane-online.target" ];
after = [ "kube-apiserver-online.target" "node-online.target" ]; before = [ "kube-control-plane-online.target" ];
environment.ADDON_PATH = "/etc/kubernetes/addons/"; environment.ADDON_PATH = "/etc/kubernetes/addons/";
path = [ pkgs.gawk ]; path = [ pkgs.gawk ];
serviceConfig = { serviceConfig = {

16
nixos/modules/services/cluster/kubernetes/apiserver.nix
View File

@ -293,9 +293,9 @@ in
in { in {
systemd.services.kube-apiserver = { systemd.services.kube-apiserver = {
description = "Kubernetes APIServer Service"; description = "Kubernetes APIServer Service";
wantedBy = [ "kube-apiserver-online.target" ]; wantedBy = [ "kube-control-plane-online.target" ];
after = [ "certmgr.service" ]; after = [ "certmgr.service" ];
before = [ "kube-apiserver-online.target" ]; before = [ "kube-control-plane-online.target" ];
serviceConfig = { serviceConfig = {
Slice = "kubernetes.slice"; Slice = "kubernetes.slice";
ExecStart = ''${top.package}/bin/kube-apiserver \ ExecStart = ''${top.package}/bin/kube-apiserver \
@ -461,16 +461,16 @@ in
})) }))
{ {
systemd.targets.kube-apiserver-online = { systemd.targets.kube-control-plane-online = {
wantedBy = [ "kubernetes.target" ]; wantedBy = [ "kubernetes.target" ];
before = [ "kubernetes.target" ]; before = [ "kubernetes.target" ];
}; };
systemd.services.kube-apiserver-online = mkIf top.flannel.enable { systemd.services.kube-control-plane-online = rec {
description = "apiserver control plane is online"; description = "Kubernetes control plane is online";
wantedBy = [ "kube-apiserver-online.target" ]; wantedBy = [ "kube-control-plane-online.target" ];
after = [ "kube-scheduler.service" "kube-controller-manager.service" ]; after = [ "kube-scheduler.service" "kube-controller-manager.service" ];
before = [ "kube-apiserver-online.target" ]; before = [ "kube-control-plane-online.target" ];
preStart = '' preStart = ''
${top.lib.mkWaitCurl (with top.pki.certs.flannelClient; { ${top.lib.mkWaitCurl (with top.pki.certs.flannelClient; {
sleep = 3; sleep = 3;
@ -479,7 +479,7 @@ in
inherit cert key; inherit cert key;
})} })}
''; '';
script = "echo apiserver control plane is online"; script = "echo Ok";
serviceConfig = { serviceConfig = {
TimeoutSec = "500"; TimeoutSec = "500";
}; };

4
nixos/modules/services/cluster/kubernetes/controller-manager.nix
View File

@ -116,9 +116,9 @@ in
systemd.services.kube-controller-manager = { systemd.services.kube-controller-manager = {
description = "Kubernetes Controller Manager Service"; description = "Kubernetes Controller Manager Service";
wantedBy = [ "kube-apiserver-online.target" ]; wantedBy = [ "kube-control-plane-online.target" ];
after = [ "kube-apiserver.service" ]; after = [ "kube-apiserver.service" ];
before = [ "kube-apiserver-online.target" ]; before = [ "kube-control-plane-online.target" ];
preStart = '' preStart = ''
${top.lib.mkWaitCurl (with top.pki.certs.controllerManagerClient; { ${top.lib.mkWaitCurl (with top.pki.certs.controllerManagerClient; {
sleep = 1; sleep = 1;

4
nixos/modules/services/cluster/kubernetes/kubelet.nix
View File

@ -253,7 +253,7 @@ in
systemd.services.kubelet = { systemd.services.kubelet = {
description = "Kubernetes Kubelet Service"; description = "Kubernetes Kubelet Service";
wantedBy = [ "kubelet.target" ]; wantedBy = [ "kubelet.target" ];
after = [ "kube-apiserver-online.target" ]; after = [ "kube-control-plane-online.target" ];
before = [ "kubelet.target" ]; before = [ "kubelet.target" ];
path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path; path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ top.path;
preStart = '' preStart = ''
@ -339,7 +339,7 @@ in
serviceConfig.Slice = "kubernetes.slice"; serviceConfig.Slice = "kubernetes.slice";
}; };
systemd.services.node-online = { systemd.services.kubelet-online = {
wantedBy = [ "node-online.target" ]; wantedBy = [ "node-online.target" ];
after = [ "flannel.target" "kubelet.target" ]; after = [ "flannel.target" "kubelet.target" ];
before = [ "node-online.target" ]; before = [ "node-online.target" ];

6
nixos/modules/services/cluster/kubernetes/proxy.nix
View File

@ -48,9 +48,9 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.services.kube-proxy = { systemd.services.kube-proxy = {
description = "Kubernetes Proxy Service"; description = "Kubernetes Proxy Service";
wantedBy = [ "kubernetes.target" ]; wantedBy = [ "node-online.target" ];
after = [ "node-online.target" ]; after = [ "kubelet-online.service" ];
before = [ "kubernetes.target" ]; before = [ "node-online.target" ];
path = with pkgs; [ iptables conntrack_tools ]; path = with pkgs; [ iptables conntrack_tools ];
preStart = '' preStart = ''
${top.lib.mkWaitCurl (with top.pki.certs.kubeProxyClient; { ${top.lib.mkWaitCurl (with top.pki.certs.kubeProxyClient; {

4
nixos/modules/services/cluster/kubernetes/scheduler.nix
View File

@ -59,9 +59,9 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.services.kube-scheduler = { systemd.services.kube-scheduler = {
description = "Kubernetes Scheduler Service"; description = "Kubernetes Scheduler Service";
wantedBy = [ "kube-apiserver-online.target" ]; wantedBy = [ "kube-control-plane-online.target" ];
after = [ "kube-apiserver.service" ]; after = [ "kube-apiserver.service" ];
before = [ "kube-apiserver-online.target" ]; before = [ "kube-control-plane-online.target" ];
preStart = '' preStart = ''
${top.lib.mkWaitCurl (with top.pki.certs.schedulerClient; { ${top.lib.mkWaitCurl (with top.pki.certs.schedulerClient; {
sleep = 1; sleep = 1;