From e4b7b69bbb74c673242dd4da8bfef506e146c8f3 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Sun, 14 Jul 2024 13:58:08 +0200
Subject: [PATCH] feat(kms): Move to separate namespace

---
 README.md                |  2 ++
 flake-parts/kubenix.nix  |  4 +++-
 kubenix-modules/all.nix  |  1 -
 kubenix-modules/base.nix |  1 +
 kubenix-modules/kms.nix  | 20 ++++++++------------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 88c4fe8..e6264ae 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,8 @@ The second method: `nix run '.#kubenix.x86_64-linux.<application>.deploy'`
 Currently, the applications being deployed like this are:
 - `cyberchef`
 - `freshrss`
+- `radicale`
+- `kms`
 
 ## Known bugs
 
diff --git a/flake-parts/kubenix.nix b/flake-parts/kubenix.nix
index cfecd91..2e47c61 100644
--- a/flake-parts/kubenix.nix
+++ b/flake-parts/kubenix.nix
@@ -38,7 +38,7 @@
     mkDeployScriptAndManifest = module: applyset: namespace:
       let
         kubernetes = (kubenix.evalModules.${system} {
-          specialArgs = { inherit namespace; };
+          specialArgs = { inherit namespace myLib; };
 
           module = { kubenix, ... }:
             {
@@ -70,4 +70,6 @@
       "${self}/kubenix-modules/freshrss.nix" "freshrss" "freshrss";
     kubenix.radicale = mkDeployScriptAndManifest
       "${self}/kubenix-modules/radicale.nix" "radicale" "radicale";
+    kubenix.kms = mkDeployScriptAndManifest
+      "${self}/kubenix-modules/kms.nix" "kms" "kms";
   })
diff --git a/kubenix-modules/all.nix b/kubenix-modules/all.nix
index 0b4ad20..5b99c5d 100644
--- a/kubenix-modules/all.nix
+++ b/kubenix-modules/all.nix
@@ -1,6 +1,5 @@
 let
   applications = [
-    ./kms.nix
     ./inbucket.nix
     ./syncthing.nix
     ./nextcloud.nix
diff --git a/kubenix-modules/base.nix b/kubenix-modules/base.nix
index e6595b2..b44bbf7 100644
--- a/kubenix-modules/base.nix
+++ b/kubenix-modules/base.nix
@@ -64,6 +64,7 @@
           cyberchef = { };
           freshrss = { };
           radicale = { };
+          kms = { };
         };
 
         nodes =
diff --git a/kubenix-modules/kms.nix b/kubenix-modules/kms.nix
index 48169c8..151c8df 100644
--- a/kubenix-modules/kms.nix
+++ b/kubenix-modules/kms.nix
@@ -1,23 +1,19 @@
 { myLib, ... }: {
   kubernetes.resources = {
-    deployments.kms = {
-      metadata.labels.app = "kms";
+    deployments.server.spec = {
+      selector.matchLabels.app = "kms";
 
-      spec = {
-        selector.matchLabels.app = "kms";
+      template = {
+        metadata.labels.app = "kms";
 
-        template = {
-          metadata.labels.app = "kms";
-
-          spec.containers.kms = {
-            image = "teddysun/kms";
-            ports.kms.containerPort = 1688;
-          };
+        spec.containers.kms = {
+          image = "teddysun/kms";
+          ports.kms.containerPort = 1688;
         };
       };
     };
 
-    services.kms.spec = {
+    services.server.spec = {
       type = "LoadBalancer";
       loadBalancerIP = myLib.globals.kmsIPv4;
       selector.app = "kms";