From 4edc82d0414bcb228b2de8d7d0bc5573fb8afbc4 Mon Sep 17 00:00:00 2001
From: GigiaJ <gigiaboone@yahoo.com>
Date: Wed, 24 Sep 2025 12:49:24 -0500
Subject: [PATCH] Better leverage namespaces

---
 .../nextcloud/{nextcloud.cljs => service.cljs}      | 13 ++++---------
 .../services/openbao/{openbao.cljs => service.cljs} |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename iac/src/main/k8s/services/nextcloud/{nextcloud.cljs => service.cljs} (84%)
 rename iac/src/main/k8s/services/openbao/{openbao.cljs => service.cljs} (99%)

diff --git a/iac/src/main/k8s/services/nextcloud/nextcloud.cljs b/iac/src/main/k8s/services/nextcloud/service.cljs
similarity index 84%
rename from iac/src/main/k8s/services/nextcloud/nextcloud.cljs
rename to iac/src/main/k8s/services/nextcloud/service.cljs
index 50a5ac0..af2f8be 100644
--- a/iac/src/main/k8s/services/nextcloud/nextcloud.cljs
+++ b/iac/src/main/k8s/services/nextcloud/service.cljs
@@ -1,4 +1,4 @@
-(ns k8s.services.nextcloud.nextcloud
+(ns k8s.services.nextcloud.service
   (:require
    ["@pulumi/kubernetes" :as k8s]
    ["@pulumi/pulumi" :as pulumi]
@@ -15,14 +15,9 @@
 
 (defn deploy-nextcloud
   "Deploy Nextcloud using direct vault connection info."
-  [provider vault-params]
+  [provider vault-provider]
   (let [core-v1 (.. k8s -core -v1)
         helm-v3 (.. k8s -helm -v3) 
-        stack-ref (new pulumi/StackReference "cluster") 
-        vault-provider (new vault/Provider
-                            "vault-provider"
-                            (clj->js {:address (.getOutput stack-ref "vaultAddress")
-                                      :token   (.getOutput stack-ref "vaultToken")}))
         nextcloud-secrets (.getSecret (.-generic vault)
                                       (clj->js {:path "secret/nextcloud"})
                                       (clj->js {:provider  vault-provider}))
@@ -56,13 +51,13 @@
                 (get-secret-val nextcloud-secrets "host"))
 
         chart (new (.. helm-v3 -Chart)
-                   "my-nextcloud"
+                   "nextcloud"
                    (clj->js {:chart     "nextcloud"
                              :fetchOpts {:repo "https://nextcloud.github.io/helm/"}
                              :namespace (.. ns -metadata -name)
                              :values    helm-values})
                    (clj->js {:provider provider
-                             :dependsOn [admin-secret db-secret (clj->js (get vault-params :vault-port-forward))]}))]
+                             :dependsOn [admin-secret db-secret]}))]
 
     {:namespace    ns
      :admin-secret admin-secret
diff --git a/iac/src/main/k8s/services/openbao/openbao.cljs b/iac/src/main/k8s/services/openbao/service.cljs
similarity index 99%
rename from iac/src/main/k8s/services/openbao/openbao.cljs
rename to iac/src/main/k8s/services/openbao/service.cljs
index 28bd919..1576cd1 100644
--- a/iac/src/main/k8s/services/openbao/openbao.cljs
+++ b/iac/src/main/k8s/services/openbao/service.cljs
@@ -1,4 +1,4 @@
-(ns k8s.services.openbao.openbao
+(ns k8s.services.openbao.service
   (:require
    ["@pulumi/kubernetes" :as k8s]
    ["@pulumi/pulumi" :as pulumi]