Add namespaces
Also Update postgres usage
This commit is contained in:
parent
f4bf41d374
commit
3639f3d5e6
5 changed files with 17 additions and 12 deletions
|
@ -8,7 +8,8 @@
|
||||||
[dda.c4k-common.monitoring :as mon]
|
[dda.c4k-common.monitoring :as mon]
|
||||||
[dda.c4k-common.yaml :as yaml]
|
[dda.c4k-common.yaml :as yaml]
|
||||||
[dda.c4k-common.postgres :as postgres]
|
[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)
|
(def default-storage-class :local-path)
|
||||||
|
|
||||||
|
@ -29,15 +30,17 @@
|
||||||
(filter
|
(filter
|
||||||
#(not (nil? %))
|
#(not (nil? %))
|
||||||
(cm/concat-vec
|
(cm/concat-vec
|
||||||
[(postgres/generate-config {:postgres-size :2gb :db-name "keycloak"})
|
(ns/generate (merge {:namespace "keycloak"} config))
|
||||||
(postgres/generate-secret auth)
|
(postgres/generate (merge {:postgres-image "postgres:14"
|
||||||
(postgres/generate-pvc {:pv-storage-size-gb 30
|
:postgres-size :2gb
|
||||||
:pvc-storage-class-name default-storage-class})
|
:db-name "keycloak"
|
||||||
(postgres/generate-deployment :postgres-image "postgres:14")
|
:pv-storage-size-gb 30
|
||||||
(postgres/generate-service)
|
:pvc-storage-class-name default-storage-class
|
||||||
(kc/generate-secret auth)
|
:namespace "keycloak"})
|
||||||
|
auth)
|
||||||
|
[(kc/generate-secret auth)
|
||||||
(kc/generate-service)
|
(kc/generate-service)
|
||||||
(kc/generate-deployment config)]
|
(kc/generate-deployment config)]
|
||||||
(kc/generate-ingress config)
|
(kc/generate-ingress (merge {:namespace "keycloak"} config))
|
||||||
(when (:contains? config :mon-cfg)
|
(when (:contains? config :mon-cfg)
|
||||||
(mon/generate (:mon-cfg config) (:mon-auth auth)))))))
|
(mon/generate (:mon-cfg config) (:mon-auth auth)))))))
|
||||||
|
|
|
@ -2,7 +2,7 @@ apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: keycloak
|
name: keycloak
|
||||||
namespace: default
|
namespace: keycloak
|
||||||
labels:
|
labels:
|
||||||
app: keycloak
|
app: keycloak
|
||||||
spec:
|
spec:
|
||||||
|
|
|
@ -2,6 +2,7 @@ apiVersion: v1
|
||||||
kind: Secret
|
kind: Secret
|
||||||
metadata:
|
metadata:
|
||||||
name: keycloak-secret
|
name: keycloak-secret
|
||||||
|
namespace: keycloak
|
||||||
type: Opaque
|
type: Opaque
|
||||||
data:
|
data:
|
||||||
keycloak-user: admin
|
keycloak-user: admin
|
||||||
|
|
|
@ -4,6 +4,7 @@ metadata:
|
||||||
name: keycloak
|
name: keycloak
|
||||||
labels:
|
labels:
|
||||||
service: keycloak
|
service: keycloak
|
||||||
|
namespace: keycloak
|
||||||
spec:
|
spec:
|
||||||
ports:
|
ports:
|
||||||
- name: "http"
|
- name: "http"
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
(deftest should-generate-secret
|
(deftest should-generate-secret
|
||||||
(is (= {:apiVersion "v1"
|
(is (= {:apiVersion "v1"
|
||||||
:kind "Secret"
|
:kind "Secret"
|
||||||
:metadata {:name "keycloak-secret"}
|
:metadata {:name "keycloak-secret", :namespace "keycloak"}
|
||||||
:type "Opaque"
|
:type "Opaque"
|
||||||
:data
|
:data
|
||||||
{:keycloak-user "dXNlcg=="
|
{:keycloak-user "dXNlcg=="
|
||||||
|
@ -21,7 +21,7 @@
|
||||||
(is (= {:apiVersion "apps/v1",
|
(is (= {:apiVersion "apps/v1",
|
||||||
:kind "Deployment",
|
:kind "Deployment",
|
||||||
:metadata
|
:metadata
|
||||||
{:name "keycloak", :namespace "default", :labels {:app "keycloak"}},
|
{:name "keycloak", :namespace "keycloak", :labels {:app "keycloak"}},
|
||||||
:spec
|
:spec
|
||||||
{:replicas 1,
|
{:replicas 1,
|
||||||
:selector {:matchLabels {:app "keycloak"}},
|
:selector {:matchLabels {:app "keycloak"}},
|
||||||
|
|
Loading…
Reference in a new issue