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:
patdyn 2024-08-29 11:40:38 +02:00
commit 30a93b11f7

View file

@ -11,8 +11,10 @@
[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