diff --git a/Makefile b/Makefile index 0a9fc2d72..48dddf53a 100644 --- a/Makefile +++ b/Makefile @@ -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 @@ -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 diff --git a/deploy/.goreleaser.local.yml b/deploy/.goreleaser.local.yml index 3ced0aa21..c2d3655c3 100644 --- a/deploy/.goreleaser.local.yml +++ b/deploy/.goreleaser.local.yml @@ -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: @@ -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: diff --git a/deploy/.goreleaser.snapshot.yml b/deploy/.goreleaser.snapshot.yml index 2984d7866..4b05156a5 100644 --- a/deploy/.goreleaser.snapshot.yml +++ b/deploy/.goreleaser.snapshot.yml @@ -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: @@ -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: diff --git a/deploy/Dockerfile.troubleshoot b/deploy/Dockerfile.troubleshoot index 0d50b1ace..797eb43da 100644 --- a/deploy/Dockerfile.troubleshoot +++ b/deploy/Dockerfile.troubleshoot @@ -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 diff --git a/deploy/krew/troubleshoot.yaml b/deploy/krew/troubleshoot.yaml index b705be524..cf1260c0a 100644 --- a/deploy/krew/troubleshoot.yaml +++ b/deploy/krew/troubleshoot.yaml @@ -1,7 +1,7 @@ apiVersion: krew.googlecontainertools.github.com/v1alpha2 kind: Plugin metadata: - name: troubleshoot + name: support-bundle spec: version: "v0.9.2" platforms: @@ -9,12 +9,12 @@ spec: 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 @@ -22,9 +22,9 @@ spec: 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 @@ -32,23 +32,23 @@ spec: 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 + $ kubectl support-bundle where 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: