commit 91bd44ef44fb92a7c668e9839f2e2eb1dd8d4a3f

pyrox.dev / nixpkgs

lol

fork atom

Merge pull request #228581 from dtzitzon/dtz/k3s

authored by

Janik and committed by

GitHub 2 years ago 91bd44ef e74e6844

+20 -7

4 changed files

expand all

unified split

nixos

tests

k3s

single-node.nix

pkgs

applications

networking

cluster

k3s

1_24

default.nix

1_25

default.nix

builder.nix

+7 -7

nixos/tests/k3s/single-node.nix

··· 62 62 start_all() 63 63 64 64 machine.wait_for_unit("k3s") 65 - machine.succeed("k3s kubectl cluster-info") 66 - machine.fail("sudo -u noprivs k3s kubectl cluster-info") 65 + machine.succeed("kubectl cluster-info") 66 + machine.fail("sudo -u noprivs kubectl cluster-info") 67 67 '' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)" 68 68 + lib.optionalString (!pkgs.stdenv.isAarch64) ''machine.succeed("k3s check-config")'' + '' 69 69 70 70 machine.succeed( 71 - "${pauseImage} | k3s ctr image import -" 71 + "${pauseImage} | ctr image import -" 72 72 ) 73 73 74 74 # Also wait for our service account to show up; it takes a sec 75 - machine.wait_until_succeeds("k3s kubectl get serviceaccount default") 76 - machine.succeed("k3s kubectl apply -f ${testPodYaml}") 77 - machine.succeed("k3s kubectl wait --for 'condition=Ready' pod/test") 78 - machine.succeed("k3s kubectl delete -f ${testPodYaml}") 75 + machine.wait_until_succeeds("kubectl get serviceaccount default") 76 + machine.succeed("kubectl apply -f ${testPodYaml}") 77 + machine.succeed("kubectl wait --for 'condition=Ready' pod/test") 78 + machine.succeed("kubectl delete -f ${testPodYaml}") 79 79 80 80 # regression test for #176445 81 81 machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'")

pkgs/applications/networking/cluster/k3s/1_24/default.nix

··· 313 313 wrapProgram $out/bin/k3s \ 314 314 --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ 315 315 --prefix PATH : "$out/bin" 316 + ln -s $out/bin/k3s $out/bin/kubectl 317 + ln -s $out/bin/k3s $out/bin/crictl 318 + ln -s $out/bin/k3s $out/bin/ctr 316 319 ''; 317 320 318 321 doInstallCheck = true;

pkgs/applications/networking/cluster/k3s/1_25/default.nix

··· 317 317 wrapProgram $out/bin/k3s \ 318 318 --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ 319 319 --prefix PATH : "$out/bin" 320 + ln -s $out/bin/k3s $out/bin/kubectl 321 + ln -s $out/bin/k3s $out/bin/crictl 322 + ln -s $out/bin/k3s $out/bin/ctr 320 323 ''; 321 324 322 325 doInstallCheck = true;

pkgs/applications/networking/cluster/k3s/builder.nix

··· 84 84 homepage = "https://k3s.io"; 85 85 maintainers = with maintainers; [ euank mic92 yajo ]; 86 86 platforms = platforms.linux; 87 + 88 + # resolves collisions with other installations of kubectl, crictl, ctr 89 + # prefer non-k3s versions 90 + priority = 5; 87 91 }; 88 92 89 93 # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 ··· 325 329 wrapProgram $out/bin/k3s \ 326 330 --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ 327 331 --prefix PATH : "$out/bin" 332 + ln -s $out/bin/k3s $out/bin/kubectl 333 + ln -s $out/bin/k3s $out/bin/crictl 334 + ln -s $out/bin/k3s $out/bin/ctr 328 335 ''; 329 336 330 337 doInstallCheck = true;