From 6bc2ca2ce6a7eee45a5a376772c40e39bf155ffd Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sat, 7 Mar 2026 20:14:07 -0500 Subject: [PATCH] Update packages in kubernetes/keys. --- nix/kubernetes/keys/flake.lock | 6 +++--- nix/kubernetes/keys/flake.nix | 13 +++++++------ nix/kubernetes/keys/scope.nix | 7 ++++++- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/nix/kubernetes/keys/flake.lock b/nix/kubernetes/keys/flake.lock index 42c9926c..a6e534e2 100644 --- a/nix/kubernetes/keys/flake.lock +++ b/nix/kubernetes/keys/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { diff --git a/nix/kubernetes/keys/flake.nix b/nix/kubernetes/keys/flake.nix index 3bdd04b7..5bc06a6b 100644 --- a/nix/kubernetes/keys/flake.nix +++ b/nix/kubernetes/keys/flake.nix @@ -14,13 +14,15 @@ packages = forAllSystems ( system: let - pkgs = nixpkgs.legacyPackages.${system}; - appliedOverlay = self.overlays.default pkgs pkgs; + pkgs = import nixpkgs { + inherit system; + overlays = [ self.overlays.default ]; + }; in { - deploy_script = appliedOverlay.k8s.deploy_script; - default = appliedOverlay.k8s.all_keys; - bootstrap_script = appliedOverlay.k8s.bootstrap_script; + deploy_script = pkgs.k8s.deploy_script; + default = pkgs.k8s.all_keys; + bootstrap_script = pkgs.k8s.bootstrap_script; } ); overlays.default = ( @@ -35,7 +37,6 @@ system: let pkgs = nixpkgs.legacyPackages.${system}; - appliedOverlay = self.overlays.default pkgs pkgs; in { default = pkgs.mkShell { diff --git a/nix/kubernetes/keys/scope.nix b/nix/kubernetes/keys/scope.nix index d5b970ce..2f516f78 100644 --- a/nix/kubernetes/keys/scope.nix +++ b/nix/kubernetes/keys/scope.nix @@ -262,13 +262,18 @@ makeScope newScope ( "ipv4" = { "enabled" = true; }; + "externalIPs" = { + "enabled" = true; + }; "enableIPv6Masquerade" = false; "enableIPv4BIGTCP" = true; "enableIPv6BIGTCP" = true; "routingMode" = "native"; "autoDirectNodeRoutes" = true; "ipv4NativeRoutingCIDR" = "10.200.0.0/16"; - "ipv6NativeRoutingCIDR" = "2620:11f:7001:7:ffff::/80"; + "ipv6NativeRoutingCIDR" = "2620:11f:7001:7:ffff:eeee::/96"; + # "ipv6NativeRoutingCIDR" = "2620:11f:7001:7:ffff::/80"; + # "l7Proxy" = true; # Needed for cilium gatework controller "hubble" = { "relay" = {