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

@@ -102,7 +102,6 @@
         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 %
@@ -117,7 +116,6 @@
         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))))
 

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

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

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

@@ -83,7 +83,7 @@
                                                             :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"},
+          :metadata {:labels {:app.kubernetes.part-of "test-io-website"},
                      :namespace "test-io",
                      :name "etc-nginx"}}
          (dissoc (cut/generate-nginx-configmap {:issuer "staging"
@@ -99,15 +99,15 @@
                                                 :fqdns ["test.de" "www.test.de" "test-it.de" "www.test-it.de"]}) :data))))
 
 (deftest should-generate-nginx-service
-  (is (= {:name-c1 "test-io",
+  (is (= {:kind "Service",
-          :name-c2 "test-org",
+          :apiVersion "v1",
-          :app-c1 "test-io",
+          :metadata
-          :app-c2 "test-org",
+          {:name "test-io",
-          :app.kubernetes.part-of-c1 "test-io",
+           :namespace "test-io",
-          :app.kubernetes.part-of-c2 "test-org"
+           :labels {:app "test-io", :app.kubernetes.part-of "test-io-website"}},
-          :namespace-c1 "test-io", 
+          :spec
-          :namespace-c2 "test-org"}
+          {:selector {:app "nginx"}, :ports [{:name "nginx-http", :port 80}]}}
-         (th/map-diff (cut/generate-nginx-service {:issuer "staging"
+         (cut/generate-nginx-service {:issuer "staging"
                                                    :build-cpu-request "500m"
                                                    :build-cpu-limit "1700m"
                                                    :build-memory-request "256Mi"
@@ -118,17 +118,7 @@
                                                    :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",