From 63313fd33778847d2df023294d8e0057969a0787 Mon Sep 17 00:00:00 2001 From: Yadunand Prem Date: Tue, 8 Oct 2024 09:56:22 -0400 Subject: [PATCH] feat: disable rest of cluster --- apps/prod/kustomization.yaml | 2 +- flake.lock | 24 ++++++++++++------------ flake.nix | 11 ++++------- infra/controllers/kustomization.yaml | 4 ++-- nixos/server/configuration.nix | 2 +- nixos/server/nodes.nix | 8 ++++++++ 6 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 nixos/server/nodes.nix diff --git a/apps/prod/kustomization.yaml b/apps/prod/kustomization.yaml index 4762af7..356a48a 100644 --- a/apps/prod/kustomization.yaml +++ b/apps/prod/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../base/podinfo.yaml + # - ../base/podinfo.yaml diff --git a/flake.lock b/flake.lock index 965a8ae..4bf1ac9 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1727977578, - "narHash": "sha256-DBORKcmQ7ZjA4qE1MsnF1MmZSokOGrw4W9vTCioOv2U=", + "lastModified": 1728334376, + "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", "owner": "nix-community", "repo": "disko", - "rev": "574400001b3ffe555c7a21e0ff846230759be2ed", + "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixlib": { "locked": { - "lastModified": 1727571693, - "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", + "lastModified": 1728176478, + "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", + "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", "type": "github" }, "original": { @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1727917377, - "narHash": "sha256-eefXdEPUMuhiV6Vy3ASSyApCseE9OoKDgL/G6qenw/4=", + "lastModified": 1728308313, + "narHash": "sha256-GThSJ4OcPOOtf8j8ge7ik4141BHVbBALu0N7Ju+Nw18=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "9ae128172f823956e54947fe471bc6dfa670ecb4", + "rev": "71f9c8bcc87f15dba12515e94e40de243b5db103", "type": "github" }, "original": { @@ -142,11 +142,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727969285, - "narHash": "sha256-TbTnNocJYd0ghUFrK/lB2Ahg6M+K6l/4nMJW1X5W25g=", + "lastModified": 1728249353, + "narHash": "sha256-7NBJm1jfMeAowE1J2oljYqWVvI9X7FyyxBY4O8uB/Os=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75b209227dff3cbfac19f510a62f9446c92beac4", + "rev": "c8a17040be4a20b29589cb4043a9e0c36af1930e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 824f187..956f594 100644 --- a/flake.nix +++ b/flake.nix @@ -64,11 +64,9 @@ }; nixosConfigurations = let - nodes = ["premhome-falcon-1" "premhome-falcon-2" "premhome-falcon-3" "premhome-eagle-1" "premhome-eagle-2"]; - in builtins.listToAttrs (map (name: { - name = name; - value = nixpkgs.lib.nixosSystem { - specialArgs = { meta = { hostname = name; }; }; + nodes = import ./nixos/server/nodes.nix; + in builtins.mapAttrs (name: data: nixpkgs.lib.nixosSystem { + specialArgs = { meta = { hostname = name; ip = data.ip; }; }; modules = [ disko.nixosModules.disko agenix.nixosModules.default @@ -76,8 +74,7 @@ ./nixos/server/configuration.nix ./nixos/server/hardware-configuration.nix ]; - }; - }) nodes); + }) nodes; colmena = let configs = self.nixosConfigurations; in { diff --git a/infra/controllers/kustomization.yaml b/infra/controllers/kustomization.yaml index e4a406d..7c62644 100644 --- a/infra/controllers/kustomization.yaml +++ b/infra/controllers/kustomization.yaml @@ -1,6 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - metallb.yaml - - longhorn.yaml + # - metallb.yaml + # - longhorn.yaml # - traefik.yaml diff --git a/nixos/server/configuration.nix b/nixos/server/configuration.nix index 36c9d8a..6d3a73a 100644 --- a/nixos/server/configuration.nix +++ b/nixos/server/configuration.nix @@ -1,4 +1,4 @@ -{ config, meta, pkgs, lib, ... }: +{ config, meta, pkgs, ... }: { imports = [../common/users.nix]; nix = { diff --git a/nixos/server/nodes.nix b/nixos/server/nodes.nix new file mode 100644 index 0000000..a9acdd6 --- /dev/null +++ b/nixos/server/nodes.nix @@ -0,0 +1,8 @@ +{ + premhome-falcon-1 = { ip = "100.64.0.19"; }; + premhome-falcon-2 = { ip = "100.64.0.7"; }; + premhome-falcon-3 = { ip = "100.64.0.8"; }; + premhome-eagle-1 = { ip = "100.64.0.9"; }; + premhome-eagle-2 = { ip = "100.64.0.10"; }; +} +