diff --git a/flake.nix b/flake.nix index 75af120..21246f7 100644 --- a/flake.nix +++ b/flake.nix @@ -1,17 +1,17 @@ { description = "flake to deploy and manage cccb k8s cluster"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - nixpkgs-k8s.url = "github:NixOS/nixpkgs/4acc7f1d238d2b4f5d86bc65ca9b703d802e6e02"; # kubernetes 1.33.4 + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs-k8s.url = "github:NixOS/nixpkgs/771c08bfa8c7da5ab251a1d0d56fb01948f45473"; # kubernetes 1.34.3 flake-utils.url = "github:numtide/flake-utils"; agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; - # k8nix = { - # url = "gitlab:luxzeitlos/k8nix/develop"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + # k8nix = { + # url = "gitlab:luxzeitlos/k8nix/develop"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; }; outputs = inputs@{ @@ -20,7 +20,7 @@ nixpkgs-k8s, flake-utils, agenix, - # k8nix, + # k8nix, }: { nixosConfigurations = (import ./nixosConfigurations.nix inputs); @@ -42,7 +42,7 @@ # debugging age - etcd + etcd_3_6 openssl ]; }; diff --git a/nixosConfigurations.nix b/nixosConfigurations.nix index 9c272eb..90767ed 100644 --- a/nixosConfigurations.nix +++ b/nixosConfigurations.nix @@ -21,7 +21,6 @@ let #}; }; } - ./common.nix ]; mkSystem = extraModules: @@ -52,20 +51,25 @@ let in { "k8s" = mkSystem [ - ./configuration.nix + # ./configuration.nix { virtualisation = { useEFIBoot = true; - libvirtd.enable = true; + libvirtd = { + enable = true; + nss.enableGuest = true; + startDelay = 1; + onShutdown = "shutdown"; + }; }; } ]; - "master-01" = mkControlPlaneNode []; - "master-02" = mkControlPlaneNode []; - "master-03" = mkControlPlaneNode []; - "worker-01" = mkWorkerNode []; - "worker-02" = mkWorkerNode []; - "worker-03" = mkWorkerNode []; - "worker-04" = mkWorkerNode []; - "worker-05" = mkWorkerNode []; + "master-01" = mkControlPlaneNode [ ]; + "master-02" = mkControlPlaneNode [ ]; + "master-03" = mkControlPlaneNode [ ]; + "worker-01" = mkWorkerNode [ ]; + "worker-02" = mkWorkerNode [ ]; + "worker-03" = mkWorkerNode [ ]; + "worker-04" = mkWorkerNode [ ]; + "worker-05" = mkWorkerNode [ ]; }