diff options
author | Johan Thomsen <jth@dbc.dk> | 2019-04-29 12:43:08 +0200 |
---|---|---|
committer | Johan Thomsen <jth@dbc.dk> | 2019-04-29 17:42:16 +0200 |
commit | 29bf511ef9d3a9c8b97e16002a7d633aaa7d9725 (patch) | |
tree | 8ea5b4c0278f24e735a61c40048444ca68b4975d /nixos | |
parent | 535c38dd7330a152cf56407602f8a2305f374bb8 (diff) | |
download | nixpkgs-29bf511ef9d3a9c8b97e16002a7d633aaa7d9725.tar nixpkgs-29bf511ef9d3a9c8b97e16002a7d633aaa7d9725.tar.gz nixpkgs-29bf511ef9d3a9c8b97e16002a7d633aaa7d9725.tar.bz2 nixpkgs-29bf511ef9d3a9c8b97e16002a7d633aaa7d9725.tar.lz nixpkgs-29bf511ef9d3a9c8b97e16002a7d633aaa7d9725.tar.xz nixpkgs-29bf511ef9d3a9c8b97e16002a7d633aaa7d9725.tar.zst nixpkgs-29bf511ef9d3a9c8b97e16002a7d633aaa7d9725.zip |
nixos/kubernetes: fix control-plane-online prestart dependency
The kubeconfig provided to the kubernetes-control-plane-online.service is invalid. However, the apiserver /healthz endpoint can be accessed without auth so it's simpler to just use curl for that.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/cluster/kubernetes/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 192c893f8a1..5e46bfc4240 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -273,11 +273,10 @@ in { wantedBy = [ "kube-control-plane-online.target" ]; after = [ "kube-scheduler.service" "kube-controller-manager.service" ]; before = [ "kube-control-plane-online.target" ]; - environment.KUBECONFIG = cfg.lib.mkKubeConfig "default" cfg.kubeconfig; - path = [ pkgs.kubectl ]; + path = [ pkgs.curl ]; preStart = '' - until kubectl get --raw=/healthz 2>/dev/null; do - echo kubectl get --raw=/healthz: exit status $? + until curl -Ssf ${cfg.apiserverAddress}/healthz do + echo curl -Ssf ${cfg.apiserverAddress}/healthz: exit status $? sleep 3 done ''; |