diff --git a/.goreleaser.yml b/.goreleaser.yml index 3ba33ed4207..e03cb52d636 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -14,7 +14,6 @@ release: before: hooks: - make clean - - go mod tidy -compat=1.21.8 - go mod download builds: diff --git a/pkg/build-constants.go b/pkg/build-constants.go index 06dfbf4665d..65ab34306e6 100644 --- a/pkg/build-constants.go +++ b/pkg/build-constants.go @@ -27,6 +27,4 @@ var ( CommitID = "(dev)" // ShortCommitID - first 12 characters from CommitID. ShortCommitID = "(dev)" - // MPSecret - MP Secret - MPSecret = "(dev)" ) diff --git a/sidecar/.goreleaser.yml b/sidecar/.goreleaser.yml index f0210d9ca82..73f4d756c3e 100644 --- a/sidecar/.goreleaser.yml +++ b/sidecar/.goreleaser.yml @@ -14,8 +14,6 @@ release: before: hooks: - make clean - - go mod tidy -compat=1.21.8 - - go mod download builds: - id: minio-operator-sidecar @@ -31,7 +29,7 @@ builds: binary: minio-operator-sidecar main: ./cmd/sidecar/ ldflags: - - -s -w -X github.com/minio/operator/pkg.ReleaseTag={{.Tag}} -X github.com/minio/operator/pkg.CommitID={{.FullCommit}} -X github.com/minio/operator/sidecar/pkg.Version={{.Version}} -X github.com/minio/operator/sidecar/pkg.ShortCommitID={{.ShortCommit}} -X github.com/minio/operator/pkg.ReleaseTime={{.Date}} + - -s -w -X github.com/minio/operator/sidecar/pkg.ReleaseTag={{.Tag}} -X github.com/minio/operator/sidecar/pkg.CommitID={{.FullCommit}} -X github.com/minio/operator/sidecar/pkg.Version={{.Version}} -X github.com/minio/operator/sidecar/pkg.ShortCommitID={{.ShortCommit}} -X github.com/minio/operator/sidecar/pkg.ReleaseTime={{.Date}} flags: - -trimpath diff --git a/sidecar/Makefile b/sidecar/Makefile index 91c10556316..f75cdaa0535 100644 --- a/sidecar/Makefile +++ b/sidecar/Makefile @@ -7,7 +7,7 @@ VERSIONV ?= $(shell git describe --tags | sed 's,v,,g') endif TAG ?= "minio/operator-sidecar:$(VERSION)" SHA ?= $(shell git rev-parse --short HEAD) -LDFLAGS ?= "-s -w -X github.com/minio/operator/pkg.ReleaseTag=$(VERSIONV) -X github.com/minio/operator/sidecar/pkg.Version=$(VERSION) -X github.com/minio/operator/sidecar/pkg.ShortCommitID=$(SHA)" +LDFLAGS ?= "-s -w -X github.com/minio/operator/sidecar/pkg.ReleaseTag=$(VERSIONV) -X github.com/minio/operator/sidecar/pkg.Version=$(VERSION) -X github.com/minio/operator/sidecar/pkg.ShortCommitID=$(SHA)" GOPATH := $(shell go env GOPATH) GOARCH := $(shell go env GOARCH) GOOS := $(shell go env GOOS) diff --git a/sidecar/pkg/build-constants.go b/sidecar/pkg/build-constants.go index 1c01ddba425..aa984d55fac 100644 --- a/sidecar/pkg/build-constants.go +++ b/sidecar/pkg/build-constants.go @@ -27,6 +27,4 @@ var ( CommitID = "(dev)" // ShortCommitID - first 12 characters from CommitID. ShortCommitID = "(dev)" - // MPSecret - MP Secret - MPSecret = "(dev)" )