diff options
| author | Christian Albrecht <christian.albrecht@mayflower.de> | 2019-03-06 16:52:27 +0100 |
|---|---|---|
| committer | Christian Albrecht <christian.albrecht@mayflower.de> | 2019-03-06 16:55:08 +0100 |
| commit | 7323b77435f69362b0b4cc7edcb0915e9ab1ff48 (patch) | |
| tree | ba1b9e79dd180cad3e9571de6535005c4eb273e7 /nixos/modules/services/cluster/kubernetes/proxy.nix | |
| parent | 52fe1d2e7a9c154fe962f7b47ce008bf06cfe746 (diff) | |
| download | nixpkgs-7323b77435f69362b0b4cc7edcb0915e9ab1ff48.tar nixpkgs-7323b77435f69362b0b4cc7edcb0915e9ab1ff48.tar.gz nixpkgs-7323b77435f69362b0b4cc7edcb0915e9ab1ff48.tar.bz2 nixpkgs-7323b77435f69362b0b4cc7edcb0915e9ab1ff48.tar.lz nixpkgs-7323b77435f69362b0b4cc7edcb0915e9ab1ff48.tar.xz nixpkgs-7323b77435f69362b0b4cc7edcb0915e9ab1ff48.tar.zst nixpkgs-7323b77435f69362b0b4cc7edcb0915e9ab1ff48.zip | |
nixos/kubernetes: Address review: Separate preStart from certificates
Diffstat (limited to 'nixos/modules/services/cluster/kubernetes/proxy.nix')
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/proxy.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixos/modules/services/cluster/kubernetes/proxy.nix index d13d23e997b..01d59e9ac88 100644 --- a/nixos/modules/services/cluster/kubernetes/proxy.nix +++ b/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -53,11 +53,10 @@ in before = [ "node-online.target" ]; path = with pkgs; [ iptables conntrack_tools ]; preStart = '' - ${top.lib.mkWaitCurl (with top.pki.certs.kubeProxyClient; { + ${top.lib.mkWaitCurl ( with config.systemd.services.kube-proxy; { path = "/api/v1/nodes/${top.kubelet.hostname}"; cacert = top.caFile; - inherit cert key; - })} + } // optionalAttrs (environment ? cert) { inherit (environment) cert key; })} ''; serviceConfig = { Slice = "kubernetes.slice"; |