k8s cluster working & update

This commit is contained in:
ari committed 2024-11-08 22:22:09 -05:00
1 parent f703c93d3a
commit a27d701bac
10 files changed
+34 -27

No files matched your search

+1
View File
@@ -52,6 +52,7 @@ in
htop
nnn
thefuck
fastfetch
]
++ (if enableDevelopmentKit then [
devenv
+2 -2
View File
@@ -25,8 +25,8 @@
skyg.networkDrives.enable = enableNetworkDrives;
skyg.nixos.common.containers = (if os.enable then os.containers else { });
skyg.nixos.server.k8s = {
masterIP = "10.0.10.8";
masterHostName = "terra1.lab.internal";
masterIP = "10.0.10.6";
masterHostName = "minipc1.lab.internal";
};
system.stateVersion = systemStateVersion;
nixpkgs.config.allowUnfree = true;
+2 -1
View File
@@ -13,6 +13,8 @@ in
"Enable K8s";
isMaster = lib.mkEnableOption
"Enable as master";
isNode = lib.mkEnableOption
"Enable as node";
masterIP = lib.mkOption {
type = lib.types.str;
};
@@ -33,7 +35,6 @@ in
10250 # kubelet api
10259 # kubelet scheduler
10257 # kubelet controller
8888 # no idea what this is
];
portRanges = [
{ from = 2379; to = 2380; } # etcd
+7 -1
View File
@@ -4,8 +4,14 @@ let
in
{
config = lib.mkIf (cfg.enable && cfg.isMaster) {
networking.firewall.allowedUDPPorts = [
8888 # open cfssl
];
networking.firewall.allowedTCPPorts = [
8888 # open cfssl
];
services.kubernetes = {
roles = [ "master" ];
roles = if cfg.isNode then [ "master" "node" ] else [ "master" ];
apiserver = {
securePort = cfg.masterAPIPort;
advertiseAddress = cfg.masterIP;
+1 -1
View File
@@ -3,7 +3,7 @@ let
cfg = config.skyg.nixos.server.k8s;
in
{
config = lib.mkIf (cfg.enable && (!cfg.isMaster)) {
config = lib.mkIf (cfg.enable && (!cfg.isMaster) && cfg.isNode) {
services.kubernetes = {
roles = [ "node" ];
kubelet.kubeconfig.server = "https://${cfg.masterHostName}:${toString cfg.masterAPIPort}";