From 69a147d685a935a0e6790a859a59cf0bf6946c3e Mon Sep 17 00:00:00 2001
From: GigiaJ <gigiaboone@yahoo.com>
Date: Sun, 16 Nov 2025 13:10:37 -0600
Subject: [PATCH] Update to use new docker-build and points to the set cfgs for
 the public registry we store the Docker image

---
 .../k8s/add_ons/ingress_controller/caddy.cljs | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/iac/src/main/k8s/add_ons/ingress_controller/caddy.cljs b/iac/src/main/k8s/add_ons/ingress_controller/caddy.cljs
index fdbe68f..c8597aa 100644
--- a/iac/src/main/k8s/add_ons/ingress_controller/caddy.cljs
+++ b/iac/src/main/k8s/add_ons/ingress_controller/caddy.cljs
@@ -1,21 +1,27 @@
-(ns k8s.add-ons.ingress-controller.caddy)
+(ns k8s.add-ons.ingress-controller.caddy
+  (:require [configs :refer [cfg]]))
 
 (def config
-  {:stack [:docker:docker-image :k8s:vault-secrets :k8s:chart]
+  {:stack [:vault:prepare :docker:image :k8s:secret :k8s:chart]
    :app-namespace "caddy-system"
    :app-name      "caddy-ingress-controller"
    :k8s:image-port 8080
    :k8s:vault-load-yaml false
    :k8s:image-opts {:imageName '(str repo "/" app-name ":latest")}
+   :docker:image-opts {:registry {:server (-> cfg :public-image-registry-url)
+                                  :username (-> cfg :public-image-registry-username)
+                                  :password (-> cfg :public-image-registry-password)}
+                       :tags [(str (-> cfg :public-image-registry-url) "/" (-> cfg :public-image-registry-username) "/" "caddy")]
+                       :push true}
    :k8s:chart-opts {:fetchOpts {:repo "https://caddyserver.github.io/ingress"}
-                :values
-                {:ingressController
-                 {:deployment {:kind "DaemonSet"}
-                  :daemonSet {:useHostPort true}
-                  :ports {:web {:hostPort 80}
-                          :websecure {:hostPort 443}}
-                  :service {:type "NodePort"
-                            :externalTrafficPolicy "Local"}
-                  :image {:repository 'repo
-                          :tag "latest"}
-                  :config {:email 'email}}}}})
\ No newline at end of file
+                    :values
+                    {:ingressController
+                     {:deployment {:kind "DaemonSet"}
+                      :daemonSet {:useHostPort true}
+                      :ports {:web {:hostPort 80}
+                              :websecure {:hostPort 443}}
+                      :service {:type "NodePort"
+                                :externalTrafficPolicy "Local"}
+                      :image {:repository 'repo
+                              :tag "latest"}
+                      :config {:email 'email}}}}})
\ No newline at end of file