From e94a3e1656ab410f33dbb507d48f5b83b0d283bf Mon Sep 17 00:00:00 2001
From: Jake Ginesin <jakeginesin@gmail.com>
Date: Sun, 24 Aug 2025 04:25:29 -0400
Subject: [PATCH] generation 500 25.11.20250714.62e0f05

---
 {hosts/server-gpu => extras}/gpu.nix |  0
 extras/kube-master.nix               | 38 ++++++++++++++++++++++++++++
 {hosts/server-gpu => extras}/ssh.nix |  0
 home/programs/firefox/default.nix    |  6 ++---
 hosts/server-gpu/configuration.nix   |  4 +--
 hosts/server/configuration.nix       |  2 +-
 6 files changed, 44 insertions(+), 6 deletions(-)
 rename {hosts/server-gpu => extras}/gpu.nix (100%)
 create mode 100644 extras/kube-master.nix
 rename {hosts/server-gpu => extras}/ssh.nix (100%)

diff --git a/hosts/server-gpu/gpu.nix b/extras/gpu.nix
similarity index 100%
rename from hosts/server-gpu/gpu.nix
rename to extras/gpu.nix
diff --git a/extras/kube-master.nix b/extras/kube-master.nix
new file mode 100644
index 0000000..13af296
--- /dev/null
+++ b/extras/kube-master.nix
@@ -0,0 +1,38 @@
+{
+  config,
+  pkgs,
+  ...
+}: let
+  # When using easyCerts=true the IP Address must resolve to the master on creation.
+  # So use simply 127.0.0.1 in that case. Otherwise you will have errors like this https://github.com/NixOS/nixpkgs/issues/59364
+  kubeMasterIP = "172.24.233.22";
+  kubeMasterHostname = "api.kube";
+  kubeMasterAPIServerPort = 6443;
+in {
+  # resolve master hostname
+  networking.extraHosts = "${kubeMasterIP} ${kubeMasterHostname}";
+
+  # packages for administration tasks
+  environment.systemPackages = with pkgs; [
+    kompose
+    kubectl
+    kubernetes
+  ];
+
+  services.kubernetes = {
+    roles = ["master" "node"];
+    masterAddress = kubeMasterHostname;
+    apiserverAddress = "https://${kubeMasterHostname}:${toString kubeMasterAPIServerPort}";
+    easyCerts = true;
+    apiserver = {
+      securePort = kubeMasterAPIServerPort;
+      advertiseAddress = kubeMasterIP;
+    };
+
+    # use coredns
+    addons.dns.enable = true;
+
+    # needed if you use swap
+    kubelet.extraOpts = "--fail-swap-on=false";
+  };
+}
diff --git a/hosts/server-gpu/ssh.nix b/extras/ssh.nix
similarity index 100%
rename from hosts/server-gpu/ssh.nix
rename to extras/ssh.nix
diff --git a/home/programs/firefox/default.nix b/home/programs/firefox/default.nix
index 26ac807..bb9886a 100644
--- a/home/programs/firefox/default.nix
+++ b/home/programs/firefox/default.nix
@@ -83,7 +83,7 @@ in {
           toolbar = true;
           bookmarks = [
             {
-              name = "Nixos";
+              name = "nixos";
               bookmarks = [
                 {
                   name = "noogle";
@@ -108,7 +108,7 @@ in {
               ];
             }
             {
-              name = "CMU";
+              name = "cmu";
               bookmarks = [
                 {
                   name = "computing facilities";
@@ -170,7 +170,7 @@ in {
               ];
             }
             {
-              name = "Cal";
+              name = "cal";
               url = "https://calendar.google.com/";
             }
 
diff --git a/hosts/server-gpu/configuration.nix b/hosts/server-gpu/configuration.nix
index 5748d89..fa7ffd7 100644
--- a/hosts/server-gpu/configuration.nix
+++ b/hosts/server-gpu/configuration.nix
@@ -8,8 +8,8 @@
     ./hardware-configuration.nix
     ../../system/system.nix
     ../meta.nix
-    ./ssh.nix
-    ./gpu.nix
+    ../../extras/ssh.nix
+    ../../extras/gpu.nix
   ];
 
   config = {
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index 0157634..52a44bc 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -8,7 +8,7 @@
     ./hardware-configuration.nix
     ../../system/system.nix
     ../meta.nix
-    ./ssh.nix
+    ../../extras/ssh.nix
   ];
 
   config = {