Unverified Commit 930b0dca authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #327476 from rorosen/k3s-extra-flags-list 

nixos/k3s: accept a list of extraFlags
parents 0397741f cc2790ff

nixos/modules/services/cluster/k3s/default.nix

+7 −4
Original line number Diff line number Diff line
@@ -206,9 +206,12 @@ in 


    extraFlags = mkOption {

      description = "Extra flags to pass to the k3s command.";

      type = types.str;

      default = "";

      example = "--no-deploy traefik --cluster-cidr 10.24.0.0/16";

      type = with types; either str (listOf str);

      default = [ ];

      example = [

        "--no-deploy traefik"

        "--cluster-cidr 10.24.0.0/16"

      ];

    };



    disableAgent = mkOption {
@@ -427,7 +430,7 @@ in 
          ++ (optional (cfg.token != "") "--token ${cfg.token}")

          ++ (optional (cfg.tokenFile != null) "--token-file ${cfg.tokenFile}")

          ++ (optional (cfg.configPath != null) "--config ${cfg.configPath}")

          ++ [ cfg.extraFlags ]

          ++ (lib.flatten cfg.extraFlags)

        );

      };

    };

nixos/tests/k3s/auto-deploy.nix

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ import ../make-test-python.nix ( 
        services.k3s.role = "server";

        services.k3s.package = k3s;

        # Slightly reduce resource usage

        services.k3s.extraFlags = builtins.toString [

        services.k3s.extraFlags = [

          "--disable coredns"

          "--disable local-storage"

          "--disable metrics-server"

nixos/tests/k3s/etcd.nix

+7 −13
Original line number Diff line number Diff line
@@ -50,20 +50,14 @@ import ../make-test-python.nix ( 
          services.k3s = {

            enable = true;

            role = "server";

            extraFlags = builtins.toString [

            extraFlags = [

              "--datastore-endpoint=\"http://192.168.1.1:2379\""

              "--disable"

              "coredns"

              "--disable"

              "local-storage"

              "--disable"

              "metrics-server"

              "--disable"

              "servicelb"

              "--disable"

              "traefik"

              "--node-ip"

              "192.168.1.2"

              "--disable coredns"

              "--disable local-storage"

              "--disable metrics-server"

              "--disable servicelb"

              "--disable traefik"

              "--node-ip 192.168.1.2"

            ];

          };

nixos/tests/k3s/multi-node.nix

+8 −15
Original line number Diff line number Diff line
@@ -76,21 +76,14 @@ import ../make-test-python.nix ( 
            role = "server";

            package = k3s;

            clusterInit = true;

            extraFlags = builtins.toString [

              "--disable"

              "coredns"

              "--disable"

              "local-storage"

              "--disable"

              "metrics-server"

              "--disable"

              "servicelb"

              "--disable"

              "traefik"

              "--node-ip"

              "192.168.1.1"

              "--pause-image"

              "test.local/pause:local"

            extraFlags = [

              "--disable coredns"

              "--disable local-storage"

              "--disable metrics-server"

              "--disable servicelb"

              "--disable traefik"

              "--node-ip 192.168.1.1"

              "--pause-image test.local/pause:local"

            ];

          };

          networking.firewall.allowedTCPPorts = [

nixos/tests/k3s/single-node.nix

+7 −13
Original line number Diff line number Diff line
@@ -58,19 +58,13 @@ import ../make-test-python.nix ( 
        services.k3s.role = "server";

        services.k3s.package = k3s;

        # Slightly reduce resource usage

        services.k3s.extraFlags = builtins.toString [

          "--disable"

          "coredns"

          "--disable"

          "local-storage"

          "--disable"

          "metrics-server"

          "--disable"

          "servicelb"

          "--disable"

          "traefik"

          "--pause-image"

          "test.local/pause:local"

        services.k3s.extraFlags = [

          "--disable coredns"

          "--disable local-storage"

          "--disable metrics-server"

          "--disable servicelb"

          "--disable traefik"

          "--pause-image test.local/pause:local"

        ];



        users.users = {