feat: deploy modules to different namespaces

Signed-off-by: hanshal101 <[email protected]>
cyclops-ui · Jul 17, 2024 · 1e8804a · 1e8804a
1 parent 5da3c78
commit 1e8804a
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/cyclops-ctrl/internal/cluster/k8sclient/modules.go b/cyclops-ctrl/internal/cluster/k8sclient/modules.go
@@ -56,16 +56,12 @@ func (k *KubernetesClient) GetModule(name, namespace string) (*cyclopsv1alpha1.M
 func (k *KubernetesClient) GetResourcesForModule(name, namespace string) ([]dto.Resource, error) {
 	out := make([]dto.Resource, 0, 0)
 
-<<<<<<< HEAD
-	managedGVRs, err := k.getManagedGVRs(name)
-=======
 	module, err := k.GetModule(name, namespace)
 	if err != nil {
 		return nil, err
 	}
 
-	managedGVRs, err := k.getManagedGVRs(module)
->>>>>>> db95630 (feat: deploy modules to different namespaces)
+	managedGVRs, err := k.getManagedGVRs(module.Name, namespace)
 	if err != nil {
 		return nil, err
 	}
@@ -112,8 +108,8 @@ func (k *KubernetesClient) GetResourcesForModule(name, namespace string) ([]dto.
 	return out, nil
 }
 
-func (k *KubernetesClient) getManagedGVRs(moduleName string) ([]schema.GroupVersionResource, error) {
-	module, _ := k.GetModule(moduleName)
+func (k *KubernetesClient) getManagedGVRs(moduleName, namespace string) ([]schema.GroupVersionResource, error) {
+	module, _ := k.GetModule(moduleName, namespace)
 
 	if module != nil && len(module.Status.ManagedGVRs) != 0 {
 		existing := make([]schema.GroupVersionResource, 0, len(module.Status.ManagedGVRs))