Reorganize project

This commit is contained in:
Jonas Juselius
2020-11-05 10:02:01 +01:00
parent 4876de1547
commit 6fea8b3bc8
57 changed files with 1106 additions and 319 deletions

View File

@@ -1,6 +1,6 @@
with import <nixpkgs> {};
let
setup = import ../../lib/default.nix { inherit pkgs cluster lib config; };
setup = import ../../modules/default.nix { inherit pkgs cluster lib config; };
hosts = [
{ name = "fs0-0"; address = "10.253.18.106"; hw = ./fs0-0.nix; }

View File

@@ -1,6 +1,6 @@
with import <nixpkgs> {};
let
setup = import ../../lib/default.nix { inherit pkgs cluster lib config; };
setup = import ../../modules/default.nix { inherit pkgs cluster lib config; };
hosts = [
{ name = "fs2-0"; address = "10.1.2.117"; hw = ./fs2-0.nix; }
@@ -9,26 +9,7 @@ let
cluster = {
initca = ./ca;
clusterName = "fs2";
extraHosts = ''
10.253.18.106 fs0-0 fs0-0.itpartner.no fs0-0.itpartner.intern
10.253.18.100 k0-0 k0-0.itpartner.no k0-0.itpartner.intern
10.253.18.101 k0-1 k0-1.itpartner.no k0-1.itpartner.intern
10.253.18.102 k0-2 k0-2.itpartner.no k0-2.itpartner.intern
10.253.18.109 k1-0 k1-0.itpartner.no k1-0.itpartner.intern
10.253.18.110 k1-1 k1-1.itpartner.no k1-1.itpartner.intern
10.253.18.111 k1-2 k1-2.itpartner.no k1-2.itpartner.intern
10.253.18.108 k1-3 k1-3.itpartner.no k1-3.itpartner.intern
10.253.18.107 k0-4 k1-4.itpartner.no k1-4.itpartner.intern
10.253.18.114 k2-0 k2-0.itpartner.no k2-0.itpartner.intern
10.253.18.115 k2-1 k2-1.itpartner.no k2-1.itpartner.intern
10.253.18.116 k2-2 k2-2.itpartner.no k2-2.itpartner.intern
10.253.18.117 k2-3 k2-3.itpartner.no k2-3.itpartner.intern
10.253.18.118 k2-4 k2-4.itpartner.no k2-4.itpartner.intern
10.253.18.103 k2-5 k2-5.itpartner.no k2-5.itpartner.intern
'';
extraHosts = import ../hosts.nix;
adminAuthorizedKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"
@@ -39,7 +20,7 @@ let
enable = true;
nfs.enable = true;
nfs.exports = ''
/vol/k2 10.253.18.0/24(insecure,rw,sync,no_subtree_check,crossmnt,fsid=0,no_root_squash)
/vol/export 10.253.18.0/24(insecure,rw,sync,no_subtree_check,crossmnt,fsid=0,no_root_squash)
'';
};
};

22
clusters/hosts.nix Normal file
View File

@@ -0,0 +1,22 @@
''
10.253.18.106 fs0-0 fs0-0.itpartner.no fs0-0.itpartner.intern
10.1.2.164 fs0-1 fs0-1.itpartner.no fs0-1.itpartner.intern
10.1.2.117 fs2-0 fs2-0.itpartner.no fs2-0.itpartner.intern
10.253.18.100 k0-0 k0-0.itpartner.no k0-0.itpartner.intern
10.253.18.101 k0-1 k0-1.itpartner.no k0-1.itpartner.intern
10.253.18.102 k0-2 k0-2.itpartner.no k0-2.itpartner.intern
10.253.18.109 k1-0 k1-0.itpartner.no k1-0.itpartner.intern
10.253.18.110 k1-1 k1-1.itpartner.no k1-1.itpartner.intern
10.253.18.111 k1-2 k1-2.itpartner.no k1-2.itpartner.intern
10.253.18.108 k1-3 k1-3.itpartner.no k1-3.itpartner.intern
10.253.18.107 k0-4 k1-4.itpartner.no k1-4.itpartner.intern
10.253.18.114 k2-0 k2-0.itpartner.no k2-0.itpartner.intern
10.253.18.115 k2-1 k2-1.itpartner.no k2-1.itpartner.intern
10.253.18.116 k2-2 k2-2.itpartner.no k2-2.itpartner.intern
10.253.18.117 k2-3 k2-3.itpartner.no k2-3.itpartner.intern
10.253.18.118 k2-4 k2-4.itpartner.no k2-4.itpartner.intern
10.253.18.103 k2-5 k2-5.itpartner.no k2-5.itpartner.intern
''

View File

@@ -1,6 +1,6 @@
with import <nixpkgs> {};
let
setup = import ../../lib/default.nix { inherit pkgs cluster customize lib config; };
setup = import ../../modules/default.nix { inherit pkgs cluster customize lib config; };
hosts = [
{ name = "k0-1"; address = "10.253.18.101"; hw = ./k0-1.nix; }
@@ -14,28 +14,10 @@ let
cluster = {
clusterName = "k0";
initca = ./ca;
# domain = "itpartner.intern";
# searchDomains = [ "itpartner.intern" "itpartner.no" ];
extraHosts = ''
10.253.18.106 fs0-0 fs0-0.itpartner.no fs0-0.itpartner.intern
10.1.2.164 fs0-1 fs0-1.itpartner.no fs0-1.itpartner.intern
10.253.18.100 k0-0 k0-0.itpartner.no k0-0.itpartner.intern
10.253.18.101 k0-1 k0-1.itpartner.no k0-1.itpartner.intern
10.253.18.102 k0-2 k0-2.itpartner.no k0-2.itpartner.intern
10.253.18.109 k1-0 k1-0.itpartner.no k1-0.itpartner.intern
10.253.18.110 k1-1 k1-1.itpartner.no k1-1.itpartner.intern
10.253.18.111 k1-2 k1-2.itpartner.no k1-2.itpartner.intern
10.253.18.108 k1-3 k1-3.itpartner.no k1-3.itpartner.intern
10.253.18.107 k0-4 k1-4.itpartner.no k1-4.itpartner.intern
10.253.18.114 k2-0 k2-0.itpartner.no k2-0.itpartner.intern
10.253.18.115 k2-1 k2-1.itpartner.no k2-1.itpartner.intern
10.253.18.116 k2-2 k2-2.itpartner.no k2-2.itpartner.intern
10.253.18.117 k2-3 k2-3.itpartner.no k2-3.itpartner.intern
10.253.18.118 k2-4 k2-4.itpartner.no k2-4.itpartner.intern
10.253.18.103 k2-5 k2-5.itpartner.no k2-5.itpartner.intern
'';
extraHosts = import ../hosts.nix;
adminAuthorizedKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"

View File

@@ -1,6 +1,6 @@
with import <nixpkgs> {};
let
setup = import ../../lib/default.nix { inherit pkgs cluster customize lib config; };
setup = import ../../modules/default.nix { inherit pkgs cluster customize lib config; };
hosts = [
{ name = "k1-1"; address = "10.253.18.110"; hw = ./k1-1.nix; }
@@ -16,28 +16,10 @@ let
cluster = {
clusterName = "k2";
initca = ./ca;
domain = "itpartner.intern";
searchDomains = [ "itpartner.intern" "itpartner.no" ];
extraHosts = ''
10.253.18.106 fs0-0 fs0-0.itpartner.no fs0-0.itpartner.intern
10.1.2.164 fs0-1 fs0-1.itpartner.no fs0-1.itpartner.intern
10.253.18.100 k0-0 k0-0.itpartner.no k0-0.itpartner.intern
10.253.18.101 k0-1 k0-1.itpartner.no k0-1.itpartner.intern
10.253.18.102 k0-2 k0-2.itpartner.no k0-2.itpartner.intern
10.253.18.109 k1-0 k1-0.itpartner.no k1-0.itpartner.intern
10.253.18.110 k1-1 k1-1.itpartner.no k1-1.itpartner.intern
10.253.18.111 k1-2 k1-2.itpartner.no k1-2.itpartner.intern
10.253.18.108 k1-3 k1-3.itpartner.no k1-3.itpartner.intern
10.253.18.107 k0-4 k1-4.itpartner.no k1-4.itpartner.intern
10.253.18.114 k2-0 k2-0.itpartner.no k2-0.itpartner.intern
10.253.18.115 k2-1 k2-1.itpartner.no k2-1.itpartner.intern
10.253.18.116 k2-2 k2-2.itpartner.no k2-2.itpartner.intern
10.253.18.117 k2-3 k2-3.itpartner.no k2-3.itpartner.intern
10.253.18.118 k2-4 k2-4.itpartner.no k2-4.itpartner.intern
10.253.18.103 k2-5 k2-5.itpartner.no k2-5.itpartner.intern
'';
extraHosts = import ../hosts.nix;
adminAuthorizedKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"

View File

@@ -1,6 +1,6 @@
with import <nixpkgs> {};
let
setup = import ../../lib/default.nix { inherit pkgs cluster customize lib config; };
setup = import ../../modules/default.nix { inherit pkgs cluster customize lib config; };
hosts = [
{ name = "k2-1"; address = "10.253.18.115"; hw = ./k2-1.nix; }
@@ -17,28 +17,10 @@ let
cluster = {
clusterName = "k2";
initca = ./ca;
# domain = "itpartner.intern";
# searchDomains = [ "itpartner.intern" "itpartner.no" ];
extraHosts = ''
10.253.18.106 fs0-0 fs0-0.itpartner.no fs0-0.itpartner.intern
10.1.2.164 fs0-1 fs0-1.itpartner.no fs0-1.itpartner.intern
10.253.18.100 k0-0 k0-0.itpartner.no k0-0.itpartner.intern
10.253.18.101 k0-1 k0-1.itpartner.no k0-1.itpartner.intern
10.253.18.102 k0-2 k0-2.itpartner.no k0-2.itpartner.intern
10.253.18.109 k1-0 k1-0.itpartner.no k1-0.itpartner.intern
10.253.18.110 k1-1 k1-1.itpartner.no k1-1.itpartner.intern
10.253.18.111 k1-2 k1-2.itpartner.no k1-2.itpartner.intern
10.253.18.108 k1-3 k1-3.itpartner.no k1-3.itpartner.intern
10.253.18.107 k0-4 k1-4.itpartner.no k1-4.itpartner.intern
10.253.18.114 k2-0 k2-0.itpartner.no k2-0.itpartner.intern
10.253.18.115 k2-1 k2-1.itpartner.no k2-1.itpartner.intern
10.253.18.116 k2-2 k2-2.itpartner.no k2-2.itpartner.intern
10.253.18.117 k2-3 k2-3.itpartner.no k2-3.itpartner.intern
10.253.18.118 k2-4 k2-4.itpartner.no k2-4.itpartner.intern
10.253.18.103 k2-5 k2-5.itpartner.no k2-5.itpartner.intern
'';
extraHosts = import ../hosts.nix;
adminAuthorizedKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"

View File

@@ -1,22 +0,0 @@
with import <nixpkgs> {};
let
settings = rec {
master = "node1";
workers = [ "node2" ];
masterAddress = "10.10.10.1";
apiserverAddress = "https://${masterAddress}:4443";
clusterHosts = ''
10.10.10.1 node1 kubernetes
10.10.10.2 node2
10.10.20.1 fs1
'';
adminAuthorizedKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf admin"
];
};
cluster = callPackage ../../lib/k8s.nix { here = ./.; inherit settings; };
in
{
node1 = cluster.apiserver "10.10.10.1" "node1";
node2 = cluster.worker "10.10.10.2" "node2";
}

View File

@@ -1,21 +0,0 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, ... }:
{
imports = [ ];
boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "floppy" "sd_mod" "sr_mod" ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
swapDevices = [ ];
nix.maxJobs = lib.mkDefault 1;
}

View File

@@ -1,21 +0,0 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, ... }:
{
imports = [ ];
boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "floppy" "sd_mod" "sr_mod" ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
swapDevices = [ ];
nix.maxJobs = lib.mkDefault 1;
}