Compare commits
No commits in common. "e97fc0d6756b9f91b174f9df53aea9972367a867" and "5389003d6b3ad643129736fe8d541f8e782954ef" have entirely different histories.
e97fc0d675
...
5389003d6b
7 changed files with 159 additions and 160 deletions
|
|
@ -12,3 +12,4 @@ spec:
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: WEBSITESTORAGESIZE
|
storage: WEBSITESTORAGESIZE
|
||||||
|
|
||||||
|
|
@ -12,3 +12,4 @@ spec:
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
storage: 16Mi
|
storage: 16Mi
|
||||||
|
|
||||||
|
|
@ -9,7 +9,7 @@ data:
|
||||||
nginx.conf: |
|
nginx.conf: |
|
||||||
user nginx;
|
user nginx;
|
||||||
worker_processes 3;
|
worker_processes 3;
|
||||||
error_log /var/log/nginx/error.log info;
|
error_log stdout info;
|
||||||
pid /var/log/nginx/nginx.pid;
|
pid /var/log/nginx/nginx.pid;
|
||||||
worker_rlimit_nofile 8192;
|
worker_rlimit_nofile 8192;
|
||||||
events {
|
events {
|
||||||
|
|
@ -21,7 +21,7 @@ data:
|
||||||
log_format main '$remote_addr - $remote_user [$time_local] $status'
|
log_format main '$remote_addr - $remote_user [$time_local] $status'
|
||||||
'"$request" $body_bytes_sent "$http_referer"'
|
'"$request" $body_bytes_sent "$http_referer"'
|
||||||
'"$http_user_agent" "$http_x_forwarded_for"';
|
'"$http_user_agent" "$http_x_forwarded_for"';
|
||||||
access_log /var/log/nginx/access.log main;
|
access_log stdout main;
|
||||||
sendfile on;
|
sendfile on;
|
||||||
tcp_nopush on;
|
tcp_nopush on;
|
||||||
keepalive_timeout 65;
|
keepalive_timeout 65;
|
||||||
|
|
@ -96,3 +96,4 @@ data:
|
||||||
# redirects
|
# redirects
|
||||||
REDIRECTS
|
REDIRECTS
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -23,13 +23,12 @@ spec:
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
command: [ "/bin/bash", "-c", "nginx -g 'daemon off;'" ]
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /etc/nginx
|
- mountPath: /etc/nginx
|
||||||
readOnly: true
|
readOnly: true
|
||||||
name: etc-nginx
|
name: etc-ngingx
|
||||||
- mountPath: /tmp
|
- mountPath: /var/log/nginx
|
||||||
name: tmp
|
name: log
|
||||||
- mountPath: /var/www/html/website
|
- mountPath: /var/www/html/website
|
||||||
name: content-volume
|
name: content-volume
|
||||||
readOnly: true
|
readOnly: true
|
||||||
|
|
@ -64,7 +63,7 @@ spec:
|
||||||
path: conf.d/website.conf
|
path: conf.d/website.conf
|
||||||
- key: mime.types
|
- key: mime.types
|
||||||
path: mime.types
|
path: mime.types
|
||||||
- name: tmp
|
- name: log
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
- name: content-volume
|
- name: content-volume
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
|
|
@ -72,3 +71,4 @@ spec:
|
||||||
- name: hash-state-volume
|
- name: hash-state-volume
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: hash-state-volume
|
claimName: hash-state-volume
|
||||||
|
|
||||||
|
|
@ -12,3 +12,4 @@ spec:
|
||||||
ports:
|
ports:
|
||||||
- name: nginx-http
|
- name: nginx-http
|
||||||
port: 80
|
port: 80
|
||||||
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
(ns dda.c4k-website.website.website-internal-test
|
(ns dda.c4k-website.website.website-internal-test
|
||||||
(:require
|
(:require
|
||||||
[clojure.string :as str]
|
|
||||||
#?(:clj [clojure.test :refer [deftest is are testing run-tests]]
|
#?(:clj [clojure.test :refer [deftest is are testing run-tests]]
|
||||||
:cljs [cljs.test :refer-macros [deftest is are testing run-tests]])
|
:cljs [cljs.test :refer-macros [deftest is are testing run-tests]])
|
||||||
[clojure.spec.test.alpha :as st]
|
[clojure.spec.test.alpha :as st]
|
||||||
|
|
@ -18,7 +17,6 @@
|
||||||
(st/instrument `cut/generate-build-cron)
|
(st/instrument `cut/generate-build-cron)
|
||||||
(st/instrument `cut/generate-nginx-service)
|
(st/instrument `cut/generate-nginx-service)
|
||||||
|
|
||||||
|
|
||||||
(deftest should-generate-redirects
|
(deftest should-generate-redirects
|
||||||
(is (= "rewrite ^/products.html\\$ /offer.html permanent;\n rewrite ^/one-more\\$ /redirect permanent;"
|
(is (= "rewrite ^/products.html\\$ /offer.html permanent;\n rewrite ^/one-more\\$ /redirect permanent;"
|
||||||
(cut/generate-redirects {:issuer "staging"
|
(cut/generate-redirects {:issuer "staging"
|
||||||
|
|
@ -80,8 +78,9 @@
|
||||||
:build-memory-limit "1024Mi"
|
:build-memory-limit "1024Mi"
|
||||||
:volume-size 3})
|
:volume-size 3})
|
||||||
:metadata :namespace))))
|
:metadata :namespace))))
|
||||||
(deftest should-generate-nginx-configmap-website
|
|
||||||
(is (str/includes?
|
#?(: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"
|
||||||
(:website.conf (:data (cut/generate-nginx-configmap {:issuer "staging"
|
(:website.conf (:data (cut/generate-nginx-configmap {:issuer "staging"
|
||||||
:build-cpu-request "500m"
|
:build-cpu-request "500m"
|
||||||
:build-cpu-limit "1700m"
|
:build-cpu-limit "1700m"
|
||||||
|
|
@ -94,25 +93,9 @@
|
||||||
: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"]})))))
|
||||||
" /offer.html permanent;\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"
|
||||||
(is (str/includes?
|
(:mime.types (:data (cut/generate-nginx-configmap {:issuer "staging"
|
||||||
(:website.conf (:data (cut/generate-nginx-configmap {: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 [["/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"]})))
|
|
||||||
" /redirect permanent;\n"))
|
|
||||||
(is (str/includes?
|
|
||||||
(:website.conf (: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"
|
||||||
|
|
@ -123,8 +106,20 @@
|
||||||
: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"]})))))
|
||||||
"server_name test.de www.test.de test-it.de www.test-it.de;"))
|
(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"
|
||||||
|
(:nginx.conf (:data (cut/generate-nginx-configmap {: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"]})))))
|
||||||
(is (= {:apiVersion "v1",
|
(is (= {:apiVersion "v1",
|
||||||
:kind "ConfigMap",
|
:kind "ConfigMap",
|
||||||
:metadata {:labels {:app.kubernetes.part-of "test-io-website"},
|
:metadata {:labels {:app.kubernetes.part-of "test-io-website"},
|
||||||
|
|
@ -141,8 +136,7 @@
|
||||||
: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"]}) :data)))))
|
||||||
:data))))
|
|
||||||
|
|
||||||
(deftest should-generate-nginx-service
|
(deftest should-generate-nginx-service
|
||||||
(is (= {:kind "Service",
|
(is (= {:kind "Service",
|
||||||
|
|
@ -164,7 +158,8 @@
|
||||||
: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-build-cron
|
(deftest should-generate-build-cron
|
||||||
|
|
@ -208,7 +203,7 @@
|
||||||
:forgejo-repo "repo",
|
:forgejo-repo "repo",
|
||||||
:branchname "main",
|
:branchname "main",
|
||||||
:unique-name "test.io",
|
:unique-name "test.io",
|
||||||
:redirects []}))))
|
:redirects [],}))))
|
||||||
|
|
||||||
(deftest should-generate-build-secret
|
(deftest should-generate-build-secret
|
||||||
(is (= {:apiVersion "v1",
|
(is (= {:apiVersion "v1",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue
