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 /nixos/tests/kubernetes | |
parent | 0436831b1ade9ce3c3775111f82f55ad081c6697 (diff) |
nixos/kubernetes: use `copyToRoot` instead of deprecated `contents`
Diffstat (limited to 'nixos/tests/kubernetes')
-rw-r--r-- | nixos/tests/kubernetes/dns.nix | 12 | ||||
-rw-r--r-- | nixos/tests/kubernetes/rbac.nix | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 3fd1dd31f746b..6299b7ff988af 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 9e73fbbd32a8f..779eafbb1d24c 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"]; }; |