From 462bbbbb47062b645e8c0d35d94db3e11365b6a0 Mon Sep 17 00:00:00 2001
From: Sean Malloy <sean.malloy@kohls.com>
Date: Thu, 25 Jul 2019 01:34:48 -0500
Subject: [PATCH 1/2] Use correct GCR staging registry

The container registry now defaults to
the correct staging registry.
---
 Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2d774b0e3..70ef9e0fd 100644
--- a/Makefile
+++ b/Makefile
@@ -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:

From 361aa01c5196c947cb7d73c80fe7c53c3c612b1e Mon Sep 17 00:00:00 2001
From: Sean Malloy <sean.malloy@kohls.com>
Date: Fri, 24 Jan 2020 08:59:43 -0600
Subject: [PATCH 2/2] Remove backticks from Makefile

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 70ef9e0fd..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}"