oceanbox/platform
6
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Improvements here and there.

Browse Source
This commit is contained in:
Jonas Juselius
2018-05-23 13:48:03 +02:00
parent 17e4e740ea
commit 39b51fd978
5 changed files with 52 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
kube0.nix
View File

@@ -8,7 +8,9 @@ let
"10.0.0.1", "10.0.0.1",
"127.0.0.1", "127.0.0.1",
"kubernetes", "kubernetes",
"kubernetes.default.svc",
"etcd0", "etcd0",
"fs0-2",
"k0-0" "k0-0"
''; '';
kube-proxy = pki.kube-proxy; kube-proxy = pki.kube-proxy;
@@ -31,45 +33,55 @@ let
}; };
cluster = callPackage ./lib/k8s.nix { cluster = callPackage ./lib/k8s.nix {
masterNode = "10.253.18.100"; masterNode = "10.253.18.100";
etcdNodes = [ etcdNodes = [ "etcd0" "etcd1" "etcd2" ];
"10.253.18.100"
"10.253.18.101"
"10.253.18.102"
];
clusterHosts = '' clusterHosts = ''
10.253.18.100 k0-0 etcd0 kubernetes 10.253.18.100 k0-0 etcd0 kubernetes itp-registry
10.253.18.101 k0-1 etcd1 10.253.18.101 k0-1 etcd1
10.253.18.102 k0-2 etcd2 10.253.18.102 k0-2 etcd2
10.253.18.103 k0-3 10.253.18.103 k0-3
10.253.18.107 k0-4 10.253.18.107 k0-4
10.253.18.108 k0-5 10.253.18.108 k0-5
10.253.18.106 fs0-0 10.253.18.106 fs0-0 fs0-0.local
10.1.2.164 fs0-1 10.1.2.164 fs0-1 fs0-1.local
10.253.18.100 fs0-2 fs0-2.local
''; '';
inherit certs; inherit certs;
}; };
in in
{ {
# k0-0 = { ... }: { k0-0 = { ... }: {
# require = [ (cluster.apiserver "10.253.18.100" "k0-0" "etcd0") ]; require = [ (cluster.apiserver "10.253.18.100" "k0-0" "etcd0") ];
# services.glusterfs = { boot.kernelModules = [
# enable = true; "dm_snapshot"
# tlsSettings = { "dm_mirror"
# caCert = certs.ca.cert; "dm_thin_pool"
# tlsKeyPath = certs.fs0.key; ];
# tlsPem = certs.fs0.cert; services.dnsmasq.enable = true;
# }; fileSystems."/data" = {
# }; device = "k0-0:gv0";
# networking.firewall.extraCommands = '' fsType = "glusterfs";
# iptables -I INPUT -p all -s 10.253.18.100 -j ACCEPT };
# iptables -I INPUT -p all -s 10.253.18.106 -j ACCEPT environment.systemPackages = [ pkgs.lvm2 ];
# iptables -I INPUT -p all -s 10.1.2.164 -j ACCEPT networking.extraHosts = ''
# ''; 10.253.18.100 itp-registry itp-registry.local
# }; 10.253.18.100 nuget.local
k0-0 = cluster.apiserver "10.253.18.100" "k0-0" "etcd0"; 10.253.18.100 kibana.local
10.253.18.100 dashboard.cluster.local
10.253.18.100 gitlab.cluster.local
10.253.18.100 baywash.cluster.local
'';
};
k0-1 = cluster.server "10.253.18.101" "k0-1" "etcd1"; k0-1 = cluster.server "10.253.18.101" "k0-1" "etcd1";
k0-2 = cluster.server "10.253.18.102" "k0-2" "etcd2"; k0-2 = cluster.server "10.253.18.102" "k0-2" "etcd2";
k0-3 = cluster.worker "10.253.18.103" "k0-3"; k0-3 = cluster.worker "10.253.18.103" "k0-3";
k0-4 = cluster.worker "10.253.18.107" "k0-4"; k0-4 = cluster.worker "10.253.18.107" "k0-4";
k0-5 = cluster.worker "10.253.18.108" "k0-5"; k0-5 = cluster.worker "10.253.18.108" "k0-5";
# k0-0 = cluster.plain "10.253.18.100" "k0-0";
# k0-1 = cluster.plain "10.253.18.101" "k0-1";
# k0-2 = cluster.plain "10.253.18.102" "k0-2";
# k0-3 = cluster.plain "10.253.18.103" "k0-3";
# k0-4 = cluster.plain "10.253.18.107" "k0-4";
# k0-5 = cluster.plain "10.253.18.108" "k0-5";
} }

