diff --git a/Makefile b/Makefile index 94917ef6d..1e9a08a89 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ VERSION:=$(shell git describe --tags --dirty) TAG?=$(VERSION) # PROJ is the image project. -PROJ?=gcr.io/google_containers +PROJ?=k8s.gcr.io # UPLOAD_PATH is the cloud storage path to upload release tar. UPLOAD_PATH?=gs://kubernetes-release diff --git a/README.md b/README.md index 5da3d12ac..36aca5a9e 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 -`gcr.io/google_containers`. It's easy to modify the `Makefile` to push the image +`k8s.gcr.io`. It's easy to modify the `Makefile` to push the image to another registry. ## Start DaemonSet @@ -102,7 +102,7 @@ spec: spec: containers: - name: node-problem-detector - image: gcr.io/google_containers/node-problem-detector:v0.2 + image: k8s.gcr.io/node-problem-detector:v0.2 imagePullPolicy: Always securityContext: privileged: true diff --git a/node-problem-detector.yaml b/node-problem-detector.yaml index 5f6d02f95..8b10d22c9 100644 --- a/node-problem-detector.yaml +++ b/node-problem-detector.yaml @@ -14,7 +14,7 @@ spec: - /node-problem-detector - --logtostderr - --kernel-monitor=/config/kernel-monitor.json - image: gcr.io/google_containers/node-problem-detector:v0.2 + image: k8s.gcr.io/node-problem-detector:v0.2 imagePullPolicy: Always securityContext: privileged: true diff --git a/pkg/util/nethealth/Makefile b/pkg/util/nethealth/Makefile index cd89a7eaf..c72a5b219 100644 --- a/pkg/util/nethealth/Makefile +++ b/pkg/util/nethealth/Makefile @@ -12,16 +12,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Makefile for the Docker image gcr.io/google_containers/kube-nethealth- +# Makefile for the Docker image k8s.gcr.io/kube-nethealth- # MAINTAINER: Girish kalele # If you update this image please bump the tag value before pushing. # # Usage: -# [TAG=1.0] [REGISTRY=gcr.io/google_containers] make push +# [TAG=1.0] [REGISTRY=k8s.gcr.io] make push # Default registry, arch and tag. This can be overwritten by arguments to make TAG?=1.0 -REGISTRY?=gcr.io/google_containers +REGISTRY?=k8s.gcr.io ARCH?=amd64 all: build @@ -33,7 +33,7 @@ build: nethealth docker build -t $(REGISTRY)/kube-nethealth-$(ARCH):$(TAG) . push: build -ifeq ($(REGISTRY),gcr.io/google_containers) +ifeq ($(REGISTRY),k8s.gcr.io) gcloud docker push $(REGISTRY)/kube-nethealth-$(ARCH):$(TAG) else docker push $(REGISTRY)/kube-nethealth-$(ARCH):$(TAG) diff --git a/test/kernel_log_generator/Makefile b/test/kernel_log_generator/Makefile index 5482e521b..5704b7ac9 100644 --- a/test/kernel_log_generator/Makefile +++ b/test/kernel_log_generator/Makefile @@ -16,7 +16,7 @@ .PHONY: all build push -PROJ ?= gcr.io/google_containers +PROJ ?= k8s.gcr.io TAG := 0.1 all: push