Merge pull request #2 from replicatedhq/collector-job

Run cluster-info in a collector pod

Author: marccampbell

.gitignore

@@ -22,3 +22,5 @@ bin
 *.swp
 *.swo
 *~
+
+dist

Dockerfile

@@ -24,20 +24,20 @@ collector: generate fmt vet
 preflight: generate fmt vet
 	go build -o bin/preflight github.com/replicatedhq/troubleshoot/cmd/preflight
 
-# Run against the configured Kubernetes cluster in ~/.kube/config
+.PHONY: run
 run: generate fmt vet
-	go run ./cmd/manager/main.go
+	TROUBLESHOOT_EXTERNAL_MANAGER=1 go run ./cmd/manager/main.go
 
-# Install CRDs into a cluster
+.PHONY: install
 install: manifests
 	kubectl apply -f config/crds
 
-# Deploy controller in the configured Kubernetes cluster in ~/.kube/config
+.PHONY: deploy
 deploy: manifests
 	kubectl apply -f config/crds
 	kustomize build config/default | kubectl apply -f -
 
-# Generate manifests e.g. CRD, RBAC etc.
+.PHONY: manifests
 manifests:
 	controller-gen paths=./pkg/apis/... output:dir=./config/crds
 
@@ -54,16 +54,6 @@ generate: controller-gen # client-gen
 	controller-gen object:headerFile=./hack/boilerplate.go.txt paths=./pkg/apis/...
 	# client-gen --output-package=github.com/replicatedhq/troubleshoot/pkg/client --clientset-name troubleshootclientset --input-base github.com/replicatedhq/troubleshoot/pkg/apis --input troubleshoot/v1beta1 -h ./hack/boilerplate.go.txt
 
-# Build the docker image
-docker-build: test
-	docker build . -t ${IMG}
-	@echo "updating kustomize image patch file for manager resource"
-	sed -i'' -e 's@image: .*@image: '"${IMG}"'@' ./config/default/manager_image_patch.yaml
-
-# Push the docker image
-docker-push:
-	docker push ${IMG}
-
 # find or download controller-gen
 # download controller-gen if necessary
 controller-gen:
@@ -82,3 +72,16 @@ CLIENT_GEN=$(shell go env GOPATH)/bin/client-gen
 else
 CLIENT_GEN=$(shell which client-gen)
 endif
+
+.PHONY: snapshot-release
+snapshot-release:
+	curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --snapshot --config deploy/.goreleaser.snapshot.yml
+
+.PHONY: local-release
+local-release: snapshot-release
+	docker tag replicatedhq/troubleshoot:alpha localhost:32000/troubleshoot:alpha
+	docker tag replicatedhq/preflight:alpha localhost:32000/preflight:alpha
+	docker tag replicatedhq/troubleshoot-manager:alpha localhost:32000/troubleshoot-manager:alpha
+	docker push localhost:32000/troubleshoot:alpha
+	docker push localhost:32000/preflight:alpha
+	docker push localhost:32000/troubleshoot-manager:alpha

Makefile

@@ -19,6 +19,7 @@ func RootCmd() *cobra.Command {
 
 	cobra.OnInitialize(initConfig)
 
+	cmd.AddCommand(Run())
 	cmd.AddCommand(Server())
 
 	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
@@ -33,6 +34,6 @@ func InitAndExecute() {
 }
 
 func initConfig() {
-	viper.SetEnvPrefix("TROUBLESHOT")
+	viper.SetEnvPrefix("TROUBLESHOOT")
 	viper.AutomaticEnv()
 }

cmd/collector/cli/root.go

@@ -0,0 +1,45 @@
+package cli
+
+import (
+	"io/ioutil"
+
+	"github.com/replicatedhq/troubleshoot/pkg/collect"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+func Run() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "run",
+		Short: "run a single collector",
+		Long:  `...`,
+		PreRun: func(cmd *cobra.Command, args []string) {
+			viper.BindPFlag("collector", cmd.Flags().Lookup("collector"))
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			v := viper.GetViper()
+
+			specContents, err := ioutil.ReadFile(v.GetString("collector"))
+			if err != nil {
+				return err
+			}
+
+			collector := collect.Collector{
+				Spec: string(specContents),
+			}
+			if err := collector.RunCollectorSync(); err != nil {
+				return err
+			}
+
+			return nil
+		},
+	}
+
+	cmd.Flags().String("collector", "", "path to a single collector spec to collect")
+
+	cmd.MarkFlagRequired("collector")
+
+	viper.BindPFlags(cmd.Flags())
+
+	return cmd
+}

cmd/collector/cli/run.go

@@ -1,25 +1,40 @@
 package cli
 
 import (
+	"context"
+	"fmt"
+	"os"
+	"os/signal"
+
+	"github.com/replicatedhq/troubleshoot/pkg/server"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
 
 func Server() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "server",
-		Short: "start the collector server",
+		Short: "run the http server",
 		Long:  `...`,
 		PreRun: func(cmd *cobra.Command, args []string) {
 			viper.BindPFlag("port", cmd.Flags().Lookup("port"))
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
+			v := viper.GetViper()
+
+			server.Serve(context.Background(), fmt.Sprintf(":%d", v.GetInt("port")))
+
+			c := make(chan os.Signal, 1)
+			signal.Notify(c, os.Interrupt)
 
-			return nil
+			select {
+			case <-c:
+				return nil
+			}
 		},
 	}
 
-	cmd.Flags().Int("port", 8000, "port to bind to")
+	cmd.Flags().Int("port", 8000, "port to listen on")
 
 	viper.BindPFlags(cmd.Flags())
 

cmd/collector/cli/collect.go renamed to cmd/collector/cli/server.go

@@ -0,0 +1,37 @@
+package cli
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+)
+
+func RootCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "troubleshoot",
+		Short: "Generate and manage support bundles",
+		Long: `A support bundle is an archive of files, output, metrics and state
+from a server that can be used to assist when troubleshooting a server.`,
+		SilenceUsage: true,
+	}
+
+	cobra.OnInitialize(initConfig)
+
+	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
+	return cmd
+}
+
+func InitAndExecute() {
+	if err := RootCmd().Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}
+
+func initConfig() {
+	viper.SetEnvPrefix("TROUBLESHOOT")
+	viper.AutomaticEnv()
+}

cmd/preflight/cli/root.go

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