refactor inline-macro to load resources

README.md

@@ -20,6 +20,8 @@ Configs generated by c4k-website consists of the following parts:
 * cron job for building and build secret for storing auth data
 * respective volume claims
 
+c4k-website is an example how to create efficient k8s one shot deployments with https://repo.prod.meissa.de/meissa/c4k-common.
+
 ## Status
 
 Stable - we use this setup on production.
@@ -90,7 +92,7 @@ For more details about our repository model see: https://repo.prod.meissa.de/mei
 
 ## License
 
-Copyright © 2022 meissa GmbH
+Copyright © 2022, 2023, 2024 meissa GmbH
 Licensed under the [Apache License, Version 2.0](LICENSE) (the "License")
 Pls. find licenses of our subcomponents [here](doc/SUBCOMPONENT_LICENSE)
 

project.clj

@@ -4,8 +4,8 @@
   :license {:name "Apache License, Version 2.0"
             :url "https://www.apache.org/licenses/LICENSE-2.0.html"}
   :dependencies [[org.clojure/clojure "1.11.1"]
-                 [org.clojure/tools.reader "1.3.7"]                 
-                 [org.domaindrivenarchitecture/c4k-common-clj "6.1.3"]
+                 [org.clojure/tools.reader "1.4.0"]                 
+                 [org.domaindrivenarchitecture/c4k-common-clj "6.1.4-SNAPSHOT"]
                  [hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
   :target-path "target/%s/"
   :source-paths ["src/main/cljc"
@@ -22,11 +22,10 @@
              :uberjar {:aot :all
                        :main dda.c4k-website.uberjar
                        :uberjar-name "c4k-website-standalone.jar"
-                       :dependencies [[org.clojure/tools.cli "1.0.219"]
+                       :dependencies [[org.clojure/tools.cli "1.1.230"]
                                       [ch.qos.logback/logback-classic "1.5.0"
                                        :exclusions [com.sun.mail/javax.mail]]
-                                      [org.slf4j/jcl-over-slf4j "2.0.12"]
-                                      [com.github.clj-easy/graal-build-time "1.0.5"]]}}
+                                      [org.slf4j/jcl-over-slf4j "2.0.12"]]}}
   :release-tasks [["test"]
                   ["vcs" "assert-committed"]
                   ["change" "version" "leiningen.release/bump-version" "release"]

src/main/cljc/dda/c4k_website/website.cljc

@@ -1,11 +1,9 @@
 (ns dda.c4k-website.website
   (:require
    [clojure.spec.alpha :as s]
-   #?(:cljs [shadow.resource :as rc])
    #?(:clj [orchestra.core :refer [defn-spec]]
       :cljs [orchestra.core :refer-macros [defn-spec]])
-   #?(:clj [clojure.edn :as edn]
-      :cljs [cljs.reader :as edn])
+   #?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])
    [dda.c4k-common.yaml :as yaml]
    [dda.c4k-common.common :as cm]
    [dda.c4k-common.base64 :as b64]
@@ -136,15 +134,7 @@
 
 #?(:cljs
    (defmethod yaml/load-resource :website [resource-name]
-     (case resource-name
-       "website/nginx-configmap.yaml" (rc/inline "website/nginx-configmap.yaml")
-       "website/nginx-deployment.yaml" (rc/inline "website/nginx-deployment.yaml")
-       "website/nginx-service.yaml" (rc/inline "website/nginx-service.yaml")
-       "website/website-build-cron.yaml" (rc/inline "website/website-build-cron.yaml")
-       "website/website-build-secret.yaml" (rc/inline "website/website-build-secret.yaml")
-       "website/website-content-volume.yaml" (rc/inline "website/website-content-volume.yaml")
-       "website/hashfile-volume.yaml" (rc/inline "website/hashfile-volume.yaml")
-       (throw (js/Error. "Undefined Resource!")))))
+     (get (inline-resources "website") resource-name)))
 
 (defn-spec generate-nginx-deployment pred/map-or-seq?
   [config websiteconfig?]