ability to specify a list of namespaces for the cluster resources collector (#424)

* ability to specify a list of namespaces for the cluster resources collector

Author: sgalsaleh

pkg/apis/troubleshoot/v1beta2/collector_shared.go

@@ -21,6 +21,7 @@ type ClusterInfo struct {
 
 type ClusterResources struct {
 	CollectorMeta `json:",inline" yaml:",inline"`
+	Namespaces    []string `json:"namespaces,omitempty" yaml:"namespaces,omitempty"`
 }
 
 type Secret struct {

pkg/collect/cluster_resources.go

@@ -8,6 +8,7 @@ import (
 	"path" // this code uses 'path' and not 'path/filepath' because we don't want backslashes on windows
 	"strings"
 
+	troubleshootv1beta2 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
 	authorizationv1 "k8s.io/api/authorization/v1"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
@@ -16,38 +17,48 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
-func ClusterResources(c *Collector) (map[string][]byte, error) {
+func ClusterResources(c *Collector, clusterResourcesCollector *troubleshootv1beta2.ClusterResources) (map[string][]byte, error) {
 	client, err := kubernetes.NewForConfig(c.ClientConfig)
 	if err != nil {
 		return nil, err
 	}
 
 	ctx := context.Background()
-
 	clusterResourcesOutput := map[string][]byte{}
+
 	// namespaces
 	var namespaceNames []string
-	if c.Namespace == "" {
-		namespaces, namespaceList, namespaceErrors := namespaces(ctx, client)
+	if len(clusterResourcesCollector.Namespaces) > 0 {
+		namespaces, namespaceErrors := getNamespaces(ctx, client, clusterResourcesCollector.Namespaces)
+		namespaceNames = clusterResourcesCollector.Namespaces
 		clusterResourcesOutput["cluster-resources/namespaces.json"] = namespaces
 		clusterResourcesOutput["cluster-resources/namespaces-errors.json"], err = marshalNonNil(namespaceErrors)
 		if err != nil {
 			return nil, err
 		}
-		if namespaceList != nil {
-			for _, namespace := range namespaceList.Items {
-				namespaceNames = append(namespaceNames, namespace.Name)
-			}
+	} else if c.Namespace != "" {
+		namespace, namespaceErrors := getNamespace(ctx, client, c.Namespace)
+		clusterResourcesOutput["cluster-resources/namespaces.json"] = namespace
+		clusterResourcesOutput["cluster-resources/namespaces-errors.json"], err = marshalNonNil(namespaceErrors)
+		if err != nil {
+			return nil, err
 		}
+		namespaceNames = append(namespaceNames, c.Namespace)
 	} else {
-		namespaces, namespaceErrors := getNamespace(ctx, client, c.Namespace)
+		namespaces, namespaceList, namespaceErrors := getAllNamespaces(ctx, client)
 		clusterResourcesOutput["cluster-resources/namespaces.json"] = namespaces
 		clusterResourcesOutput["cluster-resources/namespaces-errors.json"], err = marshalNonNil(namespaceErrors)
 		if err != nil {
 			return nil, err
 		}
-		namespaceNames = append(namespaceNames, c.Namespace)
+		if namespaceList != nil {
+			for _, namespace := range namespaceList.Items {
+				namespaceNames = append(namespaceNames, namespace.Name)
+			}
+		}
 	}
+
+	// pods
 	pods, podErrors := pods(ctx, client, namespaceNames)
 	for k, v := range pods {
 		clusterResourcesOutput[path.Join("cluster-resources/pods", k)] = v
@@ -214,7 +225,7 @@ func ClusterResources(c *Collector) (map[string][]byte, error) {
 	return clusterResourcesOutput, nil
 }
 
-func namespaces(ctx context.Context, client *kubernetes.Clientset) ([]byte, *corev1.NamespaceList, []string) {
+func getAllNamespaces(ctx context.Context, client *kubernetes.Clientset) ([]byte, *corev1.NamespaceList, []string) {
 	namespaces, err := client.CoreV1().Namespaces().List(ctx, metav1.ListOptions{})
 	if err != nil {
 		return nil, nil, []string{err.Error()}
@@ -228,13 +239,35 @@ func namespaces(ctx context.Context, client *kubernetes.Clientset) ([]byte, *cor
 	return b, namespaces, nil
 }
 
+func getNamespaces(ctx context.Context, client *kubernetes.Clientset, namespaces []string) ([]byte, []string) {
+	namespacesArr := []*corev1.Namespace{}
+	errorsArr := []string{}
+
+	for _, namespace := range namespaces {
+		ns, err := client.CoreV1().Namespaces().Get(ctx, namespace, metav1.GetOptions{})
+		if err != nil {
+			errorsArr = append(errorsArr, err.Error())
+			continue
+		}
+		namespacesArr = append(namespacesArr, ns)
+	}
+
+	b, err := json.MarshalIndent(namespacesArr, "", "  ")
+	if err != nil {
+		errorsArr = append(errorsArr, err.Error())
+		return nil, errorsArr
+	}
+
+	return b, errorsArr
+}
+
 func getNamespace(ctx context.Context, client *kubernetes.Clientset, namespace string) ([]byte, []string) {
-	namespaces, err := client.CoreV1().Namespaces().Get(ctx, namespace, metav1.GetOptions{})
+	ns, err := client.CoreV1().Namespaces().Get(ctx, namespace, metav1.GetOptions{})
 	if err != nil {
 		return nil, []string{err.Error()}
 	}
 
-	b, err := json.MarshalIndent(namespaces, "", "  ")
+	b, err := json.MarshalIndent(ns, "", "  ")
 	if err != nil {
 		return nil, []string{err.Error()}
 	}

pkg/collect/collector.go

@@ -202,7 +202,7 @@ func (c *Collector) RunCollectorSync(clientConfig *rest.Config, client kubernete
 	if c.Collect.ClusterInfo != nil {
 		result, err = ClusterInfo(c)
 	} else if c.Collect.ClusterResources != nil {
-		result, err = ClusterResources(c)
+		result, err = ClusterResources(c, c.Collect.ClusterResources)
 	} else if c.Collect.Secret != nil {
 		result, err = Secret(ctx, client, c.Collect.Secret)
 	} else if c.Collect.ConfigMap != nil {