Update k0 to use modules

This commit is contained in:
Jonas Juselius
2020-10-30 16:15:46 +01:00
parent 45487af168
commit a45d6ba52a

View File

@@ -1,19 +1,17 @@
with import <nixpkgs> {}; with import <nixpkgs> {};
let let
settings = { lib = import ../../lib/default.nix { inherit pkgs cfg lib config; };
hosts = [
{ name = "k0-1"; address = "10.253.18.101"; hw = ./k0-1.nix; }
{ name = "k0-2"; address = "10.253.18.102"; hw = ./k0-2.nix; }
];
cfg = {
clusterName = "k0"; clusterName = "k0";
master = {
name = "k0-0"; address = "10.253.18.100";
extraSANs = [ "k0.itpartner.no" ];
};
workers = [
{ name = "k0-1"; address = "10.253.18.101"; }
{ name = "k0-2"; address = "10.253.18.102"; }
];
cidr = "10.11.0.0/16";
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
@@ -34,31 +32,40 @@ 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"
]; ];
acme_email = "innovasjon@itpartner.no";
grafana_smtp_user = "utvikling";
grafana_smtp_password = "S0m3rp0m@de#21!";
grafana_ldap_toml = ''
verbose_logging = true
[[servers]] k8s.master = {
host = "itp-dc1.itpartner.intern" name = "k0-0";
port = 636 address = "10.253.18.100";
use_ssl = true extraSANs = [ "k0.itpartner.no" ];
start_tls = false hw = ./k0-0.nix;
ssl_skip_verify = true };
bind_dn = "gitlab@itpartner.intern" k8s.nodes = hosts;
bind_password = "hipp hopp snipp snopp" k8s.cidr = "10.11.0.0/16";
search_filter = "(&(objectClass=user)(objectClass=person)(|(sAMAccountName=%s)(mail=%s)))" k8s.fileserver = "fs0-0";
search_base_dns = ["DC=itpartner,DC=intern"] k8s.bootstrap = {
''; acme_email = "innovasjon@itpartner.no";
grafana_smtp_user = "utvikling";
grafana_smtp_password = "S0m3rp0m@de#21!";
grafana_ldap_toml = ''
verbose_logging = true
[[servers]]
host = "itp-dc1.itpartner.intern"
port = 636
use_ssl = true
start_tls = false
ssl_skip_verify = true
bind_dn = "gitlab@itpartner.intern"
bind_password = "hipp hopp snipp snopp"
search_filter = "(&(objectClass=user)(objectClass=person)(|(sAMAccountName=%s)(mail=%s)))"
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 = ./.;
}