From cae9fe9f46022d6724bc0ba0f82205fda8bfd436 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Thu, 17 Oct 2019 21:32:16 +0200 Subject: [PATCH] Fix missing before= stanza --- lib/k8s.nix | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/lib/k8s.nix b/lib/k8s.nix index 7e26d6a..4d06fe2 100644 --- a/lib/k8s.nix +++ b/lib/k8s.nix @@ -110,30 +110,6 @@ rec { Restart = "on-failure"; }; }; - -# systemd.services.kube-system-bootstrap = { -# description = "Kubernetes certmgr bootstrapper"; -# wantedBy = [ "multi-user.target" ]; -# after = [ "kubernetes.target" ]; -# serviceConfig = { -# Type = "oneshot"; -# RemainAfterExit = false; -# Environment = '' -# PATH=$PATH:/run/current-system/sw/bin -# ''; -# ExecStart = pkgs.writeScript "kube-system-bootstrap" '' -# #!${pkgs.bash}/bin/bash -# set -e -# if [ ! -f /var/lib/kubernetes/.kube-system-bootstrap.done ]; then -# sh=${pkgs.bash}/bin/bash -# d=${kube-system-bootstrap}/share/kube-system-bootstrap -# cd $d -# $sh $d/kube-system-bootstrap ${cluster-ca} ${settings.clusterName} -# touch /var/lib/kubernetes/.kube-system-bootstrap.done -# fi -# ''; -# }; -# }; }; kubeWorker = { @@ -158,7 +134,7 @@ rec { systemd.services.kube-certmgr-apitoken-bootstrap = { description = "Kubernetes certmgr bootstrapper"; wantedBy = [ "certmgr.service" ]; - # before = [ "certmgr.service" ]; + before = [ "certmgr.service" ]; script = install-apitoken; serviceConfig = { RestartSec = "10s";