jaggar/iac-cljs-configs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add name to service and deployment and simplify final-helm-values

Browse Source
This commit is contained in:
GigiaJ
2025-10-02 21:52:04 -05:00
parent 252729b232
commit 62af146101
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
iac/src/main/utils/k8s.cljs
View File

@@ -14,7 +14,7 @@
requested-components (set component-kws) 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 hostname app-namespace app-name image image-port caddy-snippet vault-load-yaml chart-repo transformations helm-values-fn]
:or {image-port 80 caddy-snippet "" helm-values-fn #(:base-values %)}} options :or {vault-load-yaml false image-port 80 caddy-snippet "" helm-values-fn #(:base-values %)}} options
app-labels {:app app-name} app-labels {:app app-name}
@@ -41,11 +41,9 @@
(some? secrets) (.apply secrets (fn [s] (aget s "host"))) (some? secrets) (.apply secrets (fn [s] (aget s "host")))
:else nil) :else nil)
final-helm-values (pulumi/all [secrets bind-secrets yaml-values app-name] final-helm-values (helm-values-fn {:base-values yaml-values
(fn [[yaml-map app-name-str]] :hostname final-hostname
(helm-values-fn {:base-values (or yaml-map {}) :app-name app-name})
:hostname final-hostname
:app-name app-name-str})))
chart (when (requested-components :chart) chart (when (requested-components :chart)
@@ -60,7 +58,8 @@
deployment (when (requested-components :deployment) deployment (when (requested-components :deployment)
(new (.. k8s -apps -v1 -Deployment) app-name (new (.. k8s -apps -v1 -Deployment) app-name
(clj->js {:metadata {:namespace app-namespace} (clj->js {:metadata {:namespace app-namespace
:name app-name}
:spec {:selector {:matchLabels app-labels} :spec {:selector {:matchLabels app-labels}
:replicas 1 :replicas 1
:template {:metadata {:labels app-labels} :template {:metadata {:labels app-labels}
@@ -72,7 +71,8 @@
service (when (requested-components :service) service (when (requested-components :service)
(new (.. k8s -core -v1 -Service) app-name (new (.. k8s -core -v1 -Service) app-name
(clj->js {:metadata {:namespace app-namespace} (clj->js {:metadata {:namespace app-namespace
:name app-name}
:spec {:selector app-labels :spec {:selector app-labels
:ports [{:port 80 :targetPort image-port}]}}) :ports [{:port 80 :targetPort image-port}]}})
(clj->js {:provider provider :dependsOn [deployment]}))) (clj->js {:provider provider :dependsOn [deployment]})))