6
nixos/configuration.nix
View File

@@ -41,4 +41,10 @@
(import ./overlays/overlays.nix) (import ./overlays/overlays.nix)
]; ];
users.extraUsers.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCGrS7PzjPhVnHftYRw7iCD5K1UXnxtFMS0zVLcGH3u daniel.stien@itpartner.no"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPVcSD8T9m7xuSRWrhEDEUvPrP8hxYW0WndYjTjtCjY3 itpartner@k0-0"
];
} }

4
nixos/hardware-configuration/k0-0.nix
View File

@@ -14,6 +14,10 @@
{ device = "/dev/disk/by-uuid/46951acf-de3e-44c3-8d9d-4aa97e691630"; { device = "/dev/disk/by-uuid/46951acf-de3e-44c3-8d9d-4aa97e691630";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/vol/brick0" =
{ device = "/dev/gfs_vg/brick0";
fsType = "ext4";
};
swapDevices = [ ]; swapDevices = [ ];

5
nixos/overlays/overlays.nix
View File

@@ -1,4 +1,7 @@
self: super: { self: super: {
dockerTools = super.callPackage ./overlay/default.nix { go = self.go_1_9; }; dockerTools = super.callPackage ./default.nix { go = self.go_1_9; };
# glusterfs = super.glusterfs.overrideAttrs (old: {
# buildInputs = old.buildInputs ++ [ self.lvm2 ];
# });
# super.config.services.kubernetes = super.callPackage ./overlay/kubernetes.nix {}; # super.config.services.kubernetes = super.callPackage ./overlay/kubernetes.nix {};
} }

6
nixos/users.nix
View File

@@ -19,14 +19,10 @@
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCGrS7PzjPhVnHftYRw7iCD5K1UXnxtFMS0zVLcGH3u daniel.stien@itpartner.no" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCGrS7PzjPhVnHftYRw7iCD5K1UXnxtFMS0zVLcGH3u daniel.stien@itpartner.no"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDUqiMnQAj5ZkFLjtBLGkVJy2/uH/dnql/92BUMs8a/W7QULnocC2y08dlD+gITP+iKUFYasrYvqBgzKWvxsJmEodkMNr7iBUlKdjiVZNWEM38IgoZbd0iDYIUyDyIlGWRfshc00FX3ecplmylZcDXqFKtGSAafQAt8wZdNmzaHiC0hBYz3x9i2x0lWcq7UXXdNd581BMNj1FqObIoKetKy+4MxZP3oc061HjIxx9m5D6krsWjz+tgkTgjrJGaMKz8aOiLYDw4F9iQSAISeVBSGNU9laPAmbi4t8tcgvBYZVo76GuhLMxRGj6Om2vOJDvbX2mYrSAJ8g5279gbC7mJddEczCyiewt5bRYVzajC8k46bAsxMMkXOVT6YnCz/0X0d8FGlA96NPn2W9oohD2Jx0fVPNJ055AcxU+WYWe5WvCYUAePaUJW/EZSPPY08di4yoJzaJASXCrXtd7aZCh2ndxbZrn3m2KAbjuoBo69CenQGkBM+HjefMFnr9QCiqz2UbrotdQCzPUG1nwhqN409vg7VYQdWuN7wtFBVK7geG/dAJZBbxngNCdcCC4fQUuXV/DjQqOkCkItCYyTRHUHX/Qrdsfm6wrJfcZy5CZQkz9H2/HuMwG7jaiACI+5nAz0A7S6eKnlkoSM9sAOVsP6S4m9eLwbK6GfM4hoeCjNisQ== dag.brattli@itpartner.no"
]; ];
}; };
users.extraUsers.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCGrS7PzjPhVnHftYRw7iCD5K1UXnxtFMS0zVLcGH3u daniel.stien@itpartner.no"
];
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
security.sudo.extraConfig = security.sudo.extraConfig =
'' ''