Skip to content

Commit 4866ce6

Browse files
authored
Use correct v2 module path in Go ldflags (#1542)
1 parent 7446208 commit 4866ce6

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

Makefile

+4-9
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ GOBIN=$(shell go env GOBIN)
2828
endif
2929

3030
GO_BUILD_VARS= GO111MODULE=on CGO_ENABLED=$(CGO) GOOS=$(TARGET_OS) GOARCH=$(ARCH)
31+
GO_LDFLAGS="-X=github.com/kedacore/keda/v2/version.GitCommit=$(GIT_COMMIT) -X=github.com/kedacore/keda/v2/version.Version=$(VERSION)"
3132

3233
##################################################
3334
# All #
@@ -93,9 +94,7 @@ set-version:
9394
# Run against the configured Kubernetes cluster in ~/.kube/config
9495
.PHONY: run
9596
run: generate
96-
go run \
97-
-ldflags "-X=github.com/kedacore/keda/version.GitCommit=$(GIT_COMMIT) -X=github.com/kedacore/keda/version.Version=$(VERSION)" \
98-
./main.go $(ARGS)
97+
go run -ldflags $(GO_LDFLAGS) ./main.go $(ARGS)
9998

10099
# Install CRDs into a cluster
101100
.PHONY: install
@@ -144,9 +143,7 @@ manager: manager-dockerfile gofmt govet
144143
# time we build the image
145144
.PHONY: manager-dockerfile
146145
manager-dockerfile: generate
147-
${GO_BUILD_VARS} go build \
148-
-ldflags "-X=github.com/kedacore/keda/version.GitCommit=$(GIT_COMMIT) -X=github.com/kedacore/keda/version.Version=$(VERSION)" \
149-
-o bin/keda main.go
146+
${GO_BUILD_VARS} go build -ldflags $(GO_LDFLAGS) -o bin/keda main.go
150147

151148
# Build KEDA Metrics Server Adapter binary
152149
.PHONY: adapter
@@ -158,9 +155,7 @@ adapter: adapter-dockerfile gofmt govet
158155
# time we build the image
159156
.PHONY: adapter-dockerfile
160157
adapter-dockerfile: generate adapter/generated/openapi/zz_generated.openapi.go
161-
${GO_BUILD_VARS} go build \
162-
-ldflags "-X=github.com/kedacore/keda/version.GitCommit=$(GIT_COMMIT) -X=github.com/kedacore/keda/version.Version=$(VERSION)" \
163-
-o bin/keda-adapter adapter/main.go
158+
${GO_BUILD_VARS} go build -ldflags $(GO_LDFLAGS) -o bin/keda-adapter adapter/main.go
164159

165160
# Generate manifests e.g. CRD, RBAC etc.
166161
.PHONY: manifests

0 commit comments

Comments
 (0)