k8s: refactor directory structure

Author: ttrssreal

k8s/argocd-server-ingress.yaml renamed to k8s/argocd-server/ingress.yaml

@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: argocd-server-ingress
+  name: argocd
   namespace: argocd
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production
@@ -12,7 +12,6 @@ metadata:
     nginx.ingress.kubernetes.io/auth-tls-pass-certificate-to-upstream: "true"
     nginx.ingress.kubernetes.io/auth-tls-verify-client: "on"
     nginx.ingress.kubernetes.io/auth-tls-verify-depth: "1"
-
     # FIXME: part of declarative secret management
     nginx.ingress.kubernetes.io/auth-tls-secret: default/ca-secret
 spec:

k8s/ingress/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: ingress

k8s/ingress-nginx.yaml renamed to k8s/ingress/nginx.yaml

@@ -1,8 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: ingress
----
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:

nixos/ari/argocd/app.nix

@@ -72,8 +72,14 @@ let
   };
 in
 {
-  options.jix.argocd.targetRevision = lib.mkOption {
-    type = lib.types.str;
+  options.jix.argocd = {
+    targetRevision = lib.mkOption {
+      type = lib.types.str;
+    };
+
+    sources = lib.mkOption {
+      type = with lib.types; listOf str;
+    };
   };
 
   config.services.kubernetes.addonManager = {
@@ -101,12 +107,12 @@ in
         spec = {
           project = appsProject.metadata.name;
 
-          source = {
+          sources = map (path: {
             inherit (config.jix.argocd) targetRevision;
             repoURL = "https://github.com/ttrssreal/jix";
-            path = "k8s";
+            inherit path;
             directory.recurse = true;
-          };
+          }) config.jix.argocd.sources;
 
           destination = {
             server = "https://kubernetes.default.svc";

nixos/ari/kubernetes.nix

@@ -10,7 +10,18 @@
           ./argocd
         ];
 
-        jix.argocd.targetRevision = "73c33e78b938258628355c2d01547ab3d6572934";
+        jix.argocd = {
+          targetRevision = "73c33e78b938258628355c2d01547ab3d6572934";
+
+          sources = [
+            "k8s/argocd-server"
+            "k8s/cert-manager"
+            "k8s/github-runners"
+            "k8s/ingress"
+            "k8s/k8s-dashboard"
+          ];
+        };
+
         networking.firewall.enable = false;
 
         services = {