Add nodes to the bundle

Author: marccampbell

examples/troubleshoot/sample-troubleshoot.yaml

@@ -3,27 +3,4 @@ kind: Collector
 metadata:
   name: collector-sample
 spec:
-  collectors:
-    - secret:
-        name: myapp-postgres
-        namespace: default
-        key: uri
-        includeValue: false
-    - logs:
-        selector:
-          - name=cilium-operator
-        namespace: kube-system
-        limits:
-          maxAge: 30d
-          maxLines: 10000
-    - run:
-        collectorName: ping-google
-        namespace: default
-        image: flungo/netutils
-        command: ["ping"]
-        args: ["www.google.com"]
-        timeout: 5s
-    - http:
-        collectorName: echo-ip
-        get:
-          url: https://api.replicated.com/market/v1/echo/ip
+  collectors: []

pkg/collect/cluster_resources.go

@@ -30,6 +30,8 @@ type ClusterResourcesOutput struct {
 	CustomResourceDefinitionsErrors []byte            `json:"cluster-resources/custom-resource-definitions-errors.json,omitempty"`
 	ImagePullSecrets                map[string][]byte `json:"cluster-resources/image-pull-secrets,omitempty"`
 	ImagePullSecretsErrors          []byte            `json:"cluster-resources/image-pull-secrets-errors.json,omitempty"`
+	Nodes                           []byte            `json:"cluster-resources/nodes.json,omitempty"`
+	NodesErrors                     []byte            `json:"cluster-resources/nodes-errors.json,omitempty"`
 }
 
 func ClusterResources(ctx *Context) ([]byte, error) {
@@ -113,6 +115,14 @@ func ClusterResources(ctx *Context) ([]byte, error) {
 		return nil, err
 	}
 
+	// nodes
+	nodes, nodeErrors := nodes(client)
+	clusterResourcesOutput.Nodes = nodes
+	clusterResourcesOutput.NodesErrors, err = marshalNonNil(nodeErrors)
+	if err != nil {
+		return nil, err
+	}
+
 	if ctx.Redact {
 		clusterResourcesOutput, err = clusterResourcesOutput.Redact()
 		if err != nil {
@@ -314,11 +324,29 @@ func imagePullSecrets(client *kubernetes.Clientset, namespaces []string) (map[st
 	return imagePullSecrets, errors
 }
 
+func nodes(client *kubernetes.Clientset) ([]byte, []string) {
+	nodes, err := client.CoreV1().Nodes().List(metav1.ListOptions{})
+	if err != nil {
+		return nil, []string{err.Error()}
+	}
+
+	b, err := json.MarshalIndent(nodes.Items, "", "  ")
+	if err != nil {
+		return nil, []string{err.Error()}
+	}
+
+	return b, nil
+}
+
 func (c *ClusterResourcesOutput) Redact() (*ClusterResourcesOutput, error) {
 	namespaces, err := redact.Redact(c.Namespaces)
 	if err != nil {
 		return nil, err
 	}
+	nodes, err := redact.Redact(c.Nodes)
+	if err != nil {
+		return nil, err
+	}
 	pods, err := redactMap(c.Pods)
 	if err != nil {
 		return nil, err
@@ -346,6 +374,8 @@ func (c *ClusterResourcesOutput) Redact() (*ClusterResourcesOutput, error) {
 	return &ClusterResourcesOutput{
 		Namespaces:                      namespaces,
 		NamespacesErrors:                c.NamespacesErrors,
+		Nodes:                           nodes,
+		NodesErrors:                     c.NodesErrors,
 		Pods:                            pods,
 		PodsErrors:                      c.PodsErrors,
 		Services:                        services,