b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixos/kubernetes: use copyToRoot instead of deprecated contents

Browse source
This commit is contained in:
zowoq 2022-07-15 10:05:39 +10:00
parent 0436831b1a
commit e2659eea36
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/services/cluster/kubernetes/kubelet.nix
View file

@ -23,7 +23,11 @@ let
infraContainer = pkgs.dockerTools.buildImage { infraContainer = pkgs.dockerTools.buildImage {
name = "pause"; name = "pause";
tag = "latest"; tag = "latest";
contents = top.package.pause; copyToRoot = pkgs.buildEnv {
name = "image-root";
pathsToLink = [ "/bin" ];
paths = [ top.package.pause ];
};
config.Cmd = ["/bin/pause"]; config.Cmd = ["/bin/pause"];
}; };

12
nixos/tests/kubernetes/dns.nix
View file

@ -33,7 +33,11 @@ let
redisImage = pkgs.dockerTools.buildImage { redisImage = pkgs.dockerTools.buildImage {
name = "redis"; name = "redis";
tag = "latest"; 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"]; config.Entrypoint = ["/bin/redis-server"];
}; };
@ -54,7 +58,11 @@ let
probeImage = pkgs.dockerTools.buildImage { probeImage = pkgs.dockerTools.buildImage {
name = "probe"; name = "probe";
tag = "latest"; 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"]; config.Entrypoint = ["/bin/tail"];
}; };

6
nixos/tests/kubernetes/rbac.nix
View file

@ -84,7 +84,11 @@ let
kubectlImage = pkgs.dockerTools.buildImage { kubectlImage = pkgs.dockerTools.buildImage {
name = "kubectl"; name = "kubectl";
tag = "latest"; tag = "latest";
contents = [ copyKubectl pkgs.busybox kubectlPod2 ]; copyToRoot = pkgs.buildEnv {
name = "image-root";
pathsToLink = [ "/bin" ];
paths = [ copyKubectl pkgs.busybox kubectlPod2 ];
};
config.Entrypoint = ["/bin/sh"]; config.Entrypoint = ["/bin/sh"];
}; };