meissa/c4k-common
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Implement burst-rate for simple-ingress

Browse source
This commit is contained in:
bom 2024-05-17 16:02:35 +02:00
parent dd897c7364
commit d2bf694e4e
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/cljc/dda/c4k_common/ingress.cljc
View file

@ -17,7 +17,7 @@
(s/def ::burst-rate ::int/burst-rate) (s/def ::burst-rate ::int/burst-rate)
(def simple-ingress? (s/keys :req-un [::fqdns ::service-name ::service-port] (def simple-ingress? (s/keys :req-un [::fqdns ::service-name ::service-port]
:opt-un [::issuer ::average-rate ::ns/namespace])) :opt-un [::issuer ::average-rate ::burst-rate ::ns/namespace]))
(def ingress? (s/keys :req-un [::fqdns ::app-name ::ingress-name ::service-name ::service-port] (def ingress? (s/keys :req-un [::fqdns ::app-name ::ingress-name ::service-name ::service-port]
:opt-un [::issuer ::cert-name ::rate-limit-name ::ns/namespace])) :opt-un [::issuer ::cert-name ::rate-limit-name ::ns/namespace]))
@ -32,7 +32,8 @@
(def default-config (def default-config
(merge ns/default-config (merge ns/default-config
{:issuer "staging" {:issuer "staging"
:average-rate 10})) :average-rate 10
:burst-rate 20}))
(defn-spec generate-certificate map? (defn-spec generate-certificate map?
@ -70,10 +71,10 @@
:rate-limit-name service-name} :rate-limit-name service-name}
default-config default-config
config) config)
{:keys [average-rate]} final-config] {:keys [average-rate burst-rate]} final-config]
[(int/generate-certificate final-config) [(int/generate-certificate final-config)
(int/generate-rate-limit-middleware {:rate-limit-name service-name (int/generate-rate-limit-middleware {:rate-limit-name service-name
:namespace (:namespace final-config) :namespace (:namespace final-config)
:average-rate average-rate :average-rate average-rate
:burst-rate average-rate}) :burst-rate burst-rate})
(int/generate-ingress final-config)])) (int/generate-ingress final-config)]))

2
src/test/cljc/dda/c4k_common/ingress_test.cljc
View file

@ -101,7 +101,7 @@
:kind "Middleware", :kind "Middleware",
:metadata {:name "web-ratelimit" :metadata {:name "web-ratelimit"
:namespace "default"}, :namespace "default"},
:spec {:rateLimit {:average 10, :burst 10}}} :spec {:rateLimit {:average 10, :burst 20}}}
{:apiVersion "networking.k8s.io/v1", {:apiVersion "networking.k8s.io/v1",
:kind "Ingress", :kind "Ingress",
:metadata :metadata