Merge pull request #18 from plaflamme/more-tests

fix: do not require a join token for the controller+worker role

Author: plaflamme

flake.nix

@@ -25,17 +25,18 @@
       nixosModules.default = import ./nixos/k0s.nix;
 
       checks = forAllSystems (system:
-        let pkgs = nixpkgs.legacyPackages.${system};
-        in {
-          basic = pkgs.testers.runNixOSTest {
-            imports = [ ./tests/basic.nix ];
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+          forAllTests = lib.genAttrs [ "single" "ctrl-wrkr" ];
+        in forAllTests (test:
+          pkgs.testers.runNixOSTest {
+            imports = [ ./tests/${test}.nix ];
             node = { pkgsReadOnly = false; };
             defaults = {
               imports = [ self.nixosModules.default ];
               nixpkgs.overlays = [ self.overlays.default ];
             };
-          };
-        });
+          }));
 
     };
 }

nixos/k0s.nix

@@ -76,6 +76,7 @@ in {
       if (cfg.role == "worker")
       then "worker"
       else "controller";
+    requireJoinToken = cfg.role == "worker" || (cfg.role == "controller" && !cfg.isLeader);
     unitName = "k0s" + subcommand;
     configFile =
       if cfg.configText != ""
@@ -118,9 +119,9 @@ in {
             + optionalString (cfg.role != "worker") " --config=${configFile}"
             + optionalString (cfg.role == "single") " --single"
             + optionalString (cfg.role == "controller+worker") " --enable-worker --no-taints"
-            + optionalString (cfg.role != "single" && !cfg.isLeader) " --token-file=${cfg.tokenFile}";
+            + optionalString requireJoinToken " --token-file=${cfg.tokenFile}";
         };
-        unitConfig = mkIf (cfg.role != "single" && !cfg.isLeader) {
+        unitConfig = mkIf requireJoinToken {
           ConditionPathExists = cfg.tokenFile;
         };
       };

tests/ctrl-wrkr.nix

@@ -0,0 +1,24 @@
+{
+  name = "ctrl-wrkr";
+  nodes = {
+    node1 = { config, ... }: {
+      services.k0s = {
+        enable = true;
+        role = "controller+worker";
+        spec.api = {
+          address = config.networking.primaryIPAddress;
+          sans = [ config.networking.primaryIPAddress ];
+        };
+      };
+
+    };
+  };
+  testScript = { nodes }:
+    let k0s = nodes.node1.services.k0s.package;
+    in ''
+      start_all()
+      node1.wait_for_unit("k0scontroller")
+      node1.wait_for_file("/run/k0s/status.sock")
+      node1.succeed("${k0s}/bin/k0s status")
+    '';
+}