From 230c6f3d3d34343e4fb6dbf2fb32d184cc902b5c Mon Sep 17 00:00:00 2001 From: GigiaJ Date: Wed, 1 Oct 2025 02:49:20 -0500 Subject: [PATCH] Update to finalized form --- iac/src/main/k8s/services/nextcloud/service.cljs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/iac/src/main/k8s/services/nextcloud/service.cljs b/iac/src/main/k8s/services/nextcloud/service.cljs index 4dba4a3..7415804 100644 --- a/iac/src/main/k8s/services/nextcloud/service.cljs +++ b/iac/src/main/k8s/services/nextcloud/service.cljs @@ -22,14 +22,12 @@ (defn deploy-nextcloud "Deploy Nextcloud using direct vault connection info." [provider vault-provider] - (let [{:keys [helm-v3 secrets yaml-values service-name namespace bind-secrets]} (vault-utils/prepare vault-provider "nextcloud" provider) - + (let [{:keys [helm-v3 secrets yaml-values service-name namespace bind-secrets]} (vault-utils/prepare vault-provider "nextcloud" provider true) hostname (.. secrets -host) - final-helm-values (-> yaml-values (assoc-in [:ingress :enabled] false) (assoc-in [:nextcloud :host] hostname) - (assoc-in [:nextcloud :trusted_domains] [hostname])) + (assoc-in [:nextcloud :trusted_domains] [hostname "nextcloud"])) chart (new (.. helm-v3 -Chart) service-name (clj->js {:chart service-name @@ -40,11 +38,10 @@ :dependsOn [bind-secrets] :transformations [add-skip-await-transformation] })) - ingress (ingress-utils/create-ingress hostname namespace service-name 80 chart) - ;;cert (ingress-utils/create-certificate hostname namespace service-name ingress) + ingress (ingress-utils/create-ingress hostname namespace service-name 8080 chart) ] {:namespace namespace :nextcloud-secrets bind-secrets :chart chart :ingress ingress - :nextcloud-url (str "https://" hostname)})) + :nextcloud-url (str "https://" hostname)})) \ No newline at end of file