From 1465af2c095d26b859c65d5daa98c5765cde6672 Mon Sep 17 00:00:00 2001 From: Marc Campbell Date: Wed, 18 Dec 2019 17:59:43 +0000 Subject: [PATCH 1/2] Fix build --- deploy/.goreleaser.local.yml | 32 -------------------------------- deploy/.goreleaser.snapshot.yml | 32 -------------------------------- deploy/.goreleaser.yml | 32 -------------------------------- 3 files changed, 96 deletions(-) diff --git a/deploy/.goreleaser.local.yml b/deploy/.goreleaser.local.yml index b2297829..444448c7 100644 --- a/deploy/.goreleaser.local.yml +++ b/deploy/.goreleaser.local.yml @@ -4,22 +4,6 @@ release: owner: replicatedhq name: troubleshoot builds: - - id: collector - goos: - - linux - goarch: - - amd64 - env: - - CGO_ENABLED=0 - main: cmd/collector/main.go - ldflags: -s -w - -X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}} - -X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}} - -X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}} - -extldflags "-static" - flags: -tags netgo -installsuffix netgo - binary: collector - hooks: {} - id: preflight goos: - linux @@ -52,22 +36,6 @@ builds: flags: -tags netgo -installsuffix netgo binary: support-bundle hooks: {} - - id: manager - goos: - - linux - goarch: - - amd64 - env: - - CGO_ENABLED=0 - main: cmd/manager/main.go - ldflags: -s -w - -X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}} - -X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}} - -X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}} - -extldflags "-static" - flags: -tags netgo -installsuffix netgo - binary: manager - hooks: {} archives: - id: tar format: tar.gz diff --git a/deploy/.goreleaser.snapshot.yml b/deploy/.goreleaser.snapshot.yml index 33a5cbc0..1e5e640f 100644 --- a/deploy/.goreleaser.snapshot.yml +++ b/deploy/.goreleaser.snapshot.yml @@ -16,22 +16,6 @@ builds: flags: -buildmode=c-shared binary: troubleshoot.so hooks: {} - - id: collector - goos: - - linux - goarch: - - amd64 - env: - - CGO_ENABLED=0 - main: cmd/collector/main.go - ldflags: -s -w - -X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}} - -X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}} - -X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}} - -extldflags "-static" - flags: -tags netgo -installsuffix netgo - binary: collector - hooks: {} - id: preflight goos: - linux @@ -68,22 +52,6 @@ builds: flags: -tags netgo -installsuffix netgo binary: support-bundle hooks: {} - - id: manager - goos: - - linux - goarch: - - amd64 - env: - - CGO_ENABLED=0 - main: cmd/manager/main.go - ldflags: -s -w - -X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}} - -X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}} - -X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}} - -extldflags "-static" - flags: -tags netgo -installsuffix netgo - binary: manager - hooks: {} archives: - id: so builds: diff --git a/deploy/.goreleaser.yml b/deploy/.goreleaser.yml index 5199292c..d10eec74 100644 --- a/deploy/.goreleaser.yml +++ b/deploy/.goreleaser.yml @@ -16,22 +16,6 @@ builds: flags: -buildmode=c-shared binary: troubleshoot.so hooks: {} - - id: collector - goos: - - linux - goarch: - - amd64 - env: - - CGO_ENABLED=0 - main: cmd/collector/main.go - ldflags: -s -w - -X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}} - -X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}} - -X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}} - -extldflags "-static" - flags: -tags netgo -installsuffix netgo - binary: collector - hooks: {} - id: preflight goos: - linux @@ -68,22 +52,6 @@ builds: flags: -tags netgo -installsuffix netgo binary: support-bundle hooks: {} - - id: manager - goos: - - linux - goarch: - - amd64 - env: - - CGO_ENABLED=0 - main: cmd/manager/main.go - ldflags: -s -w - -X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}} - -X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}} - -X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}} - -extldflags "-static" - flags: -tags netgo -installsuffix netgo - binary: manager - hooks: {} archives: - id: so builds: From 59a22812901fb849a745d0fd1d397cf14d9615e9 Mon Sep 17 00:00:00 2001 From: Marc Campbell Date: Wed, 18 Dec 2019 18:01:39 +0000 Subject: [PATCH 2/2] More cleanup --- deploy/.goreleaser.local.yml | 7 ------- deploy/.goreleaser.snapshot.yml | 7 ------- deploy/.goreleaser.yml | 10 ---------- deploy/Dockerfile.manager | 4 ---- 4 files changed, 28 deletions(-) delete mode 100644 deploy/Dockerfile.manager diff --git a/deploy/.goreleaser.local.yml b/deploy/.goreleaser.local.yml index 444448c7..db2e7262 100644 --- a/deploy/.goreleaser.local.yml +++ b/deploy/.goreleaser.local.yml @@ -54,20 +54,13 @@ dockers: image_templates: - "replicated/troubleshoot:alpha" binaries: - - collector - support-bundle - preflight - dockerfile: ./deploy/Dockerfile.troubleshoot image_templates: - "replicated/preflight:alpha" binaries: - - collector - support-bundle - preflight - - dockerfile: ./deploy/Dockerfile.manager - image_templates: - - "replicated/troubleshoot-manager:alpha" - binaries: - - manager snapshot: name_template: SNAPSHOT-{{ .Commit }} diff --git a/deploy/.goreleaser.snapshot.yml b/deploy/.goreleaser.snapshot.yml index 1e5e640f..551dcdb0 100644 --- a/deploy/.goreleaser.snapshot.yml +++ b/deploy/.goreleaser.snapshot.yml @@ -74,20 +74,13 @@ dockers: image_templates: - "replicated/troubleshoot:alpha" binaries: - - collector - support-bundle - preflight - dockerfile: ./deploy/Dockerfile.troubleshoot image_templates: - "replicated/preflight:alpha" binaries: - - collector - support-bundle - preflight - - dockerfile: ./deploy/Dockerfile.manager - image_templates: - - "replicated/troubleshoot-manager:alpha" - binaries: - - manager snapshot: name_template: SNAPSHOT-{{ .Commit }} diff --git a/deploy/.goreleaser.yml b/deploy/.goreleaser.yml index d10eec74..e6e5f720 100644 --- a/deploy/.goreleaser.yml +++ b/deploy/.goreleaser.yml @@ -100,7 +100,6 @@ dockers: - "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}" - "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}.{{ .Patch }}" binaries: - - collector - support-bundle - preflight - dockerfile: ./deploy/Dockerfile.troubleshoot @@ -110,14 +109,5 @@ dockers: - "replicated/preflight:{{ .Major }}.{{ .Minor }}" - "replicated/preflight:{{ .Major }}.{{ .Minor }}.{{ .Patch }}" binaries: - - collector - support-bundle - preflight - - dockerfile: ./deploy/Dockerfile.manager - image_templates: - - "replicated/troubleshoot-manager:latest" - - "replicated/troubleshoot-manager:{{ .Major }}" - - "replicated/troubleshoot-manager:{{ .Major }}.{{ .Minor }}" - - "replicated/troubleshoot-manager:{{ .Major }}.{{ .Minor }}.{{ .Patch }}" - binaries: - - manager diff --git a/deploy/Dockerfile.manager b/deploy/Dockerfile.manager deleted file mode 100644 index bdcce9d9..00000000 --- a/deploy/Dockerfile.manager +++ /dev/null @@ -1,4 +0,0 @@ -FROM ubuntu:latest -WORKDIR / -COPY manager /manager -ENTRYPOINT ["/manager"]