diff --git a/clusters/k0/default.nix b/clusters/k0/default.nix index ff5e93f..b9e4234 100644 --- a/clusters/k0/default.nix +++ b/clusters/k0/default.nix @@ -3,9 +3,9 @@ let setup = import ../../modules { inherit pkgs cluster customize lib config; }; hosts = [ - { name = "k0-0"; address = "10.1.8.53"; hw = ./k0-0.nix; } - { name = "k0-1"; address = "10.1.8.54"; hw = ./k0-1.nix; } - { name = "k0-2"; address = "10.1.8.55"; hw = ./k0-2.nix; } + { name = "k0-0"; address = "10.1.8.50"; } + { name = "k0-1"; address = "10.1.8.51"; } + { name = "k0-2"; address = "10.1.8.52"; } ]; customize = { @@ -17,7 +17,10 @@ let initca = ./ca; domain = "itpartner.intern"; - searchDomains = [ "itpartner.intern" "itpartner.no" ]; + externalInterface = "eth0"; + defaultGateway = "10.1.8.1"; + nameservers = [ "8.8.8.8" ]; + searchDomains = [ "itpartner.no" ]; extraHosts = import ../hosts.nix; @@ -31,7 +34,7 @@ let cidr = "10.100.0.0/16"; master = builtins.head hosts // { extraSANs = [ "k0.itpartner.no" ]; }; nodes = builtins.tail hosts; - extraIngressNodes = [ "k0-1.itpartner.intern" "k0-2.itpartner.intern" ]; + ingressNodes = [ "k0-0.itpartner.intern" "k0-1.itpartner.intern" "k0-2.itpartner.intern" ]; fileserver = "fs2-0"; charts = { acme_email = "innovasjon@itpartner.no"; @@ -41,4 +44,4 @@ let }; }; in - setup.k8s.mkDeployment + setup.k8s.mkDeployment ./. diff --git a/clusters/k2/default.nix b/clusters/k2/default.nix index 1dd1e84..c4897e6 100644 --- a/clusters/k2/default.nix +++ b/clusters/k2/default.nix @@ -3,11 +3,11 @@ let setup = import ../../modules { inherit pkgs cluster customize lib config; }; hosts = [ - { name = "k2-0"; address = "10.1.8.56"; hw = ./k2-0.nix; } - { name = "k2-1"; address = "10.1.8.57"; hw = ./k2-1.nix; } - { name = "k2-2"; address = "10.1.8.58"; hw = ./k2-2.nix; } - { name = "k2-3"; address = "10.1.8.59"; hw = ./k2-3.nix; } - { name = "k2-4"; address = "10.1.8.60"; hw = ./k2-4.nix; } + { name = "k2-0"; address = "10.1.8.60"; } + { name = "k2-1"; address = "10.1.8.61"; } + { name = "k2-2"; address = "10.1.8.62"; } + { name = "k2-3"; address = "10.1.8.63"; } + { name = "k2-4"; address = "10.1.8.64"; } ]; customize = { @@ -19,7 +19,10 @@ let initca = ./ca; domain = "itpartner.intern"; - searchDomains = [ "itpartner.intern" "itpartner.no" ]; + externalInterface = "eth0"; + defaultGateway = "10.1.8.1"; + nameservers = [ "8.8.8.8" ]; + searchDomains = [ "itpartner.no" ]; extraHosts = import ../hosts.nix; @@ -33,7 +36,7 @@ let cidr = "10.100.0.0/16"; master = builtins.head hosts // { extraSANs = [ "k2.itpartner.no" ]; }; nodes = builtins.tail hosts; - extraIngressNodes = [ "k2-1.itpartner.intern" "k2-2.itpartner.intern" ]; + ingressNodes = [ "k2-0.itpartner.intern" "k2-1.itpartner.intern" "k2-2.itpartner.intern" ]; fileserver = "fs2-0"; charts = { acme_email = "innovasjon@itpartner.no"; @@ -43,4 +46,4 @@ let }; }; in - setup.k8s.mkDeployment + setup.k8s.mkDeployment ./.