src/main/cljc/dda/c4k_website/website/website_internal.cljc

@@ -87,6 +87,7 @@
         name (replace-dots-by-minus unique-name)]
     (->
      (yaml/load-as-edn "website/nginx-deployment.yaml")
+     (assoc-in [:metadata :labels :app.kubernetes.part-of] name)
      (assoc-in [:metadata :namespace] name)
      (replace-all-matching-substrings-beginning-with "NAME" name)
      (cm/replace-all-matching-values-by-new-value "BUILD_CPU_REQUEST" build-cpu-request)
@@ -101,6 +102,7 @@
         name (replace-dots-by-minus unique-name)]
     (->
      (yaml/load-as-edn "website/nginx-configmap.yaml")
+     (assoc-in [:metadata :labels :app.kubernetes.part-of] name)
      (assoc-in [:metadata :namespace] name)
      (replace-all-matching-substrings-beginning-with "NAME" name)
      (#(assoc-in %
@@ -115,17 +117,40 @@
         name (replace-dots-by-minus unique-name)]
     (->
      (yaml/load-as-edn "website/nginx-service.yaml")
+     (assoc-in [:metadata :labels :app.kubernetes.part-of] name)
      (assoc-in [:metadata :namespace] name)
      (replace-all-matching-substrings-beginning-with "NAME" name))))
 
 
+(defn-spec generate-website-content-volume map?
+  [config websiteconfig?]
+  (let [{:keys [unique-name volume-size]} config
+        name (replace-dots-by-minus unique-name)]
+    (->
+     (yaml/load-as-edn "website/website-content-volume.yaml")
+     (assoc-in [:metadata :labels :app.kubernetes.part-of] name)
+     (replace-all-matching-substrings-beginning-with "NAME" name) 
+     (cm/replace-all-matching-values-by-new-value "WEBSITESTORAGESIZE" (str volume-size "Gi")))))
+
+
+(defn-spec generate-hashfile-volume map?
+  [config websiteconfig?]
+  (let [{:keys [unique-name]} config
+        name (replace-dots-by-minus unique-name)]
+    (->
+     (yaml/load-as-edn "website/hashfile-volume.yaml")
+     (assoc-in [:metadata :labels :app.kubernetes.part-of] 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")
+      (yaml/load-as-edn "website/website-build-cron.yaml")
+      (assoc-in [:metadata :labels :app.kubernetes.part-of] name)
       (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)
@@ -133,6 +158,7 @@
       (cm/replace-all-matching-values-by-new-value "BUILD_MEMORY_LIMIT" build-memory-limit))))
 
 
+; TODO: Non-Secret-Parts should be config map
 (defn-spec generate-website-build-secret pred/map-or-seq?
   [config websiteconfig?
    auth websiteauth?]
@@ -144,7 +170,8 @@
                 username]} auth
         name (replace-dots-by-minus unique-name)]
     (->
-     (yaml/load-as-edn "website/build-secret.yaml")
+     (yaml/load-as-edn "website/website-build-secret.yaml")
+     (assoc-in [:metadata :labels :app.kubernetes.part-of] 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 "REPOURL" (b64/encode
@@ -160,26 +187,6 @@
                                                                 username))))))
 
 
-(defn-spec generate-website-content-volume map?
-  [config websiteconfig?]
-  (let [{:keys [unique-name volume-size]} config
-        name (replace-dots-by-minus unique-name)]
-    (->
-     (yaml/load-as-edn "website/content-pvc.yaml")
-     (replace-all-matching-substrings-beginning-with "NAME" name) 
-     (cm/replace-all-matching-values-by-new-value "WEBSITESTORAGESIZE" (str volume-size "Gi")))))
-
-
-; TODO: Non-Secret-Parts should be config map
-(defn-spec generate-hashfile-volume map?
-  [config websiteconfig?]
-  (let [{:keys [unique-name]} config
-        name (replace-dots-by-minus unique-name)]
-    (->
-     (yaml/load-as-edn "website/hash-state-pvc.yaml")
-     (replace-all-matching-substrings-beginning-with "NAME" name))))
-
-
 #?(:cljs
    (defmethod yaml/load-resource :website [resource-name]
      (get (inline-resources "website") resource-name)))

