diff --git a/k8s.nix b/k8s.nix index c23ac87..2b1f3cf 100644 --- a/k8s.nix +++ b/k8s.nix @@ -97,33 +97,42 @@ let networking.firewall.allowedUDPPorts = [ 53 ]; systemd.services.flannel.after = [ "etcd.service" ]; }; + + baseConfig = name: { + networking.hostName = name; + imports = [ "./hw/${name}.nix" ./base/configuration.nix ]; + }; in { k8s0-0 = { config, lib, pkgs, ... }: - let etcd = etcdConfig "etcd0"; in + let + etcd = etcdConfig "etcd0"; + base = baseConfig "k8s0-0"; + in { deployment.targetHost = "10.253.18.100"; - networking.hostName = "k8s0-0"; - imports = [ ./hw/k8s0-0.nix ./base/configuration.nix ]; - require = [ etcd flannelConfig ]; - # require = [ etcd flannelConfig kubeMaster kubeNode ]; + require = [ base etcd flannelConfig ]; + # require = [ base etcd flannelConfig kubeMaster kubeNode ]; }; k8s0-1 = { config, lib, pkgs, ... }: - let etcd = etcdConfig "etcd1"; in + let + etcd = etcdConfig "etcd1"; + base = baseConfig "k8s0-1"; + in { deployment.targetHost = "10.253.18.101"; - networking.hostName = "k8s0-1"; - imports = [ ./hw/k8s0-1.nix ./base/configuration.nix ]; - require = [ etcd flannelConfig ]; - # require = [ etcd flannelConfig kubeNode ]; + require = [ base etcd flannelConfig ]; + # require = [ base etcd flannelConfig kubeNode ]; }; k8s0-2 = { config, lib, pkgs, ... }: + let + base = baseConfig "k8s0-2"; + in { deployment.targetHost = "10.253.18.102"; - networking.hostName = "k8s0-2"; - imports = [ ./hw/k8s0-2.nix ./base/configuration.nix ]; - require = [ flannelConfig ]; + require = [ base flannelConfig ]; + # require = [ base flannelConfig kubeNode ]; }; }