Add the inline macro, native build and namespaces refactorings #1

Merged
patdyn merged 9 commits from refactorings into master 2024-07-04 14:02:43 +00:00
5 changed files with 17 additions and 12 deletions
Showing only changes of commit 3639f3d5e6 - Show all commits

View file

@ -8,7 +8,8 @@
[dda.c4k-common.monitoring :as mon]
[dda.c4k-common.yaml :as yaml]
[dda.c4k-common.postgres :as postgres]
[dda.c4k-keycloak.keycloak :as kc]))
[dda.c4k-keycloak.keycloak :as kc]
[dda.c4k-common.namespace :as ns]))
(def default-storage-class :local-path)
@ -29,15 +30,17 @@
(filter
#(not (nil? %))
(cm/concat-vec
[(postgres/generate-config {:postgres-size :2gb :db-name "keycloak"})
(postgres/generate-secret auth)
(postgres/generate-pvc {:pv-storage-size-gb 30
:pvc-storage-class-name default-storage-class})
(postgres/generate-deployment :postgres-image "postgres:14")
(postgres/generate-service)
(kc/generate-secret auth)
(ns/generate (merge {:namespace "keycloak"} config))
(postgres/generate (merge {:postgres-image "postgres:14"
:postgres-size :2gb
:db-name "keycloak"
: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 config)
(kc/generate-ingress (merge {:namespace "keycloak"} config))
(when (:contains? config :mon-cfg)
(mon/generate (:mon-cfg config) (:mon-auth auth)))))))

View file

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

View file

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

View file

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

View file

@ -10,7 +10,7 @@
(deftest should-generate-secret
(is (= {:apiVersion "v1"
:kind "Secret"
:metadata {:name "keycloak-secret"}
:metadata {:name "keycloak-secret", :namespace "keycloak"}
:type "Opaque"
:data
{:keycloak-user "dXNlcg=="
@ -21,7 +21,7 @@
(is (= {:apiVersion "apps/v1",
:kind "Deployment",
:metadata
{:name "keycloak", :namespace "default", :labels {:app "keycloak"}},
{:name "keycloak", :namespace "keycloak", :labels {:app "keycloak"}},
:spec
{:replicas 1,
:selector {:matchLabels {:app "keycloak"}},