commit 4be10897817f25336856a0a6bcd20582cb130943 · pyrox.dev/nixpkgs

+2 -2

nixos/modules/module-list.nix

···

       102
       102
        
         ./services/backup/rsnapshot.nix

     

       103
       103
        
         ./services/backup/sitecopy-backup.nix

     

       104
       104
        
         ./services/backup/tarsnap.nix

     

       105
       105
       +
         ./services/cluster/fleet.nix

     

       106
       106
       +
         ./services/cluster/kubernetes.nix

     

       105
       107
        
         ./services/computing/torque/server.nix

     

       106
       108
        
         ./services/computing/torque/mom.nix

     

       107
       109
        
         ./services/continuous-integration/jenkins/default.nix

     
···

       400
       402
        
         ./virtualisation/container-config.nix

     

       401
       403
        
         ./virtualisation/containers.nix

     

       402
       404
        
         ./virtualisation/docker.nix

     

       403
       403
       -
         ./virtualisation/fleet.nix

     

       404
       404
       -
         ./virtualisation/kubernetes.nix

     

       405
       405
        
         ./virtualisation/libvirtd.nix

     

       406
       406
        
         ./virtualisation/lxc.nix

     

       407
       407
        
         #./virtualisation/nova.nix

+2 -2

nixos/modules/virtualisation/fleet.nix nixos/modules/services/cluster/fleet.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         cfg = config.virtualisation.fleet;

     

       6
       6
       +
         cfg = config.services.fleet;

     

       7
       7
        
       

     

       8
       8
        
       in {

     

       9
       9
        
       

     

       10
       10
        
         ##### Interface

     

       11
       11
       -
         options.virtualisation.fleet = {

     

       11
       11
       +
         options.services.fleet = {

     

       12
       12
        
           enable = mkOption {

     

       13
       13
        
             type = types.bool;

     

       14
       14
        
             default = false;

+8 -8

nixos/modules/virtualisation/kubernetes.nix nixos/modules/services/cluster/kubernetes.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         cfg = config.virtualisation.kubernetes;

     

       6
       6
       +
         cfg = config.services.kubernetes;

     

       7
       7
        
       

     

       8
       8
        
       in {

     

       9
       9
        
       

     

       10
       10
        
         ###### interface

     

       11
       11
        
       

     

       12
       12
       -
         options.virtualisation.kubernetes = {

     

       12
       12
       +
         options.services.kubernetes = {

     

       13
       13
        
           package = mkOption {

     

       14
       14
        
             description = "Kubernetes package to use.";

     

       15
       15
        
             type = types.package;

     
···

       420
       420
        
           })

     

       421
       421
        
       

     

       422
       422
        
           (mkIf (any (el: el == "master") cfg.roles) {

     

       423
       423
       -
             virtualisation.kubernetes.apiserver.enable = mkDefault true;

     

       424
       424
       -
             virtualisation.kubernetes.scheduler.enable = mkDefault true;

     

       425
       425
       -
             virtualisation.kubernetes.controllerManager.enable = mkDefault true;

     

       423
       423
       +
             services.kubernetes.apiserver.enable = mkDefault true;

     

       424
       424
       +
             services.kubernetes.scheduler.enable = mkDefault true;

     

       425
       425
       +
             services.kubernetes.controllerManager.enable = mkDefault true;

     

       426
       426
        
           })

     

       427
       427
        
       

     

       428
       428
        
           (mkIf (any (el: el == "node") cfg.roles) {

     

       429
       429
        
             virtualisation.docker.enable = mkDefault true;

     

       430
       430
       -
             virtualisation.kubernetes.kubelet.enable = mkDefault true;

     

       431
       431
       -
             virtualisation.kubernetes.proxy.enable = mkDefault true;

     

       430
       430
       +
             services.kubernetes.kubelet.enable = mkDefault true;

     

       431
       431
       +
             services.kubernetes.proxy.enable = mkDefault true;

     

       432
       432
        
           })

     

       433
       433
        
       

     

       434
       434
        
           (mkIf (any (el: el == "node" || el == "master") cfg.roles) {

     
···

       442
       442
        
               cfg.kubelet.enable ||

     

       443
       443
        
               cfg.proxy.enable

     

       444
       444
        
           ) {

     

       445
       445
       -
             virtualisation.kubernetes.package = mkDefault pkgs.kubernetes; 

     

       445
       445
       +
             services.kubernetes.package = mkDefault pkgs.kubernetes;

     

       446
       446
        
       

     

       447
       447
        
             environment.systemPackages = [ cfg.package ];

     

       448
       448

+2 -2

nixos/tests/fleet.nix

···

       14
       14
        
                   };

     

       15
       15
        
                };

     

       16
       16
        
       

     

       17
       17
       -
                 virtualisation.fleet = {

     

       17
       17
       +
                 services.fleet = {

     

       18
       18
        
                   enable = true;

     

       19
       19
        
                   metadata.name = "node1";

     

       20
       20
        
                 };

     
···

       34
       34
        
                   };

     

       35
       35
        
                  };

     

       36
       36
        
       

     

       37
       37
       -
                 virtualisation.fleet = {

     

       37
       37
       +
                 services.fleet = {

     

       38
       38
        
                   enable = true;

     

       39
       39
        
                   metadata.name = "node2";

     

       40
       40
        
                 };

+2 -2

nixos/tests/kubernetes.nix

···

       48
       48
        
             { config, pkgs, lib, nodes, ... }:

     

       49
       49
        
               {

     

       50
       50
        
                 virtualisation.memorySize = 512;

     

       51
       51
       -
                 virtualisation.kubernetes = {

     

       51
       51
       +
                 services.kubernetes = {

     

       52
       52
        
                   roles = ["master" "node"];

     

       53
       53
        
                   controllerManager.machines = ["master" "node"];

     

       54
       54
        
                   kubelet.extraOpts = "-network_container_image=master:5000/pause";

     
···

       92
       92
        
           node =

     

       93
       93
        
             { config, pkgs, lib, nodes, ... }:

     

       94
       94
        
               {

     

       95
       95
       -
                 virtualisation.kubernetes = {

     

       95
       95
       +
                 services.kubernetes = {

     

       96
       96
        
                   roles = ["node"];

     

       97
       97
        
                   kubelet.extraOpts = "-network_container_image=master:5000/pause";

     

       98
       98
        
                   verbose = true;

+25

nixos/tests/mesos.nix

···

       1
       1
       +
       import ./make-test.nix {

     

       2
       2
       +
         name = "simple";

     

       3
       3
       +
       

     

       4
       4
       +
         machine = { config, pkgs, ... }: {

     

       5
       5
       +
           services.zookeeper.enable = true;

     

       6
       6
       +
           virtualistaion.docker.enable = true;

     

       7
       7
       +
           services.mesos = {

     

       8
       8
       +
             slave = {

     

       9
       9
       +
               enable = true;

     

       10
       10
       +
               master = "zk://localhost:2181/mesos";

     

       11
       11
       +
             };

     

       12
       12
       +
             master = {

     

       13
       13
       +
               enable = true;

     

       14
       14
       +
               zk = "zk://localhost:2181/mesos";

     

       15
       15
       +
             };

     

       16
       16
       +
           };

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         testScript =

     

       20
       20
       +
           ''

     

       21
       21
       +
             startAll;

     

       22
       22
       +
             $machine->waitForUnit("mesos-master.service");

     

       23
       23
       +
             $machine->waitForUnit("mesos-slave.service");

     

       24
       24
       +
           '';

     

       25
       25
       +
       }