diff --git a/Makefile b/Makefile index 2d774b0e3..aaced07c6 100644 --- a/Makefile +++ b/Makefile @@ -15,9 +15,9 @@ .PHONY: test # VERSION is currently based on the last commit -VERSION?=`git describe --tags` -COMMIT=`git rev-parse HEAD` -BUILD=`date +%FT%T%z` +VERSION?=$(shell git describe --tags) +COMMIT=$(shell git rev-parse HEAD) +BUILD=$(shell date +%FT%T%z) LDFLAG_LOCATION=sigs.k8s.io/descheduler/cmd/descheduler/app LDFLAGS=-ldflags "-X ${LDFLAG_LOCATION}.version=${VERSION} -X ${LDFLAG_LOCATION}.buildDate=${BUILD} -X ${LDFLAG_LOCATION}.gitCommit=${COMMIT}" @@ -25,8 +25,10 @@ LDFLAGS=-ldflags "-X ${LDFLAG_LOCATION}.version=${VERSION} -X ${LDFLAG_LOCATION} GOLANGCI_VERSION := v1.15.0 HAS_GOLANGCI := $(shell which golangci-lint) -# REGISTRY is the container registry to push into. -REGISTRY?=staging-k8s.gcr.io +# REGISTRY is the container registry to push +# into. The default is to push to the staging +# registry, not production. +REGISTRY?=gcr.io/k8s-staging-descheduler # IMAGE is the image name of descheduler IMAGE:=descheduler:$(VERSION) @@ -34,6 +36,11 @@ IMAGE:=descheduler:$(VERSION) # IMAGE_GCLOUD is the image name of descheduler in the remote registry IMAGE_GCLOUD:=$(REGISTRY)/descheduler:$(VERSION) +# TODO: upload binaries to GCS bucket +# +# In the future binaries can be uploaded to +# GCS bucket gs://k8s-staging-descheduler. + all: build build: