Update k2 to use modules
This commit is contained in:
@@ -1,22 +1,24 @@
|
|||||||
with import <nixpkgs> {};
|
with import <nixpkgs> {};
|
||||||
let
|
let
|
||||||
settings = {
|
lib = import ../../lib/default.nix { inherit pkgs cfg customize lib config; };
|
||||||
clusterName = "k2";
|
|
||||||
master = {
|
hosts = [
|
||||||
name = "k2-0"; address = "10.253.18.114";
|
{ name = "k2-1"; address = "10.253.18.115"; hw = ./k2-1.nix; }
|
||||||
extraSANs = [ "k2.itpartner.no" ];
|
{ name = "k2-2"; address = "10.253.18.116"; hw = ./k2-2.nix; }
|
||||||
};
|
{ name = "k2-3"; address = "10.253.18.117"; hw = ./k2-3.nix; }
|
||||||
workers = [
|
{ name = "k2-4"; address = "10.253.18.118"; hw = ./k2-4.nix; }
|
||||||
{ name = "k2-1"; address = "10.253.18.115"; }
|
{ name = "k2-5"; address = "10.253.18.103"; hw = ./k2-5.nix; }
|
||||||
{ name = "k2-2"; address = "10.253.18.116"; }
|
|
||||||
{ name = "k2-3"; address = "10.253.18.117"; }
|
|
||||||
{ name = "k2-4"; address = "10.253.18.118"; }
|
|
||||||
{ name = "k2-5"; address = "10.253.18.103"; }
|
|
||||||
];
|
];
|
||||||
cidr = "10.11.0.0/16";
|
|
||||||
|
customize = {
|
||||||
|
boot.bios = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
cfg = {
|
||||||
|
clusterName = "k2";
|
||||||
initca = ./ca;
|
initca = ./ca;
|
||||||
fileserver = "fs0-0";
|
|
||||||
clusterHosts = ''
|
extraHosts = ''
|
||||||
10.253.18.106 fs0-0 fs0-0.itpartner.no fs0-0.itpartner.intern
|
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.164 fs0-1 fs0-1.itpartner.no fs0-1.itpartner.intern
|
||||||
|
|
||||||
@@ -37,17 +39,28 @@ let
|
|||||||
10.253.18.118 k2-4 k2-4.itpartner.no k2-4.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
|
10.253.18.103 k2-5 k2-5.itpartner.no k2-5.itpartner.intern
|
||||||
'';
|
'';
|
||||||
|
|
||||||
adminAuthorizedKeys = [
|
adminAuthorizedKeys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWEYtm1u3HiK4q4J5su6iKWfFjLXt9CIlm9Z9BfJYVj jens@itpartner@Jens-HP3"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWEYtm1u3HiK4q4J5su6iKWfFjLXt9CIlm9Z9BfJYVj jens@itpartner@Jens-HP3"
|
||||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no"
|
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
k8s.master = {
|
||||||
|
name = "k2-0";
|
||||||
|
address = "10.253.18.114";
|
||||||
|
extraSANs = [ "k2.itpartner.no" ];
|
||||||
|
hw = ./k2-0.nix;
|
||||||
|
};
|
||||||
|
k8s.nodes = hosts;
|
||||||
|
k8s.cidr = "10.11.0.0/16";
|
||||||
|
k8s.fileserver = "fs0-0";
|
||||||
|
k8s.bootstrap = {
|
||||||
acme_email = "innovasjon@itpartner.no";
|
acme_email = "innovasjon@itpartner.no";
|
||||||
grafana_smtp_user = "utvikling";
|
grafana_smtp_user = "utvikling";
|
||||||
grafana_smtp_password = "S0m3rp0m@de#21!";
|
grafana_smtp_password = "S0m3rp0m@de#21!";
|
||||||
grafana_ldap_toml = ''
|
grafana_ldap_toml = ''
|
||||||
verbose_logging = true
|
verbose_logging = true
|
||||||
|
|
||||||
[[servers]]
|
[[servers]]
|
||||||
host = "itp-dc1.itpartner.intern"
|
host = "itp-dc1.itpartner.intern"
|
||||||
port = 636
|
port = 636
|
||||||
@@ -60,8 +73,6 @@ let
|
|||||||
search_base_dns = ["DC=itpartner,DC=intern"]
|
search_base_dns = ["DC=itpartner,DC=intern"]
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
};
|
||||||
in
|
in
|
||||||
import ../../lib/k8s.nix {
|
lib.k8s.mkDeployment cfg.k8s.master hosts
|
||||||
inherit pkgs lib settings;
|
|
||||||
here = ./.;
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user