oceanbox/platform
6
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix missing before= stanza

Browse Source
This commit is contained in:
Jonas Juselius
2019-10-17 21:32:16 +02:00
parent d347727c4f
commit cae9fe9f46
1 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/k8s.nix
View File

@@ -110,30 +110,6 @@ rec {
Restart = "on-failure"; 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 = { kubeWorker = {
@@ -158,7 +134,7 @@ rec {
systemd.services.kube-certmgr-apitoken-bootstrap = { systemd.services.kube-certmgr-apitoken-bootstrap = {
description = "Kubernetes certmgr bootstrapper"; description = "Kubernetes certmgr bootstrapper";
wantedBy = [ "certmgr.service" ]; wantedBy = [ "certmgr.service" ];
# before = [ "certmgr.service" ]; before = [ "certmgr.service" ];
script = install-apitoken; script = install-apitoken;
serviceConfig = { serviceConfig = {
RestartSec = "10s"; RestartSec = "10s";