Making sure that k8s is properly distributed
This commit is contained in:
1 parent
9f120c4352
commit
3f1b8a2b3e
6 files changed
+45
-22
No files matched your search
@@ -53,9 +53,10 @@ in
|
|||||||
networking.firewall.allowedUDPPorts = openPorts;
|
networking.firewall.allowedUDPPorts = openPorts;
|
||||||
networking.firewall.allowedTCPPorts = openPorts;
|
networking.firewall.allowedTCPPorts = openPorts;
|
||||||
# K8s
|
# K8s
|
||||||
|
services.kubernetes.kubelet.hostname = "minipc1.lab.internal";
|
||||||
skyg.nixos.server.k8s = {
|
skyg.nixos.server.k8s = {
|
||||||
enable = true;
|
enable = true;
|
||||||
isMaster = true;
|
isMaster = false;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,6 +33,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
# K8s
|
# K8s
|
||||||
|
services.kubernetes.kubelet.hostname = "minipc2.lab.internal";
|
||||||
skyg.nixos.server.k8s = {
|
skyg.nixos.server.k8s = {
|
||||||
enable = true;
|
enable = true;
|
||||||
isMaster = false;
|
isMaster = false;
|
||||||
|
|||||||
@@ -40,5 +40,11 @@ in
|
|||||||
/mnt/Data/apps 10.0.0.0/16(rw,wdelay,insecure,no_root_squash,no_subtree_check,sec=sys,rw,insecure,no_root_squash,no_all_squash)
|
/mnt/Data/apps 10.0.0.0/16(rw,wdelay,insecure,no_root_squash,no_subtree_check,sec=sys,rw,insecure,no_root_squash,no_all_squash)
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
# K8s
|
||||||
|
services.kubernetes.kubelet.hostname = "terra1.lab.internal";
|
||||||
|
skyg.nixos.server.k8s = {
|
||||||
|
enable = true;
|
||||||
|
isMaster = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
+2
-2
@@ -25,8 +25,8 @@
|
|||||||
skyg.networkDrives.enable = enableNetworkDrives;
|
skyg.networkDrives.enable = enableNetworkDrives;
|
||||||
skyg.nixos.common.containers = (if os.enable then os.containers else { });
|
skyg.nixos.common.containers = (if os.enable then os.containers else { });
|
||||||
skyg.nixos.server.k8s = {
|
skyg.nixos.server.k8s = {
|
||||||
masterIP = "10.0.10.6";
|
masterIP = "10.0.10.8";
|
||||||
masterHostName = "minipc1.lab.internal";
|
masterHostName = "terra1.lab.internal";
|
||||||
};
|
};
|
||||||
system.stateVersion = systemStateVersion;
|
system.stateVersion = systemStateVersion;
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|||||||
@@ -26,22 +26,39 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config =
|
||||||
# resolve master hostname
|
let
|
||||||
networking.extraHosts = "${cfg.masterIP} ${cfg.masterHostName}";
|
ports = [
|
||||||
|
cfg.masterAPIPort # k8s api server
|
||||||
# packages for administration tasks
|
10250 # kubelet api
|
||||||
environment.systemPackages = with pkgs; [
|
10259 # kubelet scheduler
|
||||||
kubectl
|
10257 # kubelet controller
|
||||||
kubernetes
|
8888 # no idea what this is
|
||||||
];
|
];
|
||||||
services.kubernetes = {
|
portRanges = [
|
||||||
masterAddress = cfg.masterHostName;
|
{ from = 2379; to = 2380; } # etcd
|
||||||
easyCerts = true;
|
];
|
||||||
apiserverAddress = "https://${cfg.masterHostName}:${toString cfg.masterAPIPort}";
|
in
|
||||||
addons.dns.enable = true;
|
lib.mkIf cfg.enable {
|
||||||
kubelet.extraOpts = "--fail-swap-on=false";
|
# resolve master hostname
|
||||||
|
networking.extraHosts = "${cfg.masterIP} ${cfg.masterHostName}";
|
||||||
|
networking.firewall.allowedUDPPorts = ports;
|
||||||
|
networking.firewall.allowedUDPPortRanges = portRanges;
|
||||||
|
networking.firewall.allowedTCPPorts = ports;
|
||||||
|
networking.firewall.allowedTCPPortRanges = portRanges;
|
||||||
|
|
||||||
|
# packages for administration tasks
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
kubectl
|
||||||
|
kubernetes
|
||||||
|
];
|
||||||
|
services.kubernetes = {
|
||||||
|
proxy.hostname = cfg.masterHostName;
|
||||||
|
masterAddress = cfg.masterHostName;
|
||||||
|
easyCerts = true;
|
||||||
|
apiserverAddress = "https://${cfg.masterHostName}:${toString cfg.masterAPIPort}";
|
||||||
|
addons.dns.enable = true;
|
||||||
|
kubelet.extraOpts = "--fail-swap-on=false";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
@@ -5,13 +5,11 @@ in
|
|||||||
{
|
{
|
||||||
config = lib.mkIf (cfg.enable && cfg.isMaster) {
|
config = lib.mkIf (cfg.enable && cfg.isMaster) {
|
||||||
services.kubernetes = {
|
services.kubernetes = {
|
||||||
roles = [ "master" "node" ];
|
roles = [ "master" ];
|
||||||
apiserver = {
|
apiserver = {
|
||||||
securePort = cfg.masterAPIPort;
|
securePort = cfg.masterAPIPort;
|
||||||
advertiseAddress = cfg.masterIP;
|
advertiseAddress = cfg.masterIP;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
networking.firewall.allowedUDPPorts = [ cfg.masterAPIPort ];
|
|
||||||
networking.firewall.allowedTCPPorts = [ cfg.masterAPIPort ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user