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

Correct vaultAddress and vaultToken declarations

Browse Source
This commit is contained in:
GigiaJ
2025-09-20 03:10:46 -05:00
parent e7f8fac0ac
commit 4ecc045acd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
iac/src/main/base.cljs
View File

@@ -13,7 +13,7 @@
"Deploy applications with proper dependency chain" "Deploy applications with proper dependency chain"
[provider kubeconfig apps] [provider kubeconfig apps]
(let [vault-result (vault/deploy-vault provider kubeconfig) (let [vault-result (vault/deploy-vault provider kubeconfig)
vault-params {:address (aget vault-result "address") :token (aget vault-result "root_token") :vault-port-forward (aget vault-result "port_forward_manager")} vault-params {:address (get vault-result :address) :token (get vault-result :root-token)}
app-results (if (nil? apps) {} (apps provider vault-params))] app-results (if (nil? apps) {} (apps provider vault-params))]
(assoc app-results :vault vault-result))) (assoc app-results :vault vault-result)))
@@ -28,7 +28,9 @@
(clj->js {:kubeconfig kc}))] (clj->js {:kubeconfig kc}))]
(hetznercsi/deploy-csi-driver provider) (hetznercsi/deploy-csi-driver provider)
(resolve (resolve
(if (nil? apps) (app-deployments provider kc nil) (app-deployments provider kc apps))))))))] (if (nil? apps)
(app-deployments provider kc nil)
(app-deployments provider kc apps))))))))]
{:cluster cluster :setup setup})) {:cluster cluster :setup setup}))
(defn build-exports [init] (defn build-exports [init]
@@ -38,8 +40,8 @@
:masterIp (get cluster :masterIp) :masterIp (get cluster :masterIp)
:workerDeIp (get cluster :workerDeIp) :workerDeIp (get cluster :workerDeIp)
:workerUsIp (get cluster :workerUsIp) :workerUsIp (get cluster :workerUsIp)
:vaultAddress (.apply app-outputs #(get-in % [:vault :address])) :vaultAddress (pulumi/output (.apply app-outputs #(get-in % [:vault :address])))
:vaultToken (.apply app-outputs #(get-in % [:vault :root-token])) :vaultToken (pulumi/output (.apply app-outputs #(get-in % [:vault :root-token])))
})) }))