improve list of components to get logs (#1575)

* only k8s workload object kinds for the list of components to get logs; none for helm or unknown app type
nuvla · May 23, 2024 · dc262c0 · dc262c0
1 parent 07db18e
commit dc262c0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/code/src/cljs/sixsq/nuvla/ui/pages/apps/utils.cljs b/code/src/cljs/sixsq/nuvla/ui/pages/apps/utils.cljs
@@ -12,6 +12,7 @@
 (def subtype-component "component")
 (def subtype-application "application")
 (def subtype-application-k8s "application_kubernetes")
+(def subtype-application-helm "application_helm")
 (def subtype-applications-sets "applications_sets")
 
 (def apps-description-template "# App Description Placeholder

diff --git a/code/src/cljs/sixsq/nuvla/ui/pages/deployments_detail/subs.cljs b/code/src/cljs/sixsq/nuvla/ui/pages/deployments_detail/subs.cljs
@@ -57,6 +57,12 @@
   (fn [{:keys [subtype]}]
     (= subtype apps-utils/subtype-application-k8s)))
 
+(reg-sub
+  ::is-deployment-application-helm?
+  :<- [::deployment-module]
+  (fn [{:keys [subtype]}]
+    (= subtype apps-utils/subtype-application-helm)))
+
 
 (defn parse-application-yaml
   [docker-compose]
@@ -65,13 +71,29 @@
                     (catch :default _))]
     (js->clj yaml)))
 
+(def ^:const k8s-workload-object-kinds
+  #{"CronJob"
+    "DaemonSet"
+    "Deployment"
+    "Job"
+    "Pod"
+    "ReplicaSet"
+    "StatefulSet"})
+
+(defn only-k8s-workload-object-kinds
+  [object]
+  (when (contains? k8s-workload-object-kinds (get object "kind"))
+    (let [kind (get object "kind")
+          name (get-in object ["metadata" "name"])]
+      (str kind "/" name))))
 
 (reg-sub
   ::deployment-services-list
   :<- [::is-deployment-application?]
   :<- [::is-deployment-application-kubernetes?]
+  :<- [::is-deployment-application-helm?]
   :<- [::deployment-module-content]
-  (fn [[is-application? is-application-kubernetes? {:keys [docker-compose]}]]
+  (fn [[is-application? is-application-kubernetes? is-application-helm? {:keys [docker-compose]}]]
     (cond
       is-application? (some-> docker-compose
                               parse-application-yaml
@@ -81,11 +103,11 @@
                               sort)
       is-application-kubernetes? (some->> docker-compose
                                           parse-application-yaml
-                                          (map #(let [kind      (get % "kind")
-                                                      meta-name (get-in % ["metadata" "name"])]
-                                                  (str kind "/" meta-name)))
+                                          (map only-k8s-workload-object-kinds)
+                                          (remove nil?)
                                           sort)
-      :else ["machine"])))
+      is-application-helm? []
+      :else [])))
 
 
 (reg-sub