diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-07-15 10:05:39 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-07-15 10:23:06 +1000 |
commit | e2659eea362236a1b81e7c5cc8a03e91eae55115 (patch) | |
tree | 46fed1574cfda559ff6bb5183436fd5830220c91 | |
parent | 0436831b1ade9ce3c3775111f82f55ad081c6697 (diff) | |
download | nixpkgs-e2659eea362236a1b81e7c5cc8a03e91eae55115.tar nixpkgs-e2659eea362236a1b81e7c5cc8a03e91eae55115.tar.gz nixpkgs-e2659eea362236a1b81e7c5cc8a03e91eae55115.tar.bz2 nixpkgs-e2659eea362236a1b81e7c5cc8a03e91eae55115.tar.lz nixpkgs-e2659eea362236a1b81e7c5cc8a03e91eae55115.tar.xz nixpkgs-e2659eea362236a1b81e7c5cc8a03e91eae55115.tar.zst nixpkgs-e2659eea362236a1b81e7c5cc8a03e91eae55115.zip |
nixos/kubernetes: use `copyToRoot` instead of deprecated `contents`
-rw-r--r-- | nixos/modules/services/cluster/kubernetes/kubelet.nix | 6 | ||||
-rw-r--r-- | nixos/tests/kubernetes/dns.nix | 12 | ||||
-rw-r--r-- | nixos/tests/kubernetes/rbac.nix | 6 |
3 files changed, 20 insertions, 4 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index af3a5062feb..4363ed35d34 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -23,7 +23,11 @@ let infraContainer = pkgs.dockerTools.buildImage { name = "pause"; tag = "latest"; - contents = top.package.pause; + copyToRoot = pkgs.buildEnv { + name = "image-root"; + pathsToLink = [ "/bin" ]; + paths = [ top.package.pause ]; + }; config.Cmd = ["/bin/pause"]; }; diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 3fd1dd31f74..6299b7ff988 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -33,7 +33,11 @@ let redisImage = pkgs.dockerTools.buildImage { name = "redis"; tag = "latest"; - contents = [ pkgs.redis pkgs.bind.host ]; + copyToRoot = pkgs.buildEnv { + name = "image-root"; + pathsToLink = [ "/bin" ]; + paths = [ pkgs.redis pkgs.bind.host ]; + }; config.Entrypoint = ["/bin/redis-server"]; }; @@ -54,7 +58,11 @@ let probeImage = pkgs.dockerTools.buildImage { name = "probe"; tag = "latest"; - contents = [ pkgs.bind.host pkgs.busybox ]; + copyToRoot = pkgs.buildEnv { + name = "image-root"; + pathsToLink = [ "/bin" ]; + paths = [ pkgs.bind.host pkgs.busybox ]; + }; config.Entrypoint = ["/bin/tail"]; }; diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix index 9e73fbbd32a..779eafbb1d2 100644 --- a/nixos/tests/kubernetes/rbac.nix +++ b/nixos/tests/kubernetes/rbac.nix @@ -84,7 +84,11 @@ let kubectlImage = pkgs.dockerTools.buildImage { name = "kubectl"; tag = "latest"; - contents = [ copyKubectl pkgs.busybox kubectlPod2 ]; + copyToRoot = pkgs.buildEnv { + name = "image-root"; + pathsToLink = [ "/bin" ]; + paths = [ copyKubectl pkgs.busybox kubectlPod2 ]; + }; config.Entrypoint = ["/bin/sh"]; }; |