first commit

Makefile

@@ -16,6 +16,10 @@ manager: generate fmt vet
 troubleshoot: generate fmt vet
 	go build -o bin/troubleshoot github.com/replicatedhq/troubleshoot/cmd/troubleshoot
 
+.PHONY: collector
+collector: generate fmt vet
+	go build -o bin/collector github.com/replicatedhq/troubleshoot/cmd/collector
+
 .PHONY: preflight
 preflight: generate fmt vet
 	go build -o bin/preflight github.com/replicatedhq/troubleshoot/cmd/preflight
@@ -26,11 +30,11 @@ run: generate fmt vet
 
 # Install CRDs into a cluster
 install: manifests
-	kubectl apply -f config/crds
+	kubectl apply -f config/crd
 
 # Deploy controller in the configured Kubernetes cluster in ~/.kube/config
 deploy: manifests
-	kubectl apply -f config/crds
+	kubectl apply -f config/crd
 	kustomize build config/default | kubectl apply -f -
 
 # Generate manifests e.g. CRD, RBAC etc.

cmd/collector/cli/collect.go

@@ -0,0 +1,27 @@
+package cli
+
+import (
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+func Server() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "server",
+		Short: "start the collector server",
+		Long:  `...`,
+		PreRun: func(cmd *cobra.Command, args []string) {
+			viper.BindPFlag("port", cmd.Flags().Lookup("port"))
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+
+			return nil
+		},
+	}
+
+	cmd.Flags().Int("port", 8000, "port to bind to")
+
+	viper.BindPFlags(cmd.Flags())
+
+	return cmd
+}

cmd/collector/cli/root.go

@@ -0,0 +1,38 @@
+package cli
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+func RootCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:          "collector",
+		Short:        "Run the cluster-side server for bundle collection",
+		Long:         ``,
+		SilenceUsage: true,
+	}
+
+	cobra.OnInitialize(initConfig)
+
+	cmd.AddCommand(Server())
+
+	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
+	return cmd
+}
+
+func InitAndExecute() {
+	if err := RootCmd().Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}
+
+func initConfig() {
+	viper.SetEnvPrefix("TROUBLESHOT")
+	viper.AutomaticEnv()
+}

cmd/collector/main.go

@@ -0,0 +1,7 @@
+package main
+
+import "github.com/replicatedhq/troubleshoot/cmd/collector/cli"
+
+func main() {
+	cli.InitAndExecute()
+}

config/crd/troubleshoot.replicated.com_collectorjobs.yaml

@@ -390,6 +390,18 @@ spec:
                 type: string
             type: object
           spec:
+            properties:
+              collector:
+                properties:
+                  name:
+                    type: string
+                  namespace:
+                    type: string
+                required:
+                - name
+                type: object
+            required:
+            - collector
             type: object
           status:
             type: object

config/samples/troubleshoot_v1beta1_collector.yaml

@@ -3,21 +3,4 @@ kind: Collector
 metadata:
   name: collector-sample
 spec:
-  collectors:
-    - kubernetes.resource-list:
-        output_dir: /kubernetes/resources/jobs
-        kind: jobs
-        namespace: ""
-    - kubernetes.resource-list:
-        output_dir: /kubernetes/resources/deployments
-        kind: deployments
-        namespace: ""
-    - kubernetes.resource-list:
-        output_dir: /kubernetes/resources/pods
-        kind: pods
-        namespace: ""
-    - kubernetes.resource-list:
-        output_dir: /kubernetes/resources/events
-        kind: events
-        namespace: ""
-
+  - cluster-info: {}

config/samples/troubleshoot_v1beta1_collectorjob.yaml

@@ -1,9 +1,8 @@
 apiVersion: troubleshoot.replicated.com/v1beta1
 kind: CollectorJob
 metadata:
-  labels:
-    controller-tools.k8s.io: "1.0"
   name: collectorjob-sample
 spec:
-  # Add fields here
-  foo: bar
+  collector:
+    name: collector-sample
+    namespace: default