From dc2d9dcfc51edfa368a69b407721d6eafabda7b4 Mon Sep 17 00:00:00 2001 From: GigiaJ Date: Thu, 2 Oct 2025 21:50:57 -0500 Subject: [PATCH] clean up nextcloud add-skip-await-transformation --- .../main/k8s/services/nextcloud/service.cljs | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/iac/src/main/k8s/services/nextcloud/service.cljs b/iac/src/main/k8s/services/nextcloud/service.cljs index 0a4e6b0..6cb92d9 100644 --- a/iac/src/main/k8s/services/nextcloud/service.cljs +++ b/iac/src/main/k8s/services/nextcloud/service.cljs @@ -4,22 +4,15 @@ [utils.vault :as vault-utils] [utils.k8s :as k8s-utils])) -(defn- add-skip-await-transformation - "A Pulumi transformation that adds the skipAwait annotation to problematic resources." - [args _opts] - (let [kind (get-in args [:kind])] - (if (or - (= kind "StatefulSet") - (= kind "PersistentVolumeClaim") - (= kind "Ingress")) - (let [metadata (get-in args [:metadata] {}) - annotations (get metadata :annotations {}) - new-annotations (assoc annotations "pulumi.com/skipAwait" "true") - new-metadata (assoc metadata :annotations new-annotations)] - (assoc args :metadata new-metadata)) +(defn- add-skip-await-transformation [args _opts] + (let [kind (get-in args [:resource :kind])] + (if (some #{kind} ["StatefulSet" "PersistentVolumeClaim" "Ingress"]) + (update-in args [:resource :metadata :annotations] + #(assoc (or % {}) "pulumi.com/skipAwait" "true")) args))) -(defn deploy-nextcloud + +(defn deploy "Deploy Nextcloud using direct vault connection info." [provider vault-provider] (let [nextcloud-values-transformer (fn [{:keys [base-values hostname app-name]}]