Add tranformer function and start working on abstracting namespace

This commit is contained in:
2025-10-05 05:02:12 -05:00
parent cfabeabfc9
commit 998785a03f

View File

@@ -7,23 +7,51 @@
[clojure.string :as str]
[configs :refer [cfg]]))
(defn assoc-ins [m path-vals]
(reduce (fn [acc [path val]] (assoc-in acc path val)) m path-vals))
(defn make-transformer
"Given f that takes {:app-name .. :secrets ..}, where :secrets is a plain map
(already unwrapped inside .apply), return a Helm transformer."
[f]
(fn [{:keys [base-values app-name secrets]}]
(.apply secrets
(fn [smap]
(let [m (js->clj smap :keywordize-keys true)
updates (f {:app-name app-name
:secrets m})
after (clj->js (assoc-ins base-values updates))]
after)))))
(defn deploy-stack
"Deploys a versatile stack of K8s resources, including optional Helm charts."
[& args]
(let [[component-kws [options]] (split-with keyword? args)
requested-components (set component-kws)
{:keys [provider vault-provider hostname app-namespace app-name image image-port caddy-snippet vault-load-yaml chart-repo transformations helm-values-fn]
{:keys [provider vault-provider app-namespace app-name hostname image image-port caddy-snippet vault-load-yaml chart-repo transformations helm-values-fn]
:or {vault-load-yaml false image-port 80 caddy-snippet "" helm-values-fn #(:base-values %)}} options
app-labels {:app app-name}
full-snippet (str "tls {\n dns cloudflare {env.CLOUDFLARE_API_TOKEN}\n}\n" caddy-snippet)
ns (when (requested-components :namespace)
(new (.. k8s -core -v1 -Namespace) app-namespace
(clj->js {:metadata {:name app-namespace}})
(clj->js {:provider provider})))
ns (when (requested-components :namespace)
;;(try
(new (.. k8s -core -v1 -Namespace) app-namespace
(clj->js {:metadata {:name app-namespace}})
(clj->js {:provider provider}))
#_(catch js/Error _
(.get (.. k8s -core -v1 -Namespace) (str "ns-" app-name)
app-namespace
(clj->js {:provider provider})))
);;)
prepared-vault-data (when (requested-components :vault-secrets)
(vault-utils/prepare {:provider provider
@@ -35,24 +63,20 @@
{:keys [helm-v3 secrets yaml-values bind-secrets]} prepared-vault-data
final-hostname
(cond
(some? hostname) hostname
(some? secrets) (.apply secrets (fn [s] (aget s "host")))
:else nil)
final-helm-values (helm-values-fn {:base-values yaml-values
:hostname final-hostname
:app-name app-name})
helm-fn (helm-values-fn {:base-values yaml-values
:secrets secrets
:app-name app-name})
host (.apply secrets #(aget % "host"))
chart (when (requested-components :chart)
(new (.. helm-v3 -Chart) app-name
(clj->js {:chart app-name
:fetchOpts {:repo chart-repo}
:namespace app-namespace
:values final-helm-values})
:values helm-fn})
(clj->js {:provider provider
:enableServerSideApply false
:dependsOn (vec (filter identity [ns bind-secrets]))
:transformations (vec (filter identity [transformations]))})))
@@ -86,11 +110,11 @@
:annotations {"caddy.ingress.kubernetes.io/snippet" full-snippet}}
:spec
{:ingressClassName "caddy"
:rules [{:host final-hostname
:rules [{:host host
:http {:paths [{:path "/"
:pathType "Prefix"
:backend {:service {:name app-name
:port {:number image-port}}}}]}}]}})
(clj->js {:provider provider :dependsOn [bind-secrets app-dependency]})))]
(clj->js {:provider provider :dependsOn [app-dependency]})))]
{:namespace ns, :vault-secrets prepared-vault-data, :chart chart, :deployment deployment, :service service, :ingress ingress, :hostname final-hostname}))
{:namespace ns, :vault-secrets prepared-vault-data, :chart chart, :deployment deployment, :service service, :ingress ingress}))