Skip to content

Commit 7ab1734

Browse files
committed
Remove manager and collector commands
1 parent fd257b5 commit 7ab1734

File tree

9 files changed

+44
-249
lines changed

9 files changed

+44
-249
lines changed

Makefile

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ define LDFLAGS
3434
"
3535
endef
3636

37-
all: test manager
37+
all: test
3838

3939
.PHONY: ffi
4040
ffi: fmt vet
@@ -44,10 +44,6 @@ ffi: fmt vet
4444
test: generate fmt vet manifests
4545
go test ./pkg/... ./cmd/... -coverprofile cover.out
4646

47-
.PHONY: manager
48-
manager: generate fmt vet
49-
go build ${LDFLAGS} -o bin/manager github.com/replicatedhq/troubleshoot/cmd/manager
50-
5147
.PHONY: support-bundle
5248
support-bundle: generate fmt vet
5349
go build ${LDFLAGS} -o bin/support-bundle github.com/replicatedhq/troubleshoot/cmd/troubleshoot
@@ -60,10 +56,6 @@ preflight: generate fmt vet
6056
analyze: generate fmt vet
6157
go build ${LDFLAGS} -o bin/analyze github.com/replicatedhq/troubleshoot/cmd/analyze
6258

63-
.PHONY: run
64-
run: generate fmt vet
65-
TROUBLESHOOT_EXTERNAL_MANAGER=1 go run ./cmd/manager/main.go
66-
6759
.PHONY: install
6860
install: manifests
6961
kubectl apply -f config/crds
@@ -109,13 +101,6 @@ else
109101
CLIENT_GEN=$(shell which client-gen)
110102
endif
111103

112-
.PHONY: snapshot-release
113-
snapshot-release:
114-
curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --snapshot --config deploy/.goreleaser.snapshot.yml
115-
docker push replicated/troubleshoot:alpha
116-
docker push replicated/preflight:alpha
117-
docker push replicated/troubleshoot-manager:alpha
118-
119104
.PHONY: release
120105
release: export GITHUB_TOKEN = $(shell echo ${GITHUB_TOKEN_TROUBLESHOOT})
121106
release:
@@ -126,10 +111,8 @@ local-release:
126111
curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --snapshot --config deploy/.goreleaser.local.yml
127112
docker tag replicated/troubleshoot:alpha localhost:32000/troubleshoot:alpha
128113
docker tag replicated/preflight:alpha localhost:32000/preflight:alpha
129-
docker tag replicated/troubleshoot-manager:alpha localhost:32000/troubleshoot-manager:alpha
130114
docker push localhost:32000/troubleshoot:alpha
131115
docker push localhost:32000/preflight:alpha
132-
docker push localhost:32000/troubleshoot-manager:alpha
133116

134117
.PHONY: run-preflight
135118
run-preflight: preflight

cmd/collector/cli/root.go

Lines changed: 0 additions & 39 deletions
This file was deleted.

cmd/collector/cli/run.go

Lines changed: 0 additions & 58 deletions
This file was deleted.

cmd/collector/cli/server.go

Lines changed: 0 additions & 43 deletions
This file was deleted.

cmd/collector/main.go

Lines changed: 0 additions & 7 deletions
This file was deleted.

cmd/manager/main.go

Lines changed: 0 additions & 84 deletions
This file was deleted.

config/crds/troubleshoot.replicated.com_collectors.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,17 @@ spec:
444444
- namespace
445445
- containerPath
446446
type: object
447+
data:
448+
properties:
449+
collectorName:
450+
type: string
451+
data:
452+
type: string
453+
name:
454+
type: string
455+
required:
456+
- data
457+
type: object
447458
exec:
448459
properties:
449460
args:

config/crds/troubleshoot.replicated.com_preflights.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,6 +849,17 @@ spec:
849849
- namespace
850850
- containerPath
851851
type: object
852+
data:
853+
properties:
854+
collectorName:
855+
type: string
856+
data:
857+
type: string
858+
name:
859+
type: string
860+
required:
861+
- data
862+
type: object
852863
exec:
853864
properties:
854865
args:

config/crds/zz_generated.deepcopy.go

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,11 @@ func (in *Collect) DeepCopyInto(out *Collect) {
419419
*out = new(Exec)
420420
(*in).DeepCopyInto(*out)
421421
}
422+
if in.Data != nil {
423+
in, out := &in.Data, &out.Data
424+
*out = new(Data)
425+
**out = **in
426+
}
422427
if in.Copy != nil {
423428
in, out := &in.Copy, &out.Copy
424429
*out = new(Copy)
@@ -762,6 +767,22 @@ func (in *CustomResourceDefinition) DeepCopy() *CustomResourceDefinition {
762767
return out
763768
}
764769

770+
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
771+
func (in *Data) DeepCopyInto(out *Data) {
772+
*out = *in
773+
out.CollectorMeta = in.CollectorMeta
774+
}
775+
776+
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Data.
777+
func (in *Data) DeepCopy() *Data {
778+
if in == nil {
779+
return nil
780+
}
781+
out := new(Data)
782+
in.DeepCopyInto(out)
783+
return out
784+
}
785+
765786
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
766787
func (in *DeploymentStatus) DeepCopyInto(out *DeploymentStatus) {
767788
*out = *in

0 commit comments

Comments
 (0)