project-cljs.clj

@@ -1,4 +1,4 @@
-(defproject org.domaindrivenarchitecture/c4k-common-cljs "6.2.3-SNAPSHOT"
+(defproject org.domaindrivenarchitecture/c4k-common-cljs "6.2.2-SNAPSHOT"
   :description "Contains predicates and tools for c4k"
   :url "https://domaindrivenarchitecture.org"
   :license {:name "Apache License, Version 2.0"

project.clj

@@ -1,4 +1,4 @@
-(defproject org.domaindrivenarchitecture/c4k-common-clj "6.2.3-SNAPSHOT"
+(defproject org.domaindrivenarchitecture/c4k-common-clj "6.2.2-SNAPSHOT"
   :description "Contains predicates and tools for c4k"
   :url "https://domaindrivenarchitecture.org"
   :license {:name "Apache License, Version 2.0"
@@ -26,7 +26,7 @@
                        :main dda.c4k-common.uberjar
                        :uberjar-name "c4k-common-standalone.jar"
                        :dependencies [[org.clojure/tools.cli "1.1.230"]
-                                      [ch.qos.logback/logback-classic "1.5.1"
+                                      [ch.qos.logback/logback-classic "1.5.0"
                                        :exclusions [com.sun.mail/javax.mail]]
                                       [org.slf4j/jcl-over-slf4j "2.0.12"]]}}
   :release-tasks [["test"]
@@ -34,4 +34,8 @@
                   ["change" "version" "leiningen.release/bump-version" "release"]
                   ["vcs" "commit"]
                   ["vcs" "tag" "v" "--no-sign"]
-                  ["change" "version" "leiningen.release/bump-version"]])
+                  ["change" "version" "leiningen.release/bump-version"]]
+  :aliases {"inst" ["shell"
+                    "sh"
+                    "-c"
+                    "lein uberjar && sudo install -m=755 target/uberjar/c4k-common-standalone.jar /usr/local/bin/c4k-common-standalone.jar"]})

src/main/cljc/dda/c4k_common/ingress.cljc

@@ -73,7 +73,6 @@
         {:keys [average-rate]} final-config]
     [(int/generate-certificate final-config)
      (int/generate-rate-limit-middleware {:rate-limit-name service-name
-                                          :namespace (:namespace final-config)
                                           :average-rate average-rate
                                           :burst-rate average-rate})
      (int/generate-ingress final-config)]))

src/main/cljc/dda/c4k_common/ingress/ingress_internal.cljc

@@ -41,10 +41,7 @@
 (def certificate? (s/keys :req-un [::fqdns ::app-name ::cert-name ::issuer ::ns/namespace]))
 
 
-(def rate-limit-config? (s/keys :req-un [::rate-limit-name
+(def rate-limit-config? (s/keys :req-un [::rate-limit-name ::average-rate ::burst-rate]))
-                                         ::ns/namespace
-                                         ::average-rate 
-                                         ::burst-rate]))
 
 
 (defn-spec generate-host-rule map?
@@ -75,11 +72,10 @@
 
 (defn-spec generate-rate-limit-middleware map?
   [config rate-limit-config?]
-  (let [{:keys [rate-limit-name average-rate burst-rate namespace]} config]
+  (let [{:keys [rate-limit-name average-rate burst-rate]} config]
     (->
      (yaml/load-as-edn "ingress/middleware-ratelimit.yaml")
      (assoc-in [:metadata :name] (str rate-limit-name "-ratelimit"))
-     (assoc-in [:metadata :namespace] namespace)
      (assoc-in [:spec :rateLimit :average] average-rate)
      (assoc-in [:spec :rateLimit :burst] burst-rate))))
 
@@ -98,8 +94,7 @@
                 "web, websecure"
                 :traefik.ingress.kubernetes.io/router.middlewares
                 (if rate-limit-name
-                  (str "default-redirect-https@kubernetescrd, " 
+                  (str "default-redirect-https@kubernetescrd, " rate-limit-name "-ratelimit@kubernetescrd")
-                       namespace "-" rate-limit-name "-ratelimit@kubernetescrd")
                   "default-redirect-https@kubernetescrd")
                 :metallb.universe.tf/address-pool "public"})
      (assoc-in [:spec :tls 0 :secretName] cert-name)

src/main/resources/ingress/middleware-ratelimit.yaml

@@ -2,7 +2,6 @@ apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
   name: ratelimit
-  namespace: default
 spec:
   rateLimit:
     average: AVG

src/test/cljc/dda/c4k_common/ingress/ingress_internal_test.cljc

@@ -62,11 +62,9 @@
 (deftest should-generate-middleware-ratelimit
   (is (= {:apiVersion "traefik.containo.us/v1alpha1",
           :kind "Middleware",
-          :metadata {:name "normal-ratelimit"
+          :metadata {:name "normal-ratelimit"},
-                     :namespace "myapp",},
           :spec {:rateLimit {:average 10, :burst 5}}}
          (cut/generate-rate-limit-middleware {:rate-limit-name "normal"
-                                              :namespace "myapp"
                                               :average-rate 10, :burst-rate 5}))))
 
 
@@ -96,7 +94,7 @@
           :annotations {:traefik.ingress.kubernetes.io/router.entrypoints
                         "web, websecure"
                         :traefik.ingress.kubernetes.io/router.middlewares
-                        "default-redirect-https@kubernetescrd, default-normal-ratelimit@kubernetescrd",
+                        "default-redirect-https@kubernetescrd, normal-ratelimit@kubernetescrd",
                         :metallb.universe.tf/address-pool "public"}}
          (:metadata (cut/generate-ingress
                      {

src/test/cljc/dda/c4k_common/ingress_test.cljc

@@ -99,8 +99,7 @@
             :issuerRef {:name "staging", :kind "ClusterIssuer"}}}
           {:apiVersion "traefik.containo.us/v1alpha1",
            :kind "Middleware",
-           :metadata {:name "web-ratelimit"
+           :metadata {:name "web-ratelimit"},
-                      :namespace "default"},
            :spec {:rateLimit {:average 10, :burst 10}}}
           {:apiVersion "networking.k8s.io/v1",
            :kind "Ingress",
@@ -111,7 +110,7 @@
             :annotations
             {:traefik.ingress.kubernetes.io/router.entrypoints "web, websecure",
              :traefik.ingress.kubernetes.io/router.middlewares
-             "default-redirect-https@kubernetescrd, default-web-ratelimit@kubernetescrd",
+             "default-redirect-https@kubernetescrd, web-ratelimit@kubernetescrd",
              :metallb.universe.tf/address-pool "public"}},
            :spec
            {:tls [{:hosts ["test.jit.si"], :secretName "web"}],