src/main/resources/website/hashfile-volume.yaml

@@ -1,9 +1,10 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: hash-state-volume
+  name: NAME-hashfile-volume
-  namespace: NAME
+  namespace: default
   labels:
+    app: NAME-nginx    
     app.kubernetes.part-of: NAME-website
 spec:
   storageClassName: local-path

src/main/resources/website/nginx-configmap.yaml

@@ -9,7 +9,7 @@ data:
   nginx.conf: |
     user nginx;
     worker_processes 3;
-    error_log stdout info;
+    error_log /var/log/nginx/error.log;
     pid /var/log/nginx/nginx.pid;
     worker_rlimit_nofile 8192;
     events {
@@ -21,7 +21,7 @@ data:
       log_format   main '$remote_addr - $remote_user [$time_local] $status'
       '"$request" $body_bytes_sent "$http_referer"'
       '"$http_user_agent" "$http_x_forwarded_for"';
-      access_log stdout main;
+      access_log /var/log/nginx/access.log main;
       sendfile on;
       tcp_nopush on;
       keepalive_timeout 65;

src/main/resources/website/nginx-deployment.yaml

@@ -46,7 +46,7 @@ spec:
         command: ["/entrypoint.sh"]
         envFrom:
         - secretRef:
-            name: build-secret
+            name: secret
         volumeMounts:
         - name: content-volume
           mountPath: /var/www/html/website

src/main/resources/website/nginx-service.yaml

@@ -5,10 +5,10 @@ metadata:
   namespace: default
   labels:
     app: NAME
-    app.kubernetes.part-of: NAME-website
+    app.kubernetes.part-of: NAME
 spec:    
   selector:
-    app: nginx
+    app: NAME
   ports:
     - name: nginx-http
       port: 80               

src/main/resources/website/website-build-cron.yaml

@@ -1,8 +1,7 @@
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: build-cron
+  name: NAME-build-cron
-  namespace: NAME
   labels:
     app.kubernetes.part-of: NAME-website 
 spec:
@@ -12,15 +11,10 @@ spec:
   jobTemplate:
     spec:
       template:
-        metadata:
-          namespace: NAME
-          labels:
-            app: build-cron
-            app.kubernetes.part-of: NAME-website
         spec:
           containers:
           - image: domaindrivenarchitecture/c4k-website-build
-            name: build-cron-container
+            name: NAME-build-app
             imagePullPolicy: IfNotPresent
             resources:
               requests:
@@ -32,18 +26,18 @@ spec:
             command: ["/entrypoint.sh"]
             envFrom:
             - secretRef:
-                name: build-secret
+                name: NAME-secret
             volumeMounts:
             - name: content-volume
               mountPath: /var/www/html/website
-            - name: hash-state-volume
+            - name: hashfile-volume
               mountPath: /var/hashfile.d
           volumes:
           - name: content-volume
             persistentVolumeClaim:
-              claimName: content-volume
+              claimName: NAME-content-volume
-          - name: hash-state-volume
+          - name: hashfile-volume
             persistentVolumeClaim:
-              claimName: hash-state-volume
+              claimName: NAME-hashfile-volume
           restartPolicy: OnFailure
           

src/main/resources/website/website-build-secret.yaml

@@ -1,8 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: build-secret
+  name: NAME-secret 
-  namespace: NAME
   labels:
     app.kubernetes.part-of: NAME-website
 data:

src/main/resources/website/website-content-volume.yaml

@@ -1,9 +1,10 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: content-volume
+  name: NAME-content-volume
-  namespace: NAME
+  namespace: default
   labels:
+    app: NAME-nginx    
     app.kubernetes.part-of: NAME-website
 spec:
   storageClassName: local-path

src/test/cljc/dda/c4k_website/website/website_internal_test.cljc

@@ -3,6 +3,7 @@
    #?(:clj [clojure.test :refer [deftest is are testing run-tests]]
       :cljs [cljs.test :refer-macros [deftest is are testing run-tests]])
    [clojure.spec.test.alpha :as st]
