bump version to: 1.3.2-SNAPSHOT

Reviewed-on: #2

README.md

@@ -1,7 +1,7 @@
 # convention 4 kubernetes: c4k-keycloak
 [![Clojars Project](https://img.shields.io/clojars/v/org.domaindrivenarchitecture/c4k-keycloak.svg)](https://clojars.org/org.domaindrivenarchitecture/c4k-keycloak) [![pipeline status](https://gitlab.com/domaindrivenarchitecture/c4k-keycloak/badges/master/pipeline.svg)](https://gitlab.com/domaindrivenarchitecture/c4k-keycloak/-/commits/master) 
 
-[<img src="https://domaindrivenarchitecture.org/img/delta-chat.svg" width=20 alt="DeltaChat"> chat over e-mail](mailto:buero@meissa-gmbh.de?subject=community-chat) | [<img src="https://meissa-gmbh.de/img/community/Mastodon_Logotype.svg" width=20 alt="team@social.meissa-gmbh.de"> team@social.meissa-gmbh.de](https://social.meissa-gmbh.de/@team) | [Website & Blog](https://domaindrivenarchitecture.org)
+[<img src="https://domaindrivenarchitecture.org/img/delta-chat.svg" width=20 alt="DeltaChat"> chat over e-mail](mailto:buero@meissa-gmbh.de?subject=community-chat) | [<img src="https://meissa.de/images/parts/contact/mastodon36_hue9b2464f10b18e134322af482b9c915e_5501_filter_14705073121015236177.png" width=20 alt="M"> meissa@social.meissa-gmbh.de](https://social.meissa-gmbh.de/@meissa) | [Blog](https://domaindrivenarchitecture.org) | [Website](https://meissa.de)
 
 ## Purpose
 
@@ -43,6 +43,6 @@ For more details about our repository model see: https://repo.prod.meissa.de/mei
 
 ## License
 
-Copyright © 2021 meissa GmbH
+Copyright © 2024 meissa GmbH
 Licensed under the [Apache License, Version 2.0](LICENSE) (the "License")
 Pls. find licenses of our subcomponents [here](doc/SUBCOMPONENT_LICENSE)

build.py

@@ -23,8 +23,6 @@ def initialize(project):
         "release_primary_build_file": "project.clj",
         "release_secondary_build_files": [
             "package.json",
-            "infrastructure/backup/build.py",
-            "infrastructure/federated/build.py",
         ],
         "release_artifact_server_url": "https://repo.prod.meissa.de",
         "release_organisation": "meissa",
@@ -102,6 +100,12 @@ def package_frontend(project):
 
 @task
 def package_uberjar(project):
+    run("mkdir -p target/uberjar", shell=True, check=True)
+    run(
+        "lein uberjar",
+        shell=True,
+        check=True,
+    )
     run(
         "sha256sum target/uberjar/c4k-keycloak-standalone.jar > target/uberjar/" + project.name + "-standalone.jar.sha256",
         shell=True,
@@ -128,13 +132,10 @@ def package_native(project):
         "--no-server " +
         "--no-fallback " +
         "--features=clj_easy.graal_build_time.InitClojureClasses " +
-        "-jar target/uberjar/" + project.name + "-standalone.jar " +
+        f"-jar target/uberjar/{project.name}-standalone.jar " +
-        "-march=compatibility " +
-        "-H:+UnlockExperimentalVMOptions " +
         "-H:IncludeResources=.*.yaml " +
-        "-H:IncludeResources=logback.xml " +
         "-H:Log=registerResource:verbose " +
-        "-H:Name=target/graalvm/" + project.name + "",
+        f"-H:Name=target/graalvm/{project.name}",
         shell=True,
         check=True,
     )
@@ -152,11 +153,7 @@ def package_native(project):
 
 @task
 def inst(project):
-    run(
+    package_uberjar(project)
-        "lein uberjar",
-        shell=True,
-        check=True,
-    )
     package_native(project)
     run(
         "sudo install -m=755 target/uberjar/" + project.name + "-standalone.jar /usr/local/bin/" + project.name + "-standalone.jar",
@@ -177,11 +174,6 @@ def upload_clj(project):
 
 @task
 def lint(project):
-    #run(
-    #    "lein eastwood",
-    #    shell=True,
-    #    check=True,
-    #)
     run(
         "lein ancient check",
         shell=True,

package.json

@@ -2,7 +2,7 @@
     "name": "c4k-keycloak",
     "description": "Generate c4k yaml for a keycloak deployment.",
     "author": "meissa GmbH",
-    "version": "1.2.0",
+    "version": "1.3.2-SNAPSHOT",
     "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-keycloak#readme",
     "repository": "https://www.npmjs.com/package/c4k-keycloak",
     "license": "APACHE2",

project.clj

@@ -1,11 +1,11 @@
-(defproject org.domaindrivenarchitecture/c4k-keycloak "1.2.0"
+(defproject org.domaindrivenarchitecture/c4k-keycloak "1.3.2-SNAPSHOT"
   :description "keycloak c4k-installation package"
   :url "https://domaindrivenarchitecture.org"
   :license {:name "Apache License, Version 2.0"
             :url "https://www.apache.org/licenses/LICENSE-2.0.html"}
-  :dependencies [[org.clojure/clojure "1.11.3"]
+  :dependencies [[org.clojure/clojure "1.11.4"]
-                 [org.clojure/tools.reader "1.4.2"]
+                 [org.clojure/tools.reader "1.5.0"]
-                 [org.domaindrivenarchitecture/c4k-common-clj "6.4.1"]]
+                 [org.domaindrivenarchitecture/c4k-common-clj "8.0.0"]]
   :target-path "target/%s/"
   :source-paths ["src/main/cljc"
                  "src/main/clj"]
@@ -22,9 +22,9 @@
                        :main dda.c4k-keycloak.uberjar
                        :uberjar-name "c4k-keycloak-standalone.jar"
                        :dependencies [[org.clojure/tools.cli "1.1.230"]
-                                      [ch.qos.logback/logback-classic "1.5.6"
+                                      [ch.qos.logback/logback-classic "1.5.7"
                                        :exclusions [com.sun.mail/javax.mail]]
-                                      [org.slf4j/jcl-over-slf4j "2.0.13"]
+                                      [org.slf4j/jcl-over-slf4j "2.0.16"]
                                       [com.github.clj-easy/graal-build-time "1.0.5"]]}}
   :release-tasks [["test"]
                   ["vcs" "assert-committed"]

src/main/clj/dda/c4k_keycloak/uberjar.clj

@@ -7,10 +7,11 @@
 (set! *warn-on-reflection* true)
 
 (defn -main [& cmd-args]
-  (uberjar/main-common
+  (uberjar/main-cm
    "c4k-keycloak"
    core/config?
    core/auth?
    core/config-defaults
-   core/k8s-objects
+   core/config-objects
+   core/auth-objects
    cmd-args))

src/main/cljc/dda/c4k_keycloak/core.cljc

@@ -13,34 +13,45 @@
 
 (def default-storage-class :local-path)
 
-(def config-defaults {:issuer "staging"})
+(def config-defaults {:issuer "staging",
+                      :namespace "keycloak"
+                      :postgres-image "postgres:14"
+                      :postgres-size :2gb
+                      :db-name "keycloak"
+                      :pv-storage-size-gb 30
+                      :pvc-storage-class-name default-storage-class})
 
 (def config? (s/keys :req-un [::kc/fqdn]
                      :opt-un [::kc/issuer
-                              ::mon/mon-cfg]))
+                              ::mon/mon-cfg
+                              ::kc/namespace]))
 
 (def auth? (s/keys :req-un [::kc/keycloak-admin-user ::kc/keycloak-admin-password
                             ::postgres/postgres-db-user ::postgres/postgres-db-password]
                    :opt-un [::mon/mon-auth]))
 
-(defn-spec k8s-objects cp/map-or-seq?
+(defn-spec config-objects cp/map-or-seq?
+  [config config?]
+  (map yaml/to-string
+       (filter
+        #(not (nil? %))
+        (cm/concat-vec
+         (ns/generate config)
+         (postgres/generate-config config)
+         [(kc/generate-service config)
+          (kc/generate-deployment config)]
+         (kc/generate-ingress config)
+         (when (contains? config :mon-cfg)
+           (mon/generate-config))))))
+
+(defn-spec auth-objects cp/map-or-seq?
   [config config?
    auth auth?]
   (map yaml/to-string
        (filter
         #(not (nil? %))
         (cm/concat-vec
-         (ns/generate (merge {:namespace "keycloak"} config))
+         (postgres/generate-auth config auth)
-         (postgres/generate (merge {:postgres-image "postgres:14"
+         [(kc/generate-secret config auth)]
-                                    :postgres-size :2gb
+         (when (and (contains? auth :mon-auth) (contains? config :mon-cfg))
-                                    :db-name "keycloak"
+           (mon/generate-auth (:mon-cfg config) (:mon-auth auth)))))))
-                                    :pv-storage-size-gb 30
-                                    :pvc-storage-class-name default-storage-class
-                                    :namespace "keycloak"})
-                            auth)
-         [(kc/generate-secret auth)
-          (kc/generate-service)
-          (kc/generate-deployment config)]
-         (kc/generate-ingress (merge {:namespace "keycloak"} config))
-         (when (:contains? config :mon-cfg)
-           (mon/generate (:mon-cfg config) (:mon-auth auth)))))))

src/main/cljc/dda/c4k_keycloak/keycloak.cljc

@@ -11,12 +11,14 @@
   [dda.c4k-common.predicate :as cp]))
 
 (s/def ::fqdn cp/fqdn-string?)
+(s/def ::namespace string?)
 (s/def ::issuer cp/letsencrypt-issuer?)
 (s/def ::keycloak-admin-user cp/bash-env-string?)
 (s/def ::keycloak-admin-password cp/bash-env-string?)
 
 (def config? (s/keys :req-un [::fqdn]
-                     :opt-un [::issuer]))
+                     :opt-un [::issuer
+                              ::namespace]))
 
 (def auth? (s/keys :req-un [::keycloak-admin-user 
                             ::keycloak-admin-password]))
@@ -35,20 +37,28 @@
     config)))
 
 (defn-spec generate-secret cp/map-or-seq?
-  [auth auth?]
+  [config config?
-  (let [{:keys [keycloak-admin-user keycloak-admin-password]} auth]
+   auth auth?]
+  (let [{:keys [namespace]} config
+        {:keys [keycloak-admin-user keycloak-admin-password]} auth]
     (->
      (yaml/load-as-edn "keycloak/secret.yaml")
+     (cm/replace-all-matching "NAMESPACE" namespace)
      (cm/replace-key-value :keycloak-user (b64/encode keycloak-admin-user))
      (cm/replace-key-value :keycloak-password (b64/encode keycloak-admin-password)))))
 
-(defn-spec generate-service cp/map-or-seq? []
+(defn-spec generate-service cp/map-or-seq? 
-  (yaml/load-as-edn "keycloak/service.yaml"))
+  [config config?]
+  (let [{:keys [namespace]} config]
+    (->
+     (yaml/load-as-edn "keycloak/service.yaml")
+     (cm/replace-all-matching "NAMESPACE" namespace))))
 
 (defn-spec generate-deployment cp/map-or-seq?
   [config config?]
-  (let [{:keys [fqdn]} config]
+  (let [{:keys [fqdn namespace]} config]
     (-> 
      (yaml/load-as-edn "keycloak/deployment.yaml")
-     (cm/replace-all-matching-values-by-new-value "FQDN" fqdn))))
+     (cm/replace-all-matching "NAMESPACE" namespace)
+     (cm/replace-all-matching "FQDN" fqdn))))
   

src/main/resources/keycloak/deployment.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: keycloak
-  namespace: keycloak
+  namespace: NAMESPACE
   labels:
     app: keycloak
 spec:

src/main/resources/keycloak/secret.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: keycloak-secret
-  namespace: keycloak
+  namespace: NAMESPACE
 type: Opaque
 data:
   keycloak-user: admin

src/main/resources/keycloak/service.yaml

@@ -4,7 +4,7 @@ metadata:
   name: keycloak
   labels:
     service: keycloak
-  namespace: keycloak
+  namespace: NAMESPACE
 spec:
   ports:
   - name: "http"

src/test/cljc/dda/c4k_keycloak/keycloak_test.cljc

@@ -15,7 +15,7 @@
           :data
           {:keycloak-user "dXNlcg=="
            :keycloak-password "cGFzc3dvcmQ="}}
-         (cut/generate-secret {:keycloak-admin-user "user" :keycloak-admin-password "password"}))))
+         (cut/generate-secret {:namespace "keycloak" :fqdn "test.de"} {:keycloak-admin-user "user" :keycloak-admin-password "password"}))))
 
 (deftest should-generate-deployment
   (is (= {:apiVersion "apps/v1",
@@ -75,4 +75,4 @@
                 :items
                 [{:key "tls.crt", :path "tls.crt"}
                  {:key "tls.key", :path "tls.key"}]}}]}}}}
-         (cut/generate-deployment {:fqdn "test.de"}))))
+         (cut/generate-deployment {:fqdn "test.de" :namespace "keycloak"}))))