Merge pull request #7 from kronostechnologies/feature/DOPS-3388-fix-a…

…pp-list-for-ops-role DOPS-3388 : Add parameter namespace to listApps function
kronostechnologies · Apr 5, 2023 · 07ff531 · 07ff531
2 parents 50223e4 + 61f05b9
commit 07ff531
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/action/apps_list.go b/action/apps_list.go
@@ -51,7 +51,11 @@ func Run(filters AppFilters) error {
 		ClientSet:      GetClientSet(GetKubeConfigPath()),
 	}
 	currentContext := clientSet.Cluster
-	listApps, err := ListApps(clientSet.ClientSet)
+	var namespace string = ""
+	if len(filters.Filters) > 0 {
+		namespace = filters.Filters[0]
+	}
+	listApps, err := ListApps(clientSet.ClientSet, namespace)
 
 	if err != nil {
 		return err
@@ -146,8 +150,8 @@ func ConnectCluster() *kubernetes.Clientset {
 }
 
 //Return a pointer to a list of Pods
-func ListApps(clientSet kubernetes.Interface) (*v1.PodList, error) {
-	pods, err := clientSet.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{})
+func ListApps(clientSet kubernetes.Interface, namespace string) (*v1.PodList, error) {
+	pods, err := clientSet.CoreV1().Pods(namespace).List(context.TODO(), metav1.ListOptions{})
 	if err != nil {
 		return nil, err
 	}

diff --git a/action/apps_run.go b/action/apps_run.go
@@ -66,7 +66,7 @@ func (c *AppsRun) Run() error {
 		ClientSet:      GetClientSet(GetKubeConfigPath()),
 	}
 	currentContext := clientSet.Cluster
-	listApps, err := ListApps(clientSet.ClientSet)
+	listApps, err := ListApps(clientSet.ClientSet, c.Application)
 
 	if err != nil {
 		return err