+   [dda.c4k-common.test-helper :as th]
    [dda.c4k-website.website.website-internal :as cut]))
 
 (st/instrument `cut/generate-nginx-configmap)
@@ -68,7 +69,7 @@
                                                             :forgejo-repo "none",
                                                             :branchname "mablain",
                                                             :fqdns ["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"
+  (is (= "user nginx;\nworker_processes 3;\nerror_log /var/log/nginx/error.log;\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 /var/log/nginx/access.log 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"
@@ -82,9 +83,9 @@
                                                             :fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]})))))
   (is (= {:apiVersion "v1",
           :kind "ConfigMap",
-          :metadata {:labels {:app.kubernetes.part-of "test-io-website"},
+          :metadata {:labels {:app.kubernetes.part-of "test-io"},
                      :namespace "test-io",
-                     :name "etc-nginx"}}
+                     :name "etc-ngingx"}}
          (dissoc (cut/generate-nginx-configmap {:issuer "staging"
                                                 :build-cpu-request "500m"
                                                 :build-cpu-limit "1700m"
@@ -98,15 +99,15 @@
                                                 :fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}) :data))))
 
 (deftest should-generate-nginx-service
-  (is (= {:kind "Service",
+  (is (= {:name-c1 "test-io",
-          :apiVersion "v1",
+          :name-c2 "test-org",
-          :metadata
+          :app-c1 "test-io",
-          {:name "test-io",
+          :app-c2 "test-org",
-           :namespace "test-io",
+          :app.kubernetes.part-of-c1 "test-io",
-           :labels {:app "test-io", :app.kubernetes.part-of "test-io-website"}},
+          :app.kubernetes.part-of-c2 "test-org"
-          :spec
+          :namespace-c1 "test-io", 
-          {:selector {:app "nginx"}, :ports [{:name "nginx-http", :port 80}]}}
+          :namespace-c2 "test-org"}
-         (cut/generate-nginx-service {:issuer "staging"
+         (th/map-diff (cut/generate-nginx-service {:issuer "staging"
                                                    :build-cpu-request "500m"
                                                    :build-cpu-limit "1700m"
                                                    :build-memory-request "256Mi"
@@ -117,14 +118,23 @@
                                                    :forgejo-repo "none",
                                                    :branchname "mablain",
                                                    :fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]})
-)))
+                      (cut/generate-nginx-service {:issuer "staging"
+                                                   :build-cpu-request "500m"
+                                                   :build-cpu-limit "1700m"
+                                                   :build-memory-request "256Mi"
+                                                   :build-memory-limit "512Mi"
+                                                   :volume-size "3"
+                                                   :unique-name "test.org",
+                                                   :forgejo-host "gitea.evilorg",
+                                                   :forgejo-repo "none",
+                                                   :branchname "mablain",
+                                                   :fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]})))))
 
 (deftest should-generate-website-build-cron
   (is (= {:apiVersion "batch/v1",
           :kind "CronJob",
-          :metadata {:name "build-cron",
+          :metadata {:name "test-io-build-cron", 
-                     :namespace "test-io",
+                     :labels {:app.kubernetes.part-of "test-io"}},
-                     :labels {:app.kubernetes.part-of "test-io-website"}},
           :spec
           {:schedule "0/7 * * * *",
            :successfulJobsHistoryLimit 1,
@@ -132,22 +142,18 @@
            :jobTemplate
            {:spec
             {:template
-             {:metadata
+             {:spec
-              {:namespace "test-io",
-               :labels
-               {:app "build-cron", :app.kubernetes.part-of "test-io-website"}}
-              :spec 
               {:containers
                [{:image "domaindrivenarchitecture/c4k-website-build",
-                 :name "build-cron-container",
+                 :name "test-io-build-app",
                  :imagePullPolicy "IfNotPresent",
                  :resources {:requests {:cpu "500m", :memory "256Mi"}, :limits {:cpu "1700m", :memory "512Mi"}},
                  :command ["/entrypoint.sh"],
-                 :envFrom [{:secretRef {:name "build-secret"}}],
+                 :envFrom [{:secretRef {:name "test-io-secret"}}],
                  :volumeMounts [{:name "content-volume", :mountPath "/var/www/html/website"}
-                                {:name "hash-state-volume", :mountPath "/var/hashfile.d"}]}],
+                                {:name "hashfile-volume", :mountPath "/var/hashfile.d"}]}],
-               :volumes [{:name "content-volume", :persistentVolumeClaim {:claimName "content-volume"}}
+               :volumes [{:name "content-volume", :persistentVolumeClaim {:claimName "test-io-content-volume"}}
-                         {:name "hash-state-volume", :persistentVolumeClaim {:claimName "hash-state-volume"}}],
+                         {:name "hashfile-volume", :persistentVolumeClaim {:claimName "test-io-hashfile-volume"}}],
                :restartPolicy "OnFailure"}}}}}}
          (cut/generate-website-build-cron {:issuer "staging"
                                            :build-cpu-request "500m"
@@ -161,13 +167,10 @@
                                            :branchname "main",
                                            :unique-name "test.io"}))))
 
-
 (deftest should-generate-website-build-secret
   (is (= {:apiVersion "v1",
           :kind "Secret",
-          :metadata {:name "build-secret", 
+          :metadata {:name "test-io-secret", :labels {:app.kubernetes.part-of "test-io"}},
-                     :namespace "test-io",
-                     :labels {:app.kubernetes.part-of "test-io-website"}},
           :data
           {:AUTHTOKEN "YWJlZGpnYmFzZG9kag==",
            :GITREPOURL "aHR0cHM6Ly9naXRsYWIuZGUvYXBpL3YxL3JlcG9zL3NvbWV1c2VyL3JlcG8vYXJjaGl2ZS9tYWluLnppcA==",
@@ -188,17 +191,13 @@
                                              :username "someuser"}))))
 
 (deftest should-generate-website-content-volume
-  (is (= {:apiVersion "v1",
+  (is (= {:name-c1 "test-io-content-volume",
-          :kind "PersistentVolumeClaim",
+          :name-c2 "test-org-content-volume",
-          :metadata
+          :app-c1 "test-io-nginx",
-          {:name "content-volume",
+          :app-c2 "test-org-nginx",
-           :namespace "test-io",
+          :app.kubernetes.part-of-c1 "test-io", 
-           :labels {:app.kubernetes.part-of "test-io-website"}},
+          :app.kubernetes.part-of-c2 "test-org"}
-          :spec
+         (th/map-diff (cut/generate-website-content-volume {:issuer "staging"
-          {:storageClassName "local-path",
-           :accessModes ["ReadWriteOnce"],
-           :resources {:requests {:storage "3Gi"}}}}
-         (cut/generate-website-content-volume {:issuer "staging"
                                                             :build-cpu-request "500m"
                                                             :build-cpu-limit "1700m"
                                                             :build-memory-request "256Mi"
@@ -208,18 +207,27 @@
                                                             :forgejo-host "gitea.evilorg",
                                                             :forgejo-repo "none",
                                                             :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"]})
+                      (cut/generate-website-content-volume {:issuer "staging"
+                                                            :build-cpu-request "500m"
+                                                            :build-cpu-limit "1700m"
+                                                            :build-memory-request "256Mi"
+                                                            :build-memory-limit "512Mi"
+                                                            :volume-size "3"
+                                                            :unique-name "test.org",
+                                                            :forgejo-host "gitea.evilorg",
+                                                            :forgejo-repo "none",
+                                                            :branchname "mablain",
+                                                            :fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]})))))
 
 (deftest should-generate-hashfile-volume
   (is (= {:apiVersion "v1",
           :kind "PersistentVolumeClaim",
           :metadata
-          {:name "hash-state-volume",
+          {:name "test-io-hashfile-volume",
-           :namespace "test-io",
+           :namespace "default",
-           :labels {:app.kubernetes.part-of "test-io-website"}},
+           :labels {:app "test-io-nginx", :app.kubernetes.part-of "test-io"}},
-          :spec {:storageClassName "local-path", 
+          :spec {:storageClassName "local-path", :accessModes ["ReadWriteOnce"], :resources {:requests {:storage "16Mi"}}}}
-                 :accessModes ["ReadWriteOnce"], 
-                 :resources {:requests {:storage "16Mi"}}}}
          (cut/generate-hashfile-volume {:issuer "staging"
                                         :build-cpu-request "500m"
                                         :build-cpu-limit "1700m"