Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename troubleshoot binary to support-bundle #44

Merged
merged 1 commit into from
Aug 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ test: generate fmt vet manifests
manager: generate fmt vet
go build -o bin/manager github.com/replicatedhq/troubleshoot/cmd/manager

.PHONY: troubleshoot
troubleshoot: generate fmt vet
go build -o bin/troubleshoot github.com/replicatedhq/troubleshoot/cmd/troubleshoot
.PHONY: support-bundle
support-bundle: generate fmt vet
go build -o bin/support-bundle github.com/replicatedhq/troubleshoot/cmd/troubleshoot

.PHONY: collector
collector: generate fmt vet
Expand Down Expand Up @@ -104,8 +104,8 @@ run-preflight: preflight
./config/samples/troubleshoot_v1beta1_preflight.yaml

.PHONY: run-troubleshoot
run-troubleshoot: troubleshoot
./bin/troubleshoot \
run-troubleshoot: support-bundle
./bin/support-bundle \
--image=localhost:32000/troubleshoot:alpha \
--pullpolicy=Always \
./config/samples/troubleshoot_v1beta1_collector.yaml
6 changes: 3 additions & 3 deletions deploy/.goreleaser.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ builds:
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
-extldflags "-static"
flags: -tags netgo -installsuffix netgo
binary: troubleshoot
binary: support-bundle
hooks: {}
- id: manager
goos:
Expand Down Expand Up @@ -87,14 +87,14 @@ dockers:
- "replicated/troubleshoot:alpha"
binaries:
- collector
- troubleshoot
- support-bundle
- preflight
- dockerfile: ./deploy/Dockerfile.troubleshoot
image_templates:
- "replicated/preflight:alpha"
binaries:
- collector
- troubleshoot
- support-bundle
- preflight
- dockerfile: ./deploy/Dockerfile.manager
image_templates:
Expand Down
6 changes: 3 additions & 3 deletions deploy/.goreleaser.snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ builds:
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
-extldflags "-static"
flags: -tags netgo -installsuffix netgo
binary: troubleshoot
binary: support-bundle
hooks: {}
- id: manager
goos:
Expand Down Expand Up @@ -91,14 +91,14 @@ dockers:
- "replicated/troubleshoot:alpha"
binaries:
- collector
- troubleshoot
- support-bundle
- preflight
- dockerfile: ./deploy/Dockerfile.troubleshoot
image_templates:
- "replicated/preflight:alpha"
binaries:
- collector
- troubleshoot
- support-bundle
- preflight
- dockerfile: ./deploy/Dockerfile.manager
image_templates:
Expand Down
2 changes: 1 addition & 1 deletion deploy/Dockerfile.troubleshoot
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN apt-get -qq update \
&& apt-get -qq -y install \
ca-certificates

COPY troubleshoot /troubleshoot/troubleshoot
COPY support-bundle /troubleshoot/support-bundle
COPY collector /troubleshoot/collector
COPY preflight /troubleshoot/preflight

Expand Down
22 changes: 11 additions & 11 deletions deploy/krew/troubleshoot.yaml
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
apiVersion: krew.googlecontainertools.github.com/v1alpha2
kind: Plugin
metadata:
name: troubleshoot
name: support-bundle
spec:
version: "v0.9.2"
platforms:
- selector:
matchLabels:
os: linux
arch: amd64
uri: https://github.com/replicatedhq/troubleshoot/releases/download/v0.9.2/troubleshoot_0.9.2_linux_amd64-0.9.2.tar.gz
uri: https://github.com/replicatedhq/troubleshoot/releases/download/v0.9.2/support-bundle_0.9.2_linux_amd64-0.9.2.tar.gz
sha256: "7d730975ba9bf2a823a6cb068371e471b2a71078f12f541864a82847a163d4c6"
files:
- from: "/troubleshoot"
- from: "/support-bundle"
to: "."
bin: "troubleshoot"
bin: "support-bundle"
- selector:
matchLabels:
os: darwin
arch: amd64
uri: https://github.com/replicatedhq/troubleshoot/releases/download/v0.9.2/troubleshoot_0.9.2_darwin_amd64-0.9.2.tar.gz
sha256: "f7993391270c780af51d3ce00768801e99792561850f4e07d658047384de64f0"
files:
- from: "/troubleshoot"
- from: "/support-bundle"
to: "."
bin: "troubleshoot"
bin: "support-bundle"
- selector:
matchLabels:
os: windows
arch: amd64
uri: https://github.com/replicatedhq/troubleshoot/releases/download/v0.9.2/troubleshoot_0.9.2_windows_amd64-0.9.2.zip
sha256: "58ef1fac44a2c8dc7f6b4cd5170a36109abb5ae242707363dcc147f966fe8d1d"
files:
- from: "/troubleshoot.exe"
- from: "/support-bundle.exe"
to: "."
bin: "troubleshoot.exe"
bin: "support-bundle.exe"
shortDescription: Creates support bundles for off-cluster analysis
homepage: https://github.com/replicatedhq/troubleshoot
caveats: |
Usage:
$ kubectl troubleshoot <uri>
$ kubectl support-bundle <uri>

where <uri> references a set of application collectors

For example:

$ kubectl troubleshoot https://troubleshoot.replicated.com
$ kubectl support-bundle https://troubleshoot.replicated.com

For additional options:
$ kubectl troubleshoot --help
$ kubectl support-bundle --help

Documentation:
Full documentation on this plugin is available at:
Expand Down