Skip to content

Commit

Permalink
Remove manager and collector commands
Browse files Browse the repository at this point in the history
  • Loading branch information
marccampbell committed Dec 18, 2019
1 parent fd257b5 commit 7ab1734
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 249 deletions.
19 changes: 1 addition & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ define LDFLAGS
"
endef

all: test manager
all: test

.PHONY: ffi
ffi: fmt vet
Expand All @@ -44,10 +44,6 @@ ffi: fmt vet
test: generate fmt vet manifests
go test ./pkg/... ./cmd/... -coverprofile cover.out

.PHONY: manager
manager: generate fmt vet
go build ${LDFLAGS} -o bin/manager github.com/replicatedhq/troubleshoot/cmd/manager

.PHONY: support-bundle
support-bundle: generate fmt vet
go build ${LDFLAGS} -o bin/support-bundle github.com/replicatedhq/troubleshoot/cmd/troubleshoot
Expand All @@ -60,10 +56,6 @@ preflight: generate fmt vet
analyze: generate fmt vet
go build ${LDFLAGS} -o bin/analyze github.com/replicatedhq/troubleshoot/cmd/analyze

.PHONY: run
run: generate fmt vet
TROUBLESHOOT_EXTERNAL_MANAGER=1 go run ./cmd/manager/main.go

.PHONY: install
install: manifests
kubectl apply -f config/crds
Expand Down Expand Up @@ -109,13 +101,6 @@ 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
docker push replicated/troubleshoot:alpha
docker push replicated/preflight:alpha
docker push replicated/troubleshoot-manager:alpha

.PHONY: release
release: export GITHUB_TOKEN = $(shell echo ${GITHUB_TOKEN_TROUBLESHOOT})
release:
Expand All @@ -126,10 +111,8 @@ local-release:
curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --snapshot --config deploy/.goreleaser.local.yml
docker tag replicated/troubleshoot:alpha localhost:32000/troubleshoot:alpha
docker tag replicated/preflight:alpha localhost:32000/preflight:alpha
docker tag replicated/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

.PHONY: run-preflight
run-preflight: preflight
Expand Down
39 changes: 0 additions & 39 deletions cmd/collector/cli/root.go

This file was deleted.

58 changes: 0 additions & 58 deletions cmd/collector/cli/run.go

This file was deleted.

43 changes: 0 additions & 43 deletions cmd/collector/cli/server.go

This file was deleted.

7 changes: 0 additions & 7 deletions cmd/collector/main.go

This file was deleted.

84 changes: 0 additions & 84 deletions cmd/manager/main.go

This file was deleted.

11 changes: 11 additions & 0 deletions config/crds/troubleshoot.replicated.com_collectors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,17 @@ spec:
- namespace
- containerPath
type: object
data:
properties:
collectorName:
type: string
data:
type: string
name:
type: string
required:
- data
type: object
exec:
properties:
args:
Expand Down
11 changes: 11 additions & 0 deletions config/crds/troubleshoot.replicated.com_preflights.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,17 @@ spec:
- namespace
- containerPath
type: object
data:
properties:
collectorName:
type: string
data:
type: string
name:
type: string
required:
- data
type: object
exec:
properties:
args:
Expand Down
21 changes: 21 additions & 0 deletions config/crds/zz_generated.deepcopy.go
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,11 @@ func (in *Collect) DeepCopyInto(out *Collect) {
*out = new(Exec)
(*in).DeepCopyInto(*out)
}
if in.Data != nil {
in, out := &in.Data, &out.Data
*out = new(Data)
**out = **in
}
if in.Copy != nil {
in, out := &in.Copy, &out.Copy
*out = new(Copy)
Expand Down Expand Up @@ -762,6 +767,22 @@ func (in *CustomResourceDefinition) DeepCopy() *CustomResourceDefinition {
return out
}

// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *Data) DeepCopyInto(out *Data) {
*out = *in
out.CollectorMeta = in.CollectorMeta
}

// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Data.
func (in *Data) DeepCopy() *Data {
if in == nil {
return nil
}
out := new(Data)
in.DeepCopyInto(out)
return out
}

// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *DeploymentStatus) DeepCopyInto(out *DeploymentStatus) {
*out = *in
Expand Down

0 comments on commit 7ab1734

Please sign in to comment.