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

Simplify secrets and just declare host in ingress decl

Browse Source
This commit is contained in:
GigiaJ
2025-10-19 01:49:02 -05:00
parent 3c4903cba4
commit e29de6ed3f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,9 +125,7 @@
:app-namespace app-namespace :app-namespace app-namespace
:load-yaml vault-load-yaml})) :load-yaml vault-load-yaml}))
{:keys [secrets yaml-values bind-secrets]} (or prepared-vault-data {:secrets nil :yaml-values nil :bind-secrets nil}) {:keys [secrets yaml-values bind-secrets]} (or prepared-vault-data {:secrets nil :yaml-values nil :bind-secrets nil})
host (when secrets (.apply secrets #(aget % "host")))
ns (create-component requested-components :namespace provider app-namespace nil ns-opts (default-namespace options) secrets options) ns (create-component requested-components :namespace provider app-namespace nil ns-opts (default-namespace options) secrets options)
docker-image (create-component requested-components :docker-image nil app-name nil image-opts (default-image options) secrets options) docker-image (create-component requested-components :docker-image nil app-name nil image-opts (default-image options) secrets options)
secret (create-component requested-components :secret provider app-name nil secret-opts (default-secret options) secrets options) secret (create-component requested-components :secret provider app-name nil secret-opts (default-secret options) secrets options)
@@ -142,7 +140,7 @@
(update-in chart-opts [:values] #(deep-merge % (or yaml-values {})))) (update-in chart-opts [:values] #(deep-merge % (or yaml-values {}))))
secrets secrets
options) options)
ingress (create-component requested-components :ingress provider app-name (vec (filter some? [service chart bind-secrets])) ingress-opts (default-ingress (assoc options :host host)) secrets options) ingress (create-component requested-components :ingress provider app-name (vec (filter some? [service chart bind-secrets])) ingress-opts (default-ingress (assoc options :host (when secrets (.apply secrets #(aget % "host"))))) secrets options)
execute (when (requested-components :execute) execute (when (requested-components :execute)
(exec-fn (assoc options :dependencies (vec (filter some? [chart ns secret storage-class deployment service ingress docker-image])))))] (exec-fn (assoc options :dependencies (vec (filter some? [chart ns secret storage-class deployment service ingress docker-image])))))]