public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos: move kubernetes & fleet to services/cluster

Browse Source
This commit is contained in:
Jaka Hudoklin 2014-12-11 23:32:37 +01:00
parent 1465d9321d
commit 4be1089781
6 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/module-list.nix
View File

@ -102,6 +102,8 @@
./services/backup/rsnapshot.nix ./services/backup/rsnapshot.nix
./services/backup/sitecopy-backup.nix ./services/backup/sitecopy-backup.nix
./services/backup/tarsnap.nix ./services/backup/tarsnap.nix
./services/cluster/fleet.nix
./services/cluster/kubernetes.nix
./services/computing/torque/server.nix ./services/computing/torque/server.nix
./services/computing/torque/mom.nix ./services/computing/torque/mom.nix
./services/continuous-integration/jenkins/default.nix ./services/continuous-integration/jenkins/default.nix
@ -400,8 +402,6 @@
./virtualisation/container-config.nix ./virtualisation/container-config.nix
./virtualisation/containers.nix ./virtualisation/containers.nix
./virtualisation/docker.nix ./virtualisation/docker.nix
./virtualisation/fleet.nix
./virtualisation/kubernetes.nix
./virtualisation/libvirtd.nix ./virtualisation/libvirtd.nix
./virtualisation/lxc.nix ./virtualisation/lxc.nix
#./virtualisation/nova.nix #./virtualisation/nova.nix

4
nixos/modules/virtualisation/fleet.nix → nixos/modules/services/cluster/fleet.nix
View File

@ -3,12 +3,12 @@
with lib; with lib;
let let
cfg = config.virtualisation.fleet; cfg = config.services.fleet;
in { in {
##### Interface ##### Interface
options.virtualisation.fleet = { options.services.fleet = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;

16
nixos/modules/virtualisation/kubernetes.nix → nixos/modules/services/cluster/kubernetes.nix
View File

@ -3,13 +3,13 @@
with lib; with lib;
let let
cfg = config.virtualisation.kubernetes; cfg = config.services.kubernetes;
in { in {
###### interface ###### interface
options.virtualisation.kubernetes = { options.services.kubernetes = {
package = mkOption { package = mkOption {
description = "Kubernetes package to use."; description = "Kubernetes package to use.";
type = types.package; type = types.package;
@ -420,15 +420,15 @@ in {
}) })
(mkIf (any (el: el == "master") cfg.roles) { (mkIf (any (el: el == "master") cfg.roles) {
virtualisation.kubernetes.apiserver.enable = mkDefault true; services.kubernetes.apiserver.enable = mkDefault true;
virtualisation.kubernetes.scheduler.enable = mkDefault true; services.kubernetes.scheduler.enable = mkDefault true;
virtualisation.kubernetes.controllerManager.enable = mkDefault true; services.kubernetes.controllerManager.enable = mkDefault true;
}) })
(mkIf (any (el: el == "node") cfg.roles) { (mkIf (any (el: el == "node") cfg.roles) {
virtualisation.docker.enable = mkDefault true; virtualisation.docker.enable = mkDefault true;
virtualisation.kubernetes.kubelet.enable = mkDefault true; services.kubernetes.kubelet.enable = mkDefault true;
virtualisation.kubernetes.proxy.enable = mkDefault true; services.kubernetes.proxy.enable = mkDefault true;
}) })
(mkIf (any (el: el == "node" || el == "master") cfg.roles) { (mkIf (any (el: el == "node" || el == "master") cfg.roles) {
@ -442,7 +442,7 @@ in {
cfg.kubelet.enable || cfg.kubelet.enable ||
cfg.proxy.enable cfg.proxy.enable
) { ) {
virtualisation.kubernetes.package = mkDefault pkgs.kubernetes; services.kubernetes.package = mkDefault pkgs.kubernetes;
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];

4
nixos/tests/fleet.nix
View File

@ -14,7 +14,7 @@ import ./make-test.nix rec {
}; };
}; };
virtualisation.fleet = { services.fleet = {
enable = true; enable = true;
metadata.name = "node1"; metadata.name = "node1";
}; };
@ -34,7 +34,7 @@ import ./make-test.nix rec {
}; };
}; };
virtualisation.fleet = { services.fleet = {
enable = true; enable = true;
metadata.name = "node2"; metadata.name = "node2";
}; };

4
nixos/tests/kubernetes.nix
View File

@ -48,7 +48,7 @@ import ./make-test.nix rec {
{ config, pkgs, lib, nodes, ... }: { config, pkgs, lib, nodes, ... }:
{ {
virtualisation.memorySize = 512; virtualisation.memorySize = 512;
virtualisation.kubernetes = { services.kubernetes = {
roles = ["master" "node"]; roles = ["master" "node"];
controllerManager.machines = ["master" "node"]; controllerManager.machines = ["master" "node"];
kubelet.extraOpts = "-network_container_image=master:5000/pause"; kubelet.extraOpts = "-network_container_image=master:5000/pause";
@ -92,7 +92,7 @@ import ./make-test.nix rec {
node = node =
{ config, pkgs, lib, nodes, ... }: { config, pkgs, lib, nodes, ... }:
{ {
virtualisation.kubernetes = { services.kubernetes = {
roles = ["node"]; roles = ["node"];
kubelet.extraOpts = "-network_container_image=master:5000/pause"; kubelet.extraOpts = "-network_container_image=master:5000/pause";
verbose = true; verbose = true;

25
nixos/tests/mesos.nix Normal file
View File

@ -0,0 +1,25 @@
import ./make-test.nix {
name = "simple";
machine = { config, pkgs, ... }: {
services.zookeeper.enable = true;
virtualistaion.docker.enable = true;
services.mesos = {
slave = {
enable = true;
master = "zk://localhost:2181/mesos";
};
master = {
enable = true;
zk = "zk://localhost:2181/mesos";
};
};
};
testScript =
''
startAll;
$machine->waitForUnit("mesos-master.service");
$machine->waitForUnit("mesos-slave.service");
'';
}