resolve conflicts

cyclops-ui · Jan 3, 2025 · 2a80544 · 2a80544
1 parent aa4e154
commit 2a80544
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cyclops-ctrl/cmd/main/main.go b/cyclops-ctrl/cmd/main/main.go
@@ -123,7 +123,7 @@ func main() {
 		}),
 		Cache: ctrlCache.Options{
 			DefaultNamespaces: map[string]ctrlCache.Config{
-				getWatchNamespace("WATCH_NAMESPACE"): {},
+				getWatchNamespace(): {},
 			},
 		},
 	})

diff --git a/cyclops-ui/src/components/k8s-resources/ResourceList/ResourceList.tsx b/cyclops-ui/src/components/k8s-resources/ResourceList/ResourceList.tsx
@@ -47,6 +47,7 @@ import { mapResponseError } from "../../../utils/api/errors";
 import { CheckboxChangeEvent } from "antd/es/checkbox";
 import { Workload } from "../../../utils/k8s/workload";
 import { useResourceListActions } from "./ResourceListActionsContext";
+import DefaultResource from "../DefaultResource";
 
 interface Props {
   loadResources: boolean;
@@ -332,6 +333,7 @@ const ResourceList = ({
         break;
       case "ClusterRole":
         resourceDetails = <ClusterRole name={resource.name} />;
+        break;
       default:
         resourceDetails = (
           <DefaultResource
@@ -343,7 +345,6 @@ const ResourceList = ({
             onResourceDelete={onResourceDelete}
           />
         );
-        break;
     }
 
     let deletedWarning = <p />;