movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Cleanup pki: remove mkWaitCurl

Browse source
This commit is contained in:
Christian Albrecht 2019-03-11 11:42:48 +01:00
parent 45e683fbd6
commit e3a80ebc40
No known key found for this signature in database
GPG key ID: 866AF4B25DF7EB00
2 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
nixos/modules/services/cluster/kubernetes/pki.nix
View file

@ -182,12 +182,12 @@ in
description = "Wait for ${remote} to be reachable.";
wantedBy = [ "cfssl-online.target" ];
before = [ "cfssl-online.target" ];
path = [ pkgs.curl ];
preStart = ''
${top.lib.mkWaitCurl {
address = remote;
path = "/api/v1/cfssl/info";
args = "-kd '{}' -o /dev/null";
}}
until curl --fail-early -fskd '{}' ${remote}/api/v1/cfssl/info -o /dev/null; do
echo curl ${remote}/api/v1/cfssl/info: exit status $?
sleep 2
done
'';
script = "echo Ok";
serviceConfig = {
@ -200,6 +200,7 @@ in
wantedBy = [ "cfssl-online.target" ];
after = [ "cfssl-online.target" ];
before = [ "certmgr.service" ];
path = with pkgs; [ curl cfssl ];
script = concatStringsSep "\n" [''
set -e
@ -218,11 +219,12 @@ in
''
(optionalString (cfg.pkiTrustOnBootstrap) ''
if [ ! -s "${top.caFile}" ]; then
${top.lib.mkWaitCurl {
address = "https://${top.masterAddress}:${cfsslPort}";
path = "/api/v1/cfssl/info";
args = "-kd '{}' -o - | ${pkgs.cfssl}/bin/cfssljson -stdout >${top.caFile}";
}}
until test -s ${top.caFile}.json; do
sleep 2
curl --fail-early -fskd '{}' ${remote}/api/v1/cfssl/info -o ${top.caFile}.json
done
cfssljson -f ${top.caFile}.json -stdout >${top.caFile}
rm ${top.caFile}.json
fi
'')
];