diff --git a/infrastructure/backup/build.py b/infrastructure/backup/build.py index 4503c5f..2a43c08 100644 --- a/infrastructure/backup/build.py +++ b/infrastructure/backup/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = "c4k-forgejo" MODULE = "backup" PROJECT_ROOT_PATH = "../.." -version = "3.4.4-dev" +version = "3.4.5-dev" @init diff --git a/infrastructure/federated/build.py b/infrastructure/federated/build.py index 8001247..30cefe9 100644 --- a/infrastructure/federated/build.py +++ b/infrastructure/federated/build.py @@ -6,7 +6,7 @@ from ddadevops import * name = 'c4k-forgejo' MODULE = 'federated' PROJECT_ROOT_PATH = '../..' -version = "3.4.4-dev" +version = "3.4.5-dev" @init def initialize(project): diff --git a/package.json b/package.json index 814ba93..e4039aa 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "c4k-forgejo", "description": "Generate c4k yaml for a forgejo deployment.", "author": "meissa GmbH", - "version": "3.4.4-SNAPSHOT", + "version": "3.4.5-SNAPSHOT", "homepage": "https://gitlab.com/domaindrivenarchitecture/c4k-forgejo#readme", "repository": "https://www.npmjs.com/package/c4k-forgejo", "license": "APACHE2", diff --git a/project.clj b/project.clj index a08839f..ed3592e 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject org.domaindrivenarchitecture/c4k-forgejo "3.4.4-SNAPSHOT" +(defproject org.domaindrivenarchitecture/c4k-forgejo "3.4.5-SNAPSHOT" :description "forgejo c4k-installation package" :url "https://domaindrivenarchitecture.org" :license {:name "Apache License, Version 2.0" diff --git a/src/main/cljc/dda/c4k_forgejo/core.cljc b/src/main/cljc/dda/c4k_forgejo/core.cljc index c3b2a2b..16e37aa 100644 --- a/src/main/cljc/dda/c4k_forgejo/core.cljc +++ b/src/main/cljc/dda/c4k_forgejo/core.cljc @@ -59,9 +59,8 @@ (forgejo/generate-service-ssh) (forgejo/generate-data-volume resolved-config) (forgejo/generate-appini-env resolved-config) - (forgejo/generate-secrets auth) - (forgejo/generate-rate-limit-middleware rate-limit-defaults)] ; this does not have a vector as output - (forgejo/generate-rate-limit-ingress-and-cert resolved-config) ; this function has a vector as output + (forgejo/generate-secrets auth)] ; this does not have a vector as output + (forgejo/generate-ratelimit-ingress-and-cert resolved-config) ; this function has a vector as output (when (contains? resolved-config :restic-repository) [(backup/generate-config resolved-config) (backup/generate-secret auth) diff --git a/src/main/cljc/dda/c4k_forgejo/forgejo.cljc b/src/main/cljc/dda/c4k_forgejo/forgejo.cljc index 06c61cd..c542ded 100644 --- a/src/main/cljc/dda/c4k_forgejo/forgejo.cljc +++ b/src/main/cljc/dda/c4k_forgejo/forgejo.cljc @@ -128,35 +128,17 @@ (cm/replace-all-matching "MAILERUSER" (b64/encode mailer-user)) (cm/replace-all-matching "MAILERPW" (b64/encode mailer-pw))))) -(defn generate-ingress-and-cert - [config] - (let [{:keys [fqdn]} config] - (ing/generate-ingress-and-cert - (merge - {:service-name "forgejo-service" - :service-port 3000 - :fqdns [fqdn]} - config)))) - -(defn-spec generate-rate-limit-ingress-and-cert pred/map-or-seq? +(defn-spec generate-ratelimit-ingress-and-cert seq? [config config?] - (-> - (generate-ingress-and-cert config) ; returns a vector - (#(assoc-in % ; Attention: heavily relying on the output order of ing/generate-ingress-and-cert - [1 :metadata :annotations :traefik.ingress.kubernetes.io/router.middlewares] - (str - (-> (second %) :metadata :annotations :traefik.ingress.kubernetes.io/router.middlewares) - ", default-ratelimit@kubernetescrd"))))) - - -; using :average and :burst seems sensible, :period may be interesting for fine tuning later on -(defn-spec generate-rate-limit-middleware pred/map-or-seq? - [config rate-limit-config?] - (let [{:keys [max-rate max-concurrent-requests]} config] - (-> - (yaml/load-as-edn "forgejo/middleware-ratelimit.yaml") - (cm/replace-key-value :average max-rate) - (cm/replace-key-value :burst max-concurrent-requests)))) + (let [{:keys [fqdn max-rate max-concurrent-requests namespace]} config] + (ing/generate-simple-ingress (merge + {:service-name "forgejo-service" + :service-port 3000 + :fqdns [fqdn] + :average-rate max-rate + :burst-rate max-concurrent-requests + :namespace namespace} + config)))) (defn-spec generate-data-volume pred/map-or-seq? [config vol?] diff --git a/src/main/resources/forgejo/middleware-ratelimit.yaml b/src/main/resources/forgejo/middleware-ratelimit.yaml deleted file mode 100644 index 918dd95..0000000 --- a/src/main/resources/forgejo/middleware-ratelimit.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: traefik.containo.us/v1alpha1 -kind: Middleware -metadata: - name: ratelimit - namespace: forgejo -spec: - rateLimit: # Config options for rate limiting: https://doc.traefik.io/traefik/middlewares/http/ratelimit/ - average: AVG - burst: BRS \ No newline at end of file diff --git a/src/test/cljc/dda/c4k_forgejo/forgejo_test.cljc b/src/test/cljc/dda/c4k_forgejo/forgejo_test.cljc index 8ea7db0..d7b801b 100644 --- a/src/test/cljc/dda/c4k_forgejo/forgejo_test.cljc +++ b/src/test/cljc/dda/c4k_forgejo/forgejo_test.cljc @@ -163,26 +163,3 @@ :storage-c2 "15Gi"} (th/map-diff (cut/generate-data-volume {:volume-total-storage-size 1}) (cut/generate-data-volume {:volume-total-storage-size 15}))))) - -(deftest should-generate-middleware-ratelimit - (is (= {:apiVersion "traefik.containo.us/v1alpha1", - :kind "Middleware", - :metadata {:name "ratelimit", :namespace "forgejo"}, - :spec {:rateLimit {:average 10, :burst 5}}} - (cut/generate-rate-limit-middleware {:max-rate 10, :max-concurrent-requests 5})))) - -(deftest should-generate-middleware-ratelimit-ingress-and-cert - (is (= {:traefik.ingress.kubernetes.io/router.entrypoints "web, websecure", - :traefik.ingress.kubernetes.io/router.middlewares - "default-redirect-https@kubernetescrd, default-ratelimit@kubernetescrd", - :metallb.universe.tf/address-pool "public"} - (-> (second - (cut/generate-rate-limit-ingress-and-cert - {:fqdn "test.de" - :mailer-from "" - :mailer-host "m.t.de" - :mailer-port "123" - :service-noreply-address "" - :average 10 - :burst 5})) - :metadata :annotations))))