diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-06-18 09:41:36 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-06-18 09:44:13 +0200 |
| commit | 0aa9f35a99f0edac6c6b8f405ead51eb700a444f (patch) | |
| tree | 2e17cc239013f5fccc6e56596a3f4d3ec5ad8faa /nixos/modules/services/cluster/kubernetes/kubelet.nix | |
| parent | 7adbdd97588674706cb5a277d5dc63480425bc6b (diff) | |
| parent | 03acdd20beddc0f1a6a16037959ba84d56a0e403 (diff) | |
| download | nixpkgs-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.tar nixpkgs-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.tar.gz nixpkgs-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.tar.bz2 nixpkgs-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.tar.lz nixpkgs-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.tar.xz nixpkgs-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.tar.zst nixpkgs-0aa9f35a99f0edac6c6b8f405ead51eb700a444f.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1525828
Diffstat (limited to 'nixos/modules/services/cluster/kubernetes/kubelet.nix')
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/kubelet.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index ccc8a16e788..4c5df96bcc6 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -28,13 +28,6 @@ let kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig; - manifests = pkgs.buildEnv { - name = "kubernetes-manifests"; - paths = mapAttrsToList (name: manifest: - pkgs.writeTextDir "${name}.json" (builtins.toJSON manifest) - ) cfg.manifests; - }; - manifestPath = "kubernetes/manifests"; taintOptions = with lib.types; { name, ... }: { |