diff --git a/Makefile b/Makefile index 1e9a08a8..5e6985a5 100644 --- a/Makefile +++ b/Makefile @@ -24,8 +24,8 @@ VERSION:=$(shell git describe --tags --dirty) # TAG is the tag of the container image, default to binary version. TAG?=$(VERSION) -# PROJ is the image project. -PROJ?=k8s.gcr.io +# REGISTRY is the container registry to push into. +REGISTRY?=staging-k8s.gcr.io # UPLOAD_PATH is the cloud storage path to upload release tar. UPLOAD_PATH?=gs://kubernetes-release @@ -42,7 +42,7 @@ PKG_SOURCES:=$(shell find pkg cmd -name '*.go') TARBALL:=node-problem-detector-$(VERSION).tar.gz # IMAGE is the image name of the node problem detector container image. -IMAGE:=$(PROJ)/node-problem-detector:$(TAG) +IMAGE:=$(REGISTRY)/node-problem-detector:$(TAG) # ENABLE_JOURNALD enables build journald support or not. Building journald support needs libsystemd-dev # or libsystemd-journal-dev. diff --git a/README.md b/README.md index 36aca5a9..8049e004 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ Run `make` in the top directory. It will: ## Push Image `make push` uploads the docker image to registry. By default, the image will be uploaded to -`k8s.gcr.io`. It's easy to modify the `Makefile` to push the image +`staging-k8s.gcr.io`. It's easy to modify the `Makefile` to push the image to another registry. ## Start DaemonSet diff --git a/pkg/util/nethealth/Makefile b/pkg/util/nethealth/Makefile index c72a5b21..d62192e9 100644 --- a/pkg/util/nethealth/Makefile +++ b/pkg/util/nethealth/Makefile @@ -17,11 +17,11 @@ # If you update this image please bump the tag value before pushing. # # Usage: -# [TAG=1.0] [REGISTRY=k8s.gcr.io] make push +# [TAG=1.0] [REGISTRY=staging-k8s.gcr.io] make push # Default registry, arch and tag. This can be overwritten by arguments to make TAG?=1.0 -REGISTRY?=k8s.gcr.io +REGISTRY?=staging-k8s.gcr.io ARCH?=amd64 all: build @@ -33,8 +33,8 @@ build: nethealth docker build -t $(REGISTRY)/kube-nethealth-$(ARCH):$(TAG) . push: build -ifeq ($(REGISTRY),k8s.gcr.io) - gcloud docker push $(REGISTRY)/kube-nethealth-$(ARCH):$(TAG) +ifeq ($(REGISTRY),staging-k8s.gcr.io) + gcloud docker -- push $(REGISTRY)/kube-nethealth-$(ARCH):$(TAG) else docker push $(REGISTRY)/kube-nethealth-$(ARCH):$(TAG) endif diff --git a/test/kernel_log_generator/Makefile b/test/kernel_log_generator/Makefile index 5704b7ac..a20d3065 100644 --- a/test/kernel_log_generator/Makefile +++ b/test/kernel_log_generator/Makefile @@ -16,7 +16,7 @@ .PHONY: all build push -PROJ ?= k8s.gcr.io +PROJ ?= staging-k8s.gcr.io TAG := 0.1 all: push