Unverified Commit 91bd44ef authored by Janik's avatar Janik Committed by GitHub
Browse files

Merge pull request #228581 from dtzitzon/dtz/k3s

parents e74e6844 d629ca54

nixos/tests/k3s/single-node.nix

+7 −7
Original line number Diff line number Diff line
@@ -62,20 +62,20 @@ import ../make-test-python.nix ({ pkgs, lib, k3s, ... }: 
      start_all()



      machine.wait_for_unit("k3s")

      machine.succeed("k3s kubectl cluster-info")

      machine.fail("sudo -u noprivs k3s kubectl cluster-info")

      machine.succeed("kubectl cluster-info")

      machine.fail("sudo -u noprivs kubectl cluster-info")

      '' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)"

      + lib.optionalString (!pkgs.stdenv.isAarch64) ''machine.succeed("k3s check-config")'' + ''



      machine.succeed(

          "${pauseImage} | k3s ctr image import -"

          "${pauseImage} | ctr image import -"

      )



      # Also wait for our service account to show up; it takes a sec

      machine.wait_until_succeeds("k3s kubectl get serviceaccount default")

      machine.succeed("k3s kubectl apply -f ${testPodYaml}")

      machine.succeed("k3s kubectl wait --for 'condition=Ready' pod/test")

      machine.succeed("k3s kubectl delete -f ${testPodYaml}")

      machine.wait_until_succeeds("kubectl get serviceaccount default")

      machine.succeed("kubectl apply -f ${testPodYaml}")

      machine.succeed("kubectl wait --for 'condition=Ready' pod/test")

      machine.succeed("kubectl delete -f ${testPodYaml}")



      # regression test for #176445

      machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'")

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

+3 −0
Original line number Diff line number Diff line
@@ -313,6 +313,9 @@ buildGoModule rec { 
    wrapProgram $out/bin/k3s \

      --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \

      --prefix PATH : "$out/bin"

    ln -s $out/bin/k3s $out/bin/kubectl

    ln -s $out/bin/k3s $out/bin/crictl

    ln -s $out/bin/k3s $out/bin/ctr

  '';



  doInstallCheck = true;

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

+3 −0
Original line number Diff line number Diff line
@@ -317,6 +317,9 @@ buildGoModule rec { 
    wrapProgram $out/bin/k3s \

      --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \

      --prefix PATH : "$out/bin"

    ln -s $out/bin/k3s $out/bin/kubectl

    ln -s $out/bin/k3s $out/bin/crictl

    ln -s $out/bin/k3s $out/bin/ctr

  '';



  doInstallCheck = true;

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

+7 −0
Original line number Diff line number Diff line
@@ -84,6 +84,10 @@ let 
    homepage = "https://k3s.io";

    maintainers = with maintainers; [ euank mic92 yajo ];

    platforms = platforms.linux;



    # resolves collisions with other installations of kubectl, crictl, ctr

    # prefer non-k3s versions

    priority = 5;

  };



  # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40
@@ -325,6 +329,9 @@ buildGoModule rec { 
    wrapProgram $out/bin/k3s \

      --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \

      --prefix PATH : "$out/bin"

    ln -s $out/bin/k3s $out/bin/kubectl

    ln -s $out/bin/k3s $out/bin/crictl

    ln -s $out/bin/k3s $out/bin/ctr

  '';



  doInstallCheck = true;