Compare commits
No commits in common. "ac57564e0f0a969dd82bb8f1f4f60a69f51d4084" and "9c5ca90eefb879dba5de5953f269a5286b428a80" have entirely different histories.
ac57564e0f
...
9c5ca90eef
8 changed files with 153 additions and 223 deletions
|
|
@ -27,7 +27,7 @@
|
||||||
"js-yaml": "^4.0.0"
|
"js-yaml": "^4.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"shadow-cljs": "^2.27.4",
|
"shadow-cljs": "^2.11.18",
|
||||||
"source-map-support": "^0.5.21"
|
"source-map-support": "^0.5.21"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
:url "https://www.apache.org/licenses/LICENSE-2.0.html"}
|
:url "https://www.apache.org/licenses/LICENSE-2.0.html"}
|
||||||
:dependencies [[org.clojure/clojure "1.11.1"]
|
:dependencies [[org.clojure/clojure "1.11.1"]
|
||||||
[org.clojure/tools.reader "1.4.0"]
|
[org.clojure/tools.reader "1.4.0"]
|
||||||
[org.domaindrivenarchitecture/c4k-common-clj "6.2.1"]
|
[org.domaindrivenarchitecture/c4k-common-clj "6.1.4-SNAPSHOT"]
|
||||||
[hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
|
[hickory "0.7.1" :exclusions [viebel/codox-klipse-theme]]]
|
||||||
:target-path "target/%s/"
|
:target-path "target/%s/"
|
||||||
:source-paths ["src/main/cljc"
|
:source-paths ["src/main/cljc"
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
"src/test/cljc"
|
"src/test/cljc"
|
||||||
"src/test/cljs"
|
"src/test/cljs"
|
||||||
"src/test/resources"]
|
"src/test/resources"]
|
||||||
:dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.2.1"]
|
:dependencies [[org.domaindrivenarchitecture/c4k-common-cljs "6.1.3"]
|
||||||
[hickory "0.7.1"]]
|
[hickory "0.7.1"]]
|
||||||
:builds {:frontend {:target :browser
|
:builds {:frontend {:target :browser
|
||||||
:modules {:main {:init-fn dda.c4k-website.browser/init}}
|
:modules {:main {:init-fn dda.c4k-website.browser/init}}
|
||||||
|
|
|
||||||
|
|
@ -67,10 +67,10 @@
|
||||||
[(website/generate-nginx-deployment (flatten-and-reduce-config config))
|
[(website/generate-nginx-deployment (flatten-and-reduce-config config))
|
||||||
(website/generate-nginx-configmap (flatten-and-reduce-config config))
|
(website/generate-nginx-configmap (flatten-and-reduce-config config))
|
||||||
(website/generate-nginx-service (flatten-and-reduce-config config))
|
(website/generate-nginx-service (flatten-and-reduce-config config))
|
||||||
(website/generate-content-pvc (flatten-and-reduce-config config))
|
(website/generate-website-content-volume (flatten-and-reduce-config config))
|
||||||
(website/generate-hash-state-pvc (flatten-and-reduce-config config))
|
(website/generate-hashfile-volume (flatten-and-reduce-config config))
|
||||||
(website/generate-build-cron (flatten-and-reduce-config config))
|
(website/generate-website-build-cron (flatten-and-reduce-config config))
|
||||||
(website/generate-build-secret (flatten-and-reduce-config config)
|
(website/generate-website-build-secret (flatten-and-reduce-config config)
|
||||||
(flatten-and-reduce-auth auth))]
|
(flatten-and-reduce-auth auth))]
|
||||||
(website/generate-ingress (flatten-and-reduce-config config))
|
(website/generate-ingress (flatten-and-reduce-config config))
|
||||||
)))))
|
)))))
|
||||||
|
|
|
||||||
|
|
@ -40,8 +40,7 @@
|
||||||
:build-cpu-limit "1700m"
|
:build-cpu-limit "1700m"
|
||||||
:build-memory-request "256Mi"
|
:build-memory-request "256Mi"
|
||||||
:build-memory-limit "512Mi"
|
:build-memory-limit "512Mi"
|
||||||
:volume-size "3"
|
:volume-size "3"})
|
||||||
:redirects []})
|
|
||||||
|
|
||||||
(defn-spec generate-nginx-deployment map?
|
(defn-spec generate-nginx-deployment map?
|
||||||
[config websiteconfig?]
|
[config websiteconfig?]
|
||||||
|
|
@ -64,32 +63,32 @@
|
||||||
(int/generate-nginx-service final-config)))
|
(int/generate-nginx-service final-config)))
|
||||||
|
|
||||||
|
|
||||||
(defn-spec generate-content-pvc map?
|
(defn-spec generate-website-content-volume map?
|
||||||
[config websiteconfig?]
|
[config websiteconfig?]
|
||||||
(let [final-config (merge config-defaults
|
(let [final-config (merge config-defaults
|
||||||
config)]
|
config)]
|
||||||
(int/generate-content-pvc final-config)))
|
(int/generate-website-content-volume final-config)))
|
||||||
|
|
||||||
|
|
||||||
(defn-spec generate-hash-state-pvc map?
|
(defn-spec generate-hashfile-volume map?
|
||||||
[config websiteconfig?]
|
[config websiteconfig?]
|
||||||
(let [final-config (merge config-defaults
|
(let [final-config (merge config-defaults
|
||||||
config)]
|
config)]
|
||||||
(int/generate-hash-state-pvc final-config)))
|
(int/generate-hashfile-volume final-config)))
|
||||||
|
|
||||||
(defn-spec generate-build-cron map?
|
(defn-spec generate-website-build-cron map?
|
||||||
[config websiteconfig?]
|
[config websiteconfig?]
|
||||||
(let [final-config (merge config-defaults
|
(let [final-config (merge config-defaults
|
||||||
config)]
|
config)]
|
||||||
(int/generate-build-cron final-config)))
|
(int/generate-website-build-cron final-config)))
|
||||||
|
|
||||||
|
|
||||||
(defn-spec generate-build-secret map?
|
(defn-spec generate-website-build-secret map?
|
||||||
[config websiteconfig?
|
[config websiteconfig?
|
||||||
auth websiteauth?]
|
auth websiteauth?]
|
||||||
(let [final-config (merge config-defaults
|
(let [final-config (merge config-defaults
|
||||||
config)]
|
config)]
|
||||||
(int/generate-build-secret final-config auth)))
|
(int/generate-website-build-secret final-config auth)))
|
||||||
|
|
||||||
(defn-spec generate-namespcae seq?
|
(defn-spec generate-namespcae seq?
|
||||||
[config websiteconfig?]
|
[config websiteconfig?]
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,8 @@
|
||||||
[dda.c4k-common.yaml :as yaml]
|
[dda.c4k-common.yaml :as yaml]
|
||||||
[dda.c4k-common.common :as cm]
|
[dda.c4k-common.common :as cm]
|
||||||
[dda.c4k-common.base64 :as b64]
|
[dda.c4k-common.base64 :as b64]
|
||||||
[dda.c4k-common.predicate :as pred]))
|
[dda.c4k-common.predicate :as pred]
|
||||||
|
[dda.c4k-common.ingress :as ing]))
|
||||||
|
|
||||||
(defn fqdn-list?
|
(defn fqdn-list?
|
||||||
[input]
|
[input]
|
||||||
|
|
@ -27,9 +28,6 @@
|
||||||
(s/def ::build-memory-request string?)
|
(s/def ::build-memory-request string?)
|
||||||
(s/def ::build-cpu-limit string?)
|
(s/def ::build-cpu-limit string?)
|
||||||
(s/def ::build-memory-limit string?)
|
(s/def ::build-memory-limit string?)
|
||||||
(s/def ::redirect (s/tuple string? string?))
|
|
||||||
(s/def ::redirects (s/coll-of ::redirect))
|
|
||||||
|
|
||||||
|
|
||||||
(def websiteconfig? (s/keys :req-un [::unique-name
|
(def websiteconfig? (s/keys :req-un [::unique-name
|
||||||
::fqdns
|
::fqdns
|
||||||
|
|
@ -41,8 +39,7 @@
|
||||||
::build-cpu-request
|
::build-cpu-request
|
||||||
::build-cpu-limit
|
::build-cpu-limit
|
||||||
::build-memory-request
|
::build-memory-request
|
||||||
::build-memory-limit
|
::build-memory-limit]))
|
||||||
::redirects]))
|
|
||||||
|
|
||||||
(def websiteauth? (s/keys :req-un [::unique-name ::username ::authtoken]))
|
(def websiteauth? (s/keys :req-un [::unique-name ::username ::authtoken]))
|
||||||
|
|
||||||
|
|
@ -73,9 +70,8 @@
|
||||||
user string?]
|
user string?]
|
||||||
(str "https://" host "/api/v1/repos/" user "/" repo "/git/" "commits/" "HEAD"))
|
(str "https://" host "/api/v1/repos/" user "/" repo "/git/" "commits/" "HEAD"))
|
||||||
|
|
||||||
|
(defn-spec replace-all-matching-substrings-beginning-with pred/map-or-seq?
|
||||||
(defn-spec replace-all-matching-prefixes map?
|
[col pred/map-or-seq?
|
||||||
[col map?
|
|
||||||
value-to-partly-match string?
|
value-to-partly-match string?
|
||||||
value-to-inplace string?]
|
value-to-inplace string?]
|
||||||
(clojure.walk/postwalk #(if (and (= (type value-to-partly-match) (type %))
|
(clojure.walk/postwalk #(if (and (= (type value-to-partly-match) (type %))
|
||||||
|
|
@ -84,15 +80,19 @@
|
||||||
col))
|
col))
|
||||||
|
|
||||||
|
|
||||||
(defn-spec generate-redirects string?
|
(defn-spec generate-nginx-deployment map?
|
||||||
[config websiteconfig?
|
[config websiteconfig?]
|
||||||
indent (s/or :pos pos-int? :zero zero?)]
|
(let [{:keys [unique-name build-cpu-request build-cpu-limit
|
||||||
(let [{:keys [redirects]} config]
|
build-memory-request build-memory-limit]} config
|
||||||
(str/join
|
name (replace-dots-by-minus unique-name)]
|
||||||
(str "\n" (str/join (take indent (repeat " "))))
|
(->
|
||||||
(map
|
(yaml/load-as-edn "website/nginx-deployment.yaml")
|
||||||
#(str "rewrite ^" (first %1) "\\$ " (second %1) " permanent;")
|
(assoc-in [:metadata :namespace] name)
|
||||||
redirects))))
|
(replace-all-matching-substrings-beginning-with "NAME" name)
|
||||||
|
(cm/replace-all-matching-values-by-new-value "BUILD_CPU_REQUEST" build-cpu-request)
|
||||||
|
(cm/replace-all-matching-values-by-new-value "BUILD_CPU_LIMIT" build-cpu-limit)
|
||||||
|
(cm/replace-all-matching-values-by-new-value "BUILD_MEMORY_REQUEST" build-memory-request)
|
||||||
|
(cm/replace-all-matching-values-by-new-value "BUILD_MEMORY_LIMIT" build-memory-limit))))
|
||||||
|
|
||||||
|
|
||||||
(defn-spec generate-nginx-configmap map?
|
(defn-spec generate-nginx-configmap map?
|
||||||
|
|
@ -101,20 +101,39 @@
|
||||||
name (replace-dots-by-minus unique-name)]
|
name (replace-dots-by-minus unique-name)]
|
||||||
(->
|
(->
|
||||||
(yaml/load-as-edn "website/nginx-configmap.yaml")
|
(yaml/load-as-edn "website/nginx-configmap.yaml")
|
||||||
(replace-all-matching-prefixes "NAME" name)
|
(assoc-in [:metadata :namespace] name)
|
||||||
(#(assoc-in % [:data :website.conf]
|
(replace-all-matching-substrings-beginning-with "NAME" name)
|
||||||
|
(#(assoc-in %
|
||||||
|
[:data :website.conf]
|
||||||
(str/replace
|
(str/replace
|
||||||
(-> % :data :website.conf)
|
(-> % :data :website.conf) #"FQDN" (str (str/join " " fqdns) ";")))))))
|
||||||
#"FQDN"
|
|
||||||
(str (str/join " " fqdns) ";"))))
|
|
||||||
(#(assoc-in % [:data :website.conf]
|
|
||||||
(str/replace
|
|
||||||
(-> % :data :website.conf)
|
|
||||||
#"REDIRECTS"
|
|
||||||
(generate-redirects config 2)))))))
|
|
||||||
|
|
||||||
|
|
||||||
(defn-spec generate-build-secret pred/map-or-seq?
|
(defn-spec generate-nginx-service map?
|
||||||
|
[config websiteconfig?]
|
||||||
|
(let [{:keys [unique-name]} config
|
||||||
|
name (replace-dots-by-minus unique-name)]
|
||||||
|
(->
|
||||||
|
(yaml/load-as-edn "website/nginx-service.yaml")
|
||||||
|
(assoc-in [:metadata :namespace] name)
|
||||||
|
(replace-all-matching-substrings-beginning-with "NAME" name))))
|
||||||
|
|
||||||
|
|
||||||
|
(defn-spec generate-website-build-cron map?
|
||||||
|
[config websiteconfig?]
|
||||||
|
(let [{:keys [unique-name build-cpu-request build-cpu-limit build-memory-request
|
||||||
|
build-memory-limit]} config
|
||||||
|
name (replace-dots-by-minus unique-name)]
|
||||||
|
(->
|
||||||
|
(yaml/load-as-edn "website/build-cron.yaml")
|
||||||
|
(replace-all-matching-substrings-beginning-with "NAME" name)
|
||||||
|
(cm/replace-all-matching-values-by-new-value "BUILD_CPU_REQUEST" build-cpu-request)
|
||||||
|
(cm/replace-all-matching-values-by-new-value "BUILD_CPU_LIMIT" build-cpu-limit)
|
||||||
|
(cm/replace-all-matching-values-by-new-value "BUILD_MEMORY_REQUEST" build-memory-request)
|
||||||
|
(cm/replace-all-matching-values-by-new-value "BUILD_MEMORY_LIMIT" build-memory-limit))))
|
||||||
|
|
||||||
|
|
||||||
|
(defn-spec generate-website-build-secret pred/map-or-seq?
|
||||||
[config websiteconfig?
|
[config websiteconfig?
|
||||||
auth websiteauth?]
|
auth websiteauth?]
|
||||||
(let [{:keys [unique-name
|
(let [{:keys [unique-name
|
||||||
|
|
@ -126,7 +145,7 @@
|
||||||
name (replace-dots-by-minus unique-name)]
|
name (replace-dots-by-minus unique-name)]
|
||||||
(->
|
(->
|
||||||
(yaml/load-as-edn "website/build-secret.yaml")
|
(yaml/load-as-edn "website/build-secret.yaml")
|
||||||
(replace-all-matching-prefixes "NAME" name)
|
(replace-all-matching-substrings-beginning-with "NAME" name)
|
||||||
(cm/replace-all-matching-values-by-new-value "TOKEN" (b64/encode authtoken))
|
(cm/replace-all-matching-values-by-new-value "TOKEN" (b64/encode authtoken))
|
||||||
(cm/replace-all-matching-values-by-new-value "REPOURL" (b64/encode
|
(cm/replace-all-matching-values-by-new-value "REPOURL" (b64/encode
|
||||||
(generate-gitrepourl
|
(generate-gitrepourl
|
||||||
|
|
@ -141,63 +160,24 @@
|
||||||
username))))))
|
username))))))
|
||||||
|
|
||||||
|
|
||||||
(defn-spec generate-content-pvc map?
|
(defn-spec generate-website-content-volume map?
|
||||||
[config websiteconfig?]
|
[config websiteconfig?]
|
||||||
(let [{:keys [unique-name volume-size]} config
|
(let [{:keys [unique-name volume-size]} config
|
||||||
name (replace-dots-by-minus unique-name)]
|
name (replace-dots-by-minus unique-name)]
|
||||||
(->
|
(->
|
||||||
(yaml/load-as-edn "website/content-pvc.yaml")
|
(yaml/load-as-edn "website/content-pvc.yaml")
|
||||||
(replace-all-matching-prefixes "NAME" name)
|
(replace-all-matching-substrings-beginning-with "NAME" name)
|
||||||
(cm/replace-all-matching-values-by-new-value "WEBSITESTORAGESIZE" (str volume-size "Gi")))))
|
(cm/replace-all-matching-values-by-new-value "WEBSITESTORAGESIZE" (str volume-size "Gi")))))
|
||||||
|
|
||||||
|
|
||||||
; TODO: Non-Secret-Parts should be config map
|
; TODO: Non-Secret-Parts should be config map
|
||||||
(defn-spec generate-hash-state-pvc map?
|
(defn-spec generate-hashfile-volume map?
|
||||||
[config websiteconfig?]
|
[config websiteconfig?]
|
||||||
(let [{:keys [unique-name]} config
|
(let [{:keys [unique-name]} config
|
||||||
name (replace-dots-by-minus unique-name)]
|
name (replace-dots-by-minus unique-name)]
|
||||||
(->
|
(->
|
||||||
(yaml/load-as-edn "website/hash-state-pvc.yaml")
|
(yaml/load-as-edn "website/hash-state-pvc.yaml")
|
||||||
(replace-all-matching-prefixes "NAME" name))))
|
(replace-all-matching-substrings-beginning-with "NAME" name))))
|
||||||
|
|
||||||
|
|
||||||
(defn-spec generate-nginx-deployment map?
|
|
||||||
[config websiteconfig?]
|
|
||||||
(let [{:keys [unique-name build-cpu-request build-cpu-limit
|
|
||||||
build-memory-request build-memory-limit]} config
|
|
||||||
name (replace-dots-by-minus unique-name)]
|
|
||||||
(->
|
|
||||||
(yaml/load-as-edn "website/nginx-deployment.yaml")
|
|
||||||
(assoc-in [:metadata :namespace] name)
|
|
||||||
(replace-all-matching-prefixes "NAME" name)
|
|
||||||
(cm/replace-all-matching-values-by-new-value "BUILD_CPU_REQUEST" build-cpu-request)
|
|
||||||
(cm/replace-all-matching-values-by-new-value "BUILD_CPU_LIMIT" build-cpu-limit)
|
|
||||||
(cm/replace-all-matching-values-by-new-value "BUILD_MEMORY_REQUEST" build-memory-request)
|
|
||||||
(cm/replace-all-matching-values-by-new-value "BUILD_MEMORY_LIMIT" build-memory-limit))))
|
|
||||||
|
|
||||||
|
|
||||||
(defn-spec generate-build-cron map?
|
|
||||||
[config websiteconfig?]
|
|
||||||
(let [{:keys [unique-name build-cpu-request build-cpu-limit build-memory-request
|
|
||||||
build-memory-limit]} config
|
|
||||||
name (replace-dots-by-minus unique-name)]
|
|
||||||
(->
|
|
||||||
(yaml/load-as-edn "website/build-cron.yaml")
|
|
||||||
(replace-all-matching-prefixes "NAME" name)
|
|
||||||
(cm/replace-all-matching-values-by-new-value "BUILD_CPU_REQUEST" build-cpu-request)
|
|
||||||
(cm/replace-all-matching-values-by-new-value "BUILD_CPU_LIMIT" build-cpu-limit)
|
|
||||||
(cm/replace-all-matching-values-by-new-value "BUILD_MEMORY_REQUEST" build-memory-request)
|
|
||||||
(cm/replace-all-matching-values-by-new-value "BUILD_MEMORY_LIMIT" build-memory-limit))))
|
|
||||||
|
|
||||||
|
|
||||||
(defn-spec generate-nginx-service map?
|
|
||||||
[config websiteconfig?]
|
|
||||||
(let [{:keys [unique-name]} config
|
|
||||||
name (replace-dots-by-minus unique-name)]
|
|
||||||
(->
|
|
||||||
(yaml/load-as-edn "website/nginx-service.yaml")
|
|
||||||
(assoc-in [:metadata :namespace] name)
|
|
||||||
(replace-all-matching-prefixes "NAME" name))))
|
|
||||||
|
|
||||||
|
|
||||||
#?(:cljs
|
#?(:cljs
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
name: etc-nginx
|
name: etc-nginx
|
||||||
namespace: NAME
|
namespace: default
|
||||||
labels:
|
labels:
|
||||||
app.kubernetes.part-of: NAME-website
|
app.kubernetes.part-of: NAME-website
|
||||||
data:
|
data:
|
||||||
|
|
@ -93,7 +93,5 @@ data:
|
||||||
location / {
|
location / {
|
||||||
try_files $uri $uri/ /index.html =404;
|
try_files $uri $uri/ /index.html =404;
|
||||||
}
|
}
|
||||||
# redirects
|
|
||||||
REDIRECTS
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -5,49 +5,14 @@
|
||||||
[clojure.spec.test.alpha :as st]
|
[clojure.spec.test.alpha :as st]
|
||||||
[dda.c4k-website.website.website-internal :as cut]))
|
[dda.c4k-website.website.website-internal :as cut]))
|
||||||
|
|
||||||
(st/instrument `cut/replace-dots-by-minus)
|
|
||||||
(st/instrument `cut/generate-gitrepourl)
|
|
||||||
(st/instrument `cut/generate-gitcommiturl)
|
|
||||||
(st/instrument `cut/replace-all-matching-prefixes)
|
|
||||||
(st/instrument `cut/generate-redirects)
|
|
||||||
(st/instrument `cut/generate-nginx-configmap)
|
(st/instrument `cut/generate-nginx-configmap)
|
||||||
(st/instrument `cut/generate-build-secret)
|
|
||||||
(st/instrument `cut/generate-content-pvc)
|
|
||||||
(st/instrument `cut/generate-hash-state-pvc)
|
|
||||||
(st/instrument `cut/generate-build-cron)
|
|
||||||
(st/instrument `cut/generate-nginx-service)
|
(st/instrument `cut/generate-nginx-service)
|
||||||
|
(st/instrument `cut/generate-website-content-volume)
|
||||||
(deftest should-generate-redirects
|
(st/instrument `cut/generate-hashfile-volume)
|
||||||
(is (= "rewrite ^/products.html\\$ /offer.html permanent;\n rewrite ^/one-more\\$ /redirect permanent;"
|
(st/instrument `cut/generate-website-ingress)
|
||||||
(cut/generate-redirects {:issuer "staging"
|
(st/instrument `cut/generate-website-certificate)
|
||||||
:build-cpu-request "500m"
|
(st/instrument `cut/generate-website-build-cron)
|
||||||
:build-cpu-limit "1700m"
|
(st/instrument `cut/generate-website-build-secret)
|
||||||
:build-memory-request "256Mi"
|
|
||||||
:build-memory-limit "512Mi"
|
|
||||||
:volume-size "3"
|
|
||||||
:unique-name "test.io",
|
|
||||||
:redirects [["/products.html", "/offer.html"]
|
|
||||||
["/one-more", "/redirect"]]
|
|
||||||
:forgejo-host "gitea.evilorg",
|
|
||||||
:forgejo-repo "none",
|
|
||||||
:branchname "mablain",
|
|
||||||
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}
|
|
||||||
2)))
|
|
||||||
(is (= ""
|
|
||||||
(cut/generate-redirects {:issuer "staging"
|
|
||||||
:build-cpu-request "500m"
|
|
||||||
:build-cpu-limit "1700m"
|
|
||||||
:build-memory-request "256Mi"
|
|
||||||
:build-memory-limit "512Mi"
|
|
||||||
:volume-size "3"
|
|
||||||
:unique-name "test.io",
|
|
||||||
:redirects []
|
|
||||||
:forgejo-host "gitea.evilorg",
|
|
||||||
:forgejo-repo "none",
|
|
||||||
:branchname "mablain",
|
|
||||||
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}
|
|
||||||
0))))
|
|
||||||
|
|
||||||
|
|
||||||
(deftest should-generate-resource-requests
|
(deftest should-generate-resource-requests
|
||||||
(is (= {:requests {:cpu "1500m", :memory "512Mi"}, :limits {:cpu "3000m", :memory "1024Mi"}}
|
(is (= {:requests {:cpu "1500m", :memory "512Mi"}, :limits {:cpu "3000m", :memory "1024Mi"}}
|
||||||
|
|
@ -56,8 +21,7 @@
|
||||||
:forgejo-repo "repo",
|
:forgejo-repo "repo",
|
||||||
:issuer "staging",
|
:issuer "staging",
|
||||||
:branchname "main",
|
:branchname "main",
|
||||||
:unique-name "test.io",
|
:unique-name "test.io"
|
||||||
:redirects [],
|
|
||||||
:build-cpu-request "1500m"
|
:build-cpu-request "1500m"
|
||||||
:build-cpu-limit "3000m"
|
:build-cpu-limit "3000m"
|
||||||
:build-memory-request "512Mi"
|
:build-memory-request "512Mi"
|
||||||
|
|
@ -70,8 +34,7 @@
|
||||||
:forgejo-repo "repo",
|
:forgejo-repo "repo",
|
||||||
:issuer "staging",
|
:issuer "staging",
|
||||||
:branchname "main",
|
:branchname "main",
|
||||||
:unique-name "test.io",
|
:unique-name "test.io"
|
||||||
:redirects [],
|
|
||||||
:build-cpu-request "1500m"
|
:build-cpu-request "1500m"
|
||||||
:build-cpu-limit "3000m"
|
:build-cpu-limit "3000m"
|
||||||
:build-memory-request "512Mi"
|
:build-memory-request "512Mi"
|
||||||
|
|
@ -79,64 +42,60 @@
|
||||||
:volume-size 3})
|
:volume-size 3})
|
||||||
:metadata :namespace))))
|
:metadata :namespace))))
|
||||||
|
|
||||||
#?(:clj (deftest should-generate-nginx-configmap-website
|
|
||||||
(is (= "server {\n listen 80 default_server;\n listen [::]:80 default_server;\n server_name test.de www.test.de test-it.de www.test-it.de;\n add_header Strict-Transport-Security 'max-age=31536000; includeSubDomains; preload'; \n add_header X-Frame-Options \"SAMEORIGIN\";\n add_header X-Content-Type-Options nosniff;\n add_header Referrer-Policy \"strict-origin\";\n # add_header Permissions-Policy \"permissions here\";\n root /var/www/html/website/;\n index index.html;\n location / {\n try_files $uri $uri/ /index.html =404;\n }\n # redirects\n rewrite ^/products.html$ /offer.html permanent;\n rewrite ^/one-more$ /redirect permanent;\n}\n"
|
(deftest should-generate-nginx-configmap-website
|
||||||
(:website.conf (:data (cut/generate-nginx-configmap {:issuer "staging"
|
(is (= "server {\n listen 80 default_server;\n listen [::]:80 default_server;\n server_name test.de www.test.de test-it.de www.test-it.de;\n add_header Strict-Transport-Security 'max-age=31536000; includeSubDomains; preload'; \n add_header X-Frame-Options \"SAMEORIGIN\";\n add_header X-Content-Type-Options nosniff;\n add_header Referrer-Policy \"strict-origin\";\n # add_header Permissions-Policy \"permissions here\";\n root /var/www/html/website/;\n index index.html;\n location / {\n try_files $uri $uri/ /index.html =404;\n }\n}\n"
|
||||||
:build-cpu-request "500m"
|
(:website.conf (:data (cut/generate-nginx-configmap {:issuer "staging"
|
||||||
:build-cpu-limit "1700m"
|
:build-cpu-request "500m"
|
||||||
:build-memory-request "256Mi"
|
:build-cpu-limit "1700m"
|
||||||
:build-memory-limit "512Mi"
|
:build-memory-request "256Mi"
|
||||||
:volume-size "3"
|
:build-memory-limit "512Mi"
|
||||||
:unique-name "test.io",
|
:volume-size "3"
|
||||||
:redirects [["/products.html", "/offer.html"]
|
:unique-name "test.io",
|
||||||
["/one-more", "/redirect"]]
|
:forgejo-host "gitea.evilorg",
|
||||||
:forgejo-host "gitea.evilorg",
|
:forgejo-repo "none",
|
||||||
:forgejo-repo "none",
|
:branchname "mablain",
|
||||||
:branchname "mablain",
|
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]})))))
|
||||||
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]})))))
|
(is (= "types {\n text/html html htm shtml;\n text/css css;\n text/xml xml rss;\n image/gif gif;\n image/jpeg jpeg jpg;\n application/x-javascript js;\n text/plain txt;\n text/x-component htc;\n text/mathml mml;\n image/svg+xml svg svgz;\n image/png png;\n image/x-icon ico;\n image/x-jng jng;\n image/vnd.wap.wbmp wbmp;\n application/java-archive jar war ear;\n application/mac-binhex40 hqx;\n application/pdf pdf;\n application/x-cocoa cco;\n application/x-java-archive-diff jardiff;\n application/x-java-jnlp-file jnlp;\n application/x-makeself run;\n application/x-perl pl pm;\n application/x-pilot prc pdb;\n application/x-rar-compressed rar;\n application/x-redhat-package-manager rpm;\n application/x-sea sea;\n application/x-shockwave-flash swf;\n application/x-stuffit sit;\n application/x-tcl tcl tk;\n application/x-x509-ca-cert der pem crt;\n application/x-xpinstall xpi;\n application/zip zip;\n application/octet-stream deb;\n application/octet-stream bin exe dll;\n application/octet-stream dmg;\n application/octet-stream eot;\n application/octet-stream iso img;\n application/octet-stream msi msp msm;\n audio/mpeg mp3;\n audio/x-realaudio ra;\n video/mpeg mpeg mpg;\n video/quicktime mov;\n video/x-flv flv;\n video/x-msvideo avi;\n video/x-ms-wmv wmv;\n video/x-ms-asf asx asf;\n video/x-mng mng;\n}\n"
|
||||||
(is (= "types {\n text/html html htm shtml;\n text/css css;\n text/xml xml rss;\n image/gif gif;\n image/jpeg jpeg jpg;\n application/x-javascript js;\n text/plain txt;\n text/x-component htc;\n text/mathml mml;\n image/svg+xml svg svgz;\n image/png png;\n image/x-icon ico;\n image/x-jng jng;\n image/vnd.wap.wbmp wbmp;\n application/java-archive jar war ear;\n application/mac-binhex40 hqx;\n application/pdf pdf;\n application/x-cocoa cco;\n application/x-java-archive-diff jardiff;\n application/x-java-jnlp-file jnlp;\n application/x-makeself run;\n application/x-perl pl pm;\n application/x-pilot prc pdb;\n application/x-rar-compressed rar;\n application/x-redhat-package-manager rpm;\n application/x-sea sea;\n application/x-shockwave-flash swf;\n application/x-stuffit sit;\n application/x-tcl tcl tk;\n application/x-x509-ca-cert der pem crt;\n application/x-xpinstall xpi;\n application/zip zip;\n application/octet-stream deb;\n application/octet-stream bin exe dll;\n application/octet-stream dmg;\n application/octet-stream eot;\n application/octet-stream iso img;\n application/octet-stream msi msp msm;\n audio/mpeg mp3;\n audio/x-realaudio ra;\n video/mpeg mpeg mpg;\n video/quicktime mov;\n video/x-flv flv;\n video/x-msvideo avi;\n video/x-ms-wmv wmv;\n video/x-ms-asf asx asf;\n video/x-mng mng;\n}\n"
|
(:mime.types (:data (cut/generate-nginx-configmap {:issuer "staging"
|
||||||
(:mime.types (:data (cut/generate-nginx-configmap {:issuer "staging"
|
:build-cpu-request "500m"
|
||||||
:build-cpu-request "500m"
|
:build-cpu-limit "1700m"
|
||||||
:build-cpu-limit "1700m"
|
:build-memory-request "256Mi"
|
||||||
:build-memory-request "256Mi"
|
:build-memory-limit "512Mi"
|
||||||
:build-memory-limit "512Mi"
|
:volume-size "3"
|
||||||
:volume-size "3"
|
:unique-name "test.io",
|
||||||
:unique-name "test.io",
|
:forgejo-host "gitea.evilorg",
|
||||||
:redirects [],
|
:forgejo-repo "none",
|
||||||
:forgejo-host "gitea.evilorg",
|
:branchname "mablain",
|
||||||
:forgejo-repo "none",
|
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]})))))
|
||||||
:branchname "mablain",
|
(is (= "user nginx;\nworker_processes 3;\nerror_log stdout info;\npid /var/log/nginx/nginx.pid;\nworker_rlimit_nofile 8192;\nevents {\n worker_connections 4096;\n}\nhttp {\n include /etc/nginx/mime.types;\n default_type application/octet-stream;\n log_format main '$remote_addr - $remote_user [$time_local] $status'\n '\"$request\" $body_bytes_sent \"$http_referer\"'\n '\"$http_user_agent\" \"$http_x_forwarded_for\"';\n access_log stdout main;\n sendfile on;\n tcp_nopush on;\n keepalive_timeout 65;\n server_names_hash_bucket_size 128;\n include /etc/nginx/conf.d/website.conf;\n}\n"
|
||||||
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]})))))
|
(:nginx.conf (:data (cut/generate-nginx-configmap {:issuer "staging"
|
||||||
(is (= "user nginx;\nworker_processes 3;\nerror_log stdout info;\npid /var/log/nginx/nginx.pid;\nworker_rlimit_nofile 8192;\nevents {\n worker_connections 4096;\n}\nhttp {\n include /etc/nginx/mime.types;\n default_type application/octet-stream;\n log_format main '$remote_addr - $remote_user [$time_local] $status'\n '\"$request\" $body_bytes_sent \"$http_referer\"'\n '\"$http_user_agent\" \"$http_x_forwarded_for\"';\n access_log stdout main;\n sendfile on;\n tcp_nopush on;\n keepalive_timeout 65;\n server_names_hash_bucket_size 128;\n include /etc/nginx/conf.d/website.conf;\n}\n"
|
:build-cpu-request "500m"
|
||||||
(:nginx.conf (:data (cut/generate-nginx-configmap {:issuer "staging"
|
:build-cpu-limit "1700m"
|
||||||
:build-cpu-request "500m"
|
:build-memory-request "256Mi"
|
||||||
:build-cpu-limit "1700m"
|
:build-memory-limit "512Mi"
|
||||||
:build-memory-request "256Mi"
|
:volume-size "3"
|
||||||
:build-memory-limit "512Mi"
|
:unique-name "test.io",
|
||||||
:volume-size "3"
|
:forgejo-host "gitea.evilorg",
|
||||||
:unique-name "test.io",
|
:forgejo-repo "none",
|
||||||
:redirects [],
|
:branchname "mablain",
|
||||||
:forgejo-host "gitea.evilorg",
|
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]})))))
|
||||||
:forgejo-repo "none",
|
(is (= {:apiVersion "v1",
|
||||||
:branchname "mablain",
|
:kind "ConfigMap",
|
||||||
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]})))))
|
:metadata {:labels {:app.kubernetes.part-of "test-io-website"},
|
||||||
(is (= {:apiVersion "v1",
|
:namespace "test-io",
|
||||||
:kind "ConfigMap",
|
:name "etc-nginx"}}
|
||||||
:metadata {:labels {:app.kubernetes.part-of "test-io-website"},
|
(dissoc (cut/generate-nginx-configmap {:issuer "staging"
|
||||||
:namespace "test-io",
|
:build-cpu-request "500m"
|
||||||
:name "etc-nginx"}}
|
:build-cpu-limit "1700m"
|
||||||
(dissoc (cut/generate-nginx-configmap {:issuer "staging"
|
:build-memory-request "256Mi"
|
||||||
:build-cpu-request "500m"
|
:build-memory-limit "512Mi"
|
||||||
:build-cpu-limit "1700m"
|
:volume-size "3"
|
||||||
:build-memory-request "256Mi"
|
:unique-name "test.io",
|
||||||
:build-memory-limit "512Mi"
|
:forgejo-host "gitea.evilorg",
|
||||||
:volume-size "3"
|
:forgejo-repo "none",
|
||||||
:unique-name "test.io",
|
:branchname "mablain",
|
||||||
:redirects [],
|
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}) :data))))
|
||||||
:forgejo-host "gitea.evilorg",
|
|
||||||
:forgejo-repo "none",
|
|
||||||
:branchname "mablain",
|
|
||||||
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}) :data)))))
|
|
||||||
|
|
||||||
(deftest should-generate-nginx-service
|
(deftest should-generate-nginx-service
|
||||||
(is (= {:kind "Service",
|
(is (= {:kind "Service",
|
||||||
|
|
@ -148,21 +107,19 @@
|
||||||
:spec
|
:spec
|
||||||
{:selector {:app "nginx"}, :ports [{:name "nginx-http", :port 80}]}}
|
{:selector {:app "nginx"}, :ports [{:name "nginx-http", :port 80}]}}
|
||||||
(cut/generate-nginx-service {:issuer "staging"
|
(cut/generate-nginx-service {:issuer "staging"
|
||||||
:build-cpu-request "500m"
|
:build-cpu-request "500m"
|
||||||
:build-cpu-limit "1700m"
|
:build-cpu-limit "1700m"
|
||||||
:build-memory-request "256Mi"
|
:build-memory-request "256Mi"
|
||||||
:build-memory-limit "512Mi"
|
:build-memory-limit "512Mi"
|
||||||
:volume-size "3"
|
:volume-size "3"
|
||||||
:unique-name "test.io",
|
:unique-name "test.io",
|
||||||
:redirects [],
|
:forgejo-host "gitea.evilorg",
|
||||||
:forgejo-host "gitea.evilorg",
|
:forgejo-repo "none",
|
||||||
:forgejo-repo "none",
|
:branchname "mablain",
|
||||||
:branchname "mablain",
|
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]})
|
||||||
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]})
|
|
||||||
)))
|
)))
|
||||||
|
|
||||||
|
(deftest should-generate-website-build-cron
|
||||||
(deftest should-generate-build-cron
|
|
||||||
(is (= {:apiVersion "batch/v1",
|
(is (= {:apiVersion "batch/v1",
|
||||||
:kind "CronJob",
|
:kind "CronJob",
|
||||||
:metadata {:name "build-cron",
|
:metadata {:name "build-cron",
|
||||||
|
|
@ -192,7 +149,7 @@
|
||||||
:volumes [{:name "content-volume", :persistentVolumeClaim {:claimName "content-volume"}}
|
:volumes [{:name "content-volume", :persistentVolumeClaim {:claimName "content-volume"}}
|
||||||
{:name "hash-state-volume", :persistentVolumeClaim {:claimName "hash-state-volume"}}],
|
{:name "hash-state-volume", :persistentVolumeClaim {:claimName "hash-state-volume"}}],
|
||||||
:restartPolicy "OnFailure"}}}}}}
|
:restartPolicy "OnFailure"}}}}}}
|
||||||
(cut/generate-build-cron {:issuer "staging"
|
(cut/generate-website-build-cron {:issuer "staging"
|
||||||
:build-cpu-request "500m"
|
:build-cpu-request "500m"
|
||||||
:build-cpu-limit "1700m"
|
:build-cpu-limit "1700m"
|
||||||
:build-memory-request "256Mi"
|
:build-memory-request "256Mi"
|
||||||
|
|
@ -202,10 +159,10 @@
|
||||||
:fqdns ["test.de" "test.org" "www.test.de" "www.test.org"],
|
:fqdns ["test.de" "test.org" "www.test.de" "www.test.org"],
|
||||||
:forgejo-repo "repo",
|
:forgejo-repo "repo",
|
||||||
:branchname "main",
|
:branchname "main",
|
||||||
:unique-name "test.io",
|
:unique-name "test.io"}))))
|
||||||
:redirects [],}))))
|
|
||||||
|
|
||||||
(deftest should-generate-build-secret
|
|
||||||
|
(deftest should-generate-website-build-secret
|
||||||
(is (= {:apiVersion "v1",
|
(is (= {:apiVersion "v1",
|
||||||
:kind "Secret",
|
:kind "Secret",
|
||||||
:metadata {:name "build-secret",
|
:metadata {:name "build-secret",
|
||||||
|
|
@ -215,12 +172,11 @@
|
||||||
{:AUTHTOKEN "YWJlZGpnYmFzZG9kag==",
|
{:AUTHTOKEN "YWJlZGpnYmFzZG9kag==",
|
||||||
:GITREPOURL "aHR0cHM6Ly9naXRsYWIuZGUvYXBpL3YxL3JlcG9zL3NvbWV1c2VyL3JlcG8vYXJjaGl2ZS9tYWluLnppcA==",
|
:GITREPOURL "aHR0cHM6Ly9naXRsYWIuZGUvYXBpL3YxL3JlcG9zL3NvbWV1c2VyL3JlcG8vYXJjaGl2ZS9tYWluLnppcA==",
|
||||||
:GITCOMMITURL "aHR0cHM6Ly9naXRsYWIuZGUvYXBpL3YxL3JlcG9zL3NvbWV1c2VyL3JlcG8vZ2l0L2NvbW1pdHMvSEVBRA=="}}
|
:GITCOMMITURL "aHR0cHM6Ly9naXRsYWIuZGUvYXBpL3YxL3JlcG9zL3NvbWV1c2VyL3JlcG8vZ2l0L2NvbW1pdHMvSEVBRA=="}}
|
||||||
(cut/generate-build-secret {:fqdns ["test.de" "test.org" "www.test.de" "www.test.org"],
|
(cut/generate-website-build-secret {:fqdns ["test.de" "test.org" "www.test.de" "www.test.org"],
|
||||||
:forgejo-repo "repo",
|
:forgejo-repo "repo",
|
||||||
:issuer "staging",
|
:issuer "staging",
|
||||||
:branchname "main",
|
:branchname "main",
|
||||||
:unique-name "test.io",
|
:unique-name "test.io",
|
||||||
:redirects [],
|
|
||||||
:forgejo-host "gitlab.de"
|
:forgejo-host "gitlab.de"
|
||||||
:build-cpu-request "500m"
|
:build-cpu-request "500m"
|
||||||
:build-cpu-limit "1700m"
|
:build-cpu-limit "1700m"
|
||||||
|
|
@ -231,7 +187,7 @@
|
||||||
:authtoken "abedjgbasdodj",
|
:authtoken "abedjgbasdodj",
|
||||||
:username "someuser"}))))
|
:username "someuser"}))))
|
||||||
|
|
||||||
(deftest should-generate-content-pvc
|
(deftest should-generate-website-content-volume
|
||||||
(is (= {:apiVersion "v1",
|
(is (= {:apiVersion "v1",
|
||||||
:kind "PersistentVolumeClaim",
|
:kind "PersistentVolumeClaim",
|
||||||
:metadata
|
:metadata
|
||||||
|
|
@ -242,21 +198,19 @@
|
||||||
{:storageClassName "local-path",
|
{:storageClassName "local-path",
|
||||||
:accessModes ["ReadWriteOnce"],
|
:accessModes ["ReadWriteOnce"],
|
||||||
:resources {:requests {:storage "3Gi"}}}}
|
:resources {:requests {:storage "3Gi"}}}}
|
||||||
(cut/generate-content-pvc {:issuer "staging"
|
(cut/generate-website-content-volume {:issuer "staging"
|
||||||
:build-cpu-request "500m"
|
:build-cpu-request "500m"
|
||||||
:build-cpu-limit "1700m"
|
:build-cpu-limit "1700m"
|
||||||
:build-memory-request "256Mi"
|
:build-memory-request "256Mi"
|
||||||
:build-memory-limit "512Mi"
|
:build-memory-limit "512Mi"
|
||||||
:volume-size "3"
|
:volume-size "3"
|
||||||
:unique-name "test.io",
|
:unique-name "test.io",
|
||||||
:redirects [],
|
|
||||||
:forgejo-host "gitea.evilorg",
|
:forgejo-host "gitea.evilorg",
|
||||||
:forgejo-repo "none",
|
:forgejo-repo "none",
|
||||||
:branchname "mablain",
|
:branchname "mablain",
|
||||||
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}))))
|
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}))))
|
||||||
|
|
||||||
|
(deftest should-generate-hashfile-volume
|
||||||
(deftest should-generate-hash-state-pvc
|
|
||||||
(is (= {:apiVersion "v1",
|
(is (= {:apiVersion "v1",
|
||||||
:kind "PersistentVolumeClaim",
|
:kind "PersistentVolumeClaim",
|
||||||
:metadata
|
:metadata
|
||||||
|
|
@ -266,15 +220,14 @@
|
||||||
:spec {:storageClassName "local-path",
|
:spec {:storageClassName "local-path",
|
||||||
:accessModes ["ReadWriteOnce"],
|
:accessModes ["ReadWriteOnce"],
|
||||||
:resources {:requests {:storage "16Mi"}}}}
|
:resources {:requests {:storage "16Mi"}}}}
|
||||||
(cut/generate-hash-state-pvc {:issuer "staging"
|
(cut/generate-hashfile-volume {:issuer "staging"
|
||||||
:build-cpu-request "500m"
|
:build-cpu-request "500m"
|
||||||
:build-cpu-limit "1700m"
|
:build-cpu-limit "1700m"
|
||||||
:build-memory-request "256Mi"
|
:build-memory-request "256Mi"
|
||||||
:build-memory-limit "512Mi"
|
:build-memory-limit "512Mi"
|
||||||
:volume-size "3"
|
:volume-size "3"
|
||||||
:unique-name "test.io",
|
:unique-name "test.io",
|
||||||
:redirects [],
|
|
||||||
:forgejo-host "gitea.evilorg",
|
:forgejo-host "gitea.evilorg",
|
||||||
:forgejo-repo "none",
|
:forgejo-repo "none",
|
||||||
:branchname "mablain",
|
:branchname "mablain",
|
||||||
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}))))
|
:fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}))))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue
