add-hugo-build #5

Merged
gec merged 18 commits from add-hugo-build into main 2024-03-15 12:02:22 +00:00
2 changed files with 14 additions and 3 deletions
Showing only changes of commit e1d43cddc5 - Show all commits

View file

@ -16,6 +16,8 @@
(s/def ::unique-name ::web/unique-name) (s/def ::unique-name ::web/unique-name)
(s/def ::issuer ::web/issuer) (s/def ::issuer ::web/issuer)
(s/def ::volume-size ::web/volume-size) (s/def ::volume-size ::web/volume-size)
(s/def ::average-rate ::ing/average-rate)
(s/def ::burst-rate ::ing/burst-rate)
(s/def ::authtoken ::web/authtoken) (s/def ::authtoken ::web/authtoken)
(s/def ::fqdns ::web/fqdns) (s/def ::fqdns ::web/fqdns)
@ -51,7 +53,9 @@
(def config? (s/keys :req-un [::websiteconfigs] (def config? (s/keys :req-un [::websiteconfigs]
:opt-un [::issuer :opt-un [::issuer
::volume-size ::volume-size
::mon-cfg])) ::mon-cfg
::average-rate
::burst-rate]))
(def auth? (s/keys :req-un [::websiteauths] (def auth? (s/keys :req-un [::websiteauths]
:opt-un [::mon-auth])) :opt-un [::mon-auth]))
@ -64,7 +68,9 @@
:build-memory-request "256Mi" :build-memory-request "256Mi"
:build-memory-limit "512Mi" :build-memory-limit "512Mi"
:volume-size "3" :volume-size "3"
:redirects []}) :redirects []
:average-rate 50
:burst-rate 30})
(defn-spec sort-config map? (defn-spec sort-config map?
[unsorted-config config?] [unsorted-config config?]
@ -86,7 +92,11 @@
(when (contains? config :issuer) (when (contains? config :issuer)
{:issuer (config :issuer)}) {:issuer (config :issuer)})
(when (contains? config :volume-size) (when (contains? config :volume-size)
{:volume-size (config :volume-size)})))) {:volume-size (config :volume-size)})
(when (contains? config :average-rate)
{:average-rate (config :average-rate)})
(when (contains? config :burst-rate)
{:burst-rate (config :burst-rate)}))))
(defn-spec flatten-and-reduce-auth map? (defn-spec flatten-and-reduce-auth map?
[auth auth?] [auth auth?]

View file

@ -19,3 +19,4 @@ mon-cfg:
grafana-cloud-url: "url-for-your-prom-remote-write-endpoint" grafana-cloud-url: "url-for-your-prom-remote-write-endpoint"
cluster-name: "website" cluster-name: "website"
cluster-stage: "test" cluster-stage: "test"
average-rate: 50