fix prestart
This commit is contained in:
parent
125896c611
commit
1600bc356f
1 changed files with 16 additions and 10 deletions
26
flake.nix
26
flake.nix
|
@ -692,7 +692,8 @@
|
|||
cat ${healthcheck-client-csr-json} | ${pkgs.cfssl}/bin/cfssl gencert -ca=${cfg.etcd.certPath} -ca-key=${cfg.etcd.keyPath} -config=${ca-config-json} -profile=client - | ${pkgs.cfssl}/bin/cfssljson -bare healthcheck-client
|
||||
fi
|
||||
''
|
||||
else "";
|
||||
else
|
||||
null;
|
||||
|
||||
services.etcd = lib.mkIf (cfg.hosts.${name}.role == "etcd") {
|
||||
enable = true;
|
||||
|
@ -757,16 +758,21 @@
|
|||
After = [ "network-online.target" ];
|
||||
Wants = [ "network-online.target" ];
|
||||
};
|
||||
preStart = lib.mkIf (cfg.hosts.${name}.role == "master") ''
|
||||
mkdir -p /etc/kubernetes/pki
|
||||
cd /etc/kubernetes/pki
|
||||
if [ ! -f apiserver-etcd-client.crt ]
|
||||
preStart =
|
||||
if (cfg.hosts.${name}.role == "master")
|
||||
then
|
||||
cat ${apiserver-etcd-client-csr-json} | ${pkgs.cfssl}/bin/cfssl gencert -ca=${cfg.etcd.certPath} -ca-key=${cfg.etcd.keyPath} -config=${ca-config-json} -profile=client - | ${pkgs.cfssl}/bin/cfssljson -bare apiserver-etcd-client
|
||||
mv apiserver-etcd-client.pem apiserver-etcd-client.crt
|
||||
mv apiserver-etcd-client-key.pem apiserver-etcd-client.key
|
||||
fi
|
||||
'';
|
||||
''
|
||||
mkdir -p /etc/kubernetes/pki
|
||||
cd /etc/kubernetes/pki
|
||||
if [ ! -f apiserver-etcd-client.crt ]
|
||||
then
|
||||
cat ${apiserver-etcd-client-csr-json} | ${pkgs.cfssl}/bin/cfssl gencert -ca=${cfg.etcd.certPath} -ca-key=${cfg.etcd.keyPath} -config=${ca-config-json} -profile=client - | ${pkgs.cfssl}/bin/cfssljson -bare apiserver-etcd-client
|
||||
mv apiserver-etcd-client.pem apiserver-etcd-client.crt
|
||||
mv apiserver-etcd-client-key.pem apiserver-etcd-client.key
|
||||
fi
|
||||
''
|
||||
else
|
||||
null;
|
||||
serviceConfig = {
|
||||
Slice = "kubernetes.slice";
|
||||
CPUAccounting = true;
|
||||
|
|
Loading…
Add table
Reference in a new issue