Merge branch 'kc-upgrade-and-integration' of ssh://repo.prod.meissa.de:2222/meissa/c4k-keycloak into kc-upgrade-and-integration
This commit is contained in:
commit
30a93b11f7
1 changed files with 17 additions and 15 deletions
|
@ -1,18 +1,20 @@
|
||||||
(ns dda.c4k-keycloak.keycloak
|
(ns dda.c4k-keycloak.keycloak
|
||||||
(:require
|
(:require
|
||||||
[clojure.spec.alpha :as s]
|
[clojure.spec.alpha :as s]
|
||||||
#?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])
|
#?(:cljs [dda.c4k-common.macros :refer-macros [inline-resources]])
|
||||||
#?(:clj [orchestra.core :refer [defn-spec]]
|
#?(:clj [orchestra.core :refer [defn-spec]]
|
||||||
:cljs [orchestra.core :refer-macros [defn-spec]])
|
:cljs [orchestra.core :refer-macros [defn-spec]])
|
||||||
[dda.c4k-common.yaml :as yaml]
|
[dda.c4k-common.yaml :as yaml]
|
||||||
[dda.c4k-common.common :as cm]
|
[dda.c4k-common.common :as cm]
|
||||||
[dda.c4k-common.base64 :as b64]
|
[dda.c4k-common.base64 :as b64]
|
||||||
[dda.c4k-common.ingress :as ing]
|
[dda.c4k-common.ingress :as ing]
|
||||||
[dda.c4k-common.predicate :as cp]))
|
[dda.c4k-common.predicate :as cp]))
|
||||||
|
|
||||||
(s/def ::fqdn cp/fqdn-string?)
|
(s/def ::fqdn cp/fqdn-string?)
|
||||||
(s/def ::namespace string?)
|
|
||||||
(s/def ::issuer cp/letsencrypt-issuer?)
|
(s/def ::issuer cp/letsencrypt-issuer?)
|
||||||
|
(s/def ::namespace string?)
|
||||||
|
(s/def ::max-rate int?)
|
||||||
|
(s/def ::max-concurrent-requests int?)
|
||||||
(s/def ::keycloak-admin-user cp/bash-env-string?)
|
(s/def ::keycloak-admin-user cp/bash-env-string?)
|
||||||
(s/def ::keycloak-admin-password cp/bash-env-string?)
|
(s/def ::keycloak-admin-password cp/bash-env-string?)
|
||||||
|
|
||||||
|
@ -20,7 +22,7 @@
|
||||||
:opt-un [::issuer
|
:opt-un [::issuer
|
||||||
::namespace
|
::namespace
|
||||||
::max-rate
|
::max-rate
|
||||||
::burst-rate]))
|
::max-concurrent-requests]))
|
||||||
|
|
||||||
(def auth? (s/keys :req-un [::keycloak-admin-user
|
(def auth? (s/keys :req-un [::keycloak-admin-user
|
||||||
::keycloak-admin-password]))
|
::keycloak-admin-password]))
|
||||||
|
@ -34,7 +36,7 @@
|
||||||
(let [{:keys [fqdn max-rate max-concurrent-requests namespace]} config]
|
(let [{:keys [fqdn max-rate max-concurrent-requests namespace]} config]
|
||||||
(ing/generate-simple-ingress (merge
|
(ing/generate-simple-ingress (merge
|
||||||
{:service-name "keycloak"
|
{:service-name "keycloak"
|
||||||
:service-port 8080
|
:service-port 80
|
||||||
:fqdns [fqdn]
|
:fqdns [fqdn]
|
||||||
:average-rate max-rate
|
:average-rate max-rate
|
||||||
:burst-rate max-concurrent-requests
|
:burst-rate max-concurrent-requests
|
||||||
|
|
Loading…
Reference in a new issue