github/node-problem-detector
1
0
Fork 0
mirror of https://github.com/kubernetes/node-problem-detector.git synced 2026-03-05 03:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #156 from thockin-tmp/gcr-vanity

Browse Source 
Pushes go to staging-k8s.gcr.io
This commit is contained in:
Tim Hockin
2018-02-08 14:38:46 -08:00
committed by GitHub
parent cf3519a3e9 3468934b7d
commit c430627afa
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -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.

2
README.md
View File

@@ -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

8
pkg/util/nethealth/Makefile
View File

@@ -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

2
test/kernel_log_generator/Makefile
View File

@@ -16,7 +16,7 @@
.PHONY: all build push
PROJ ?= k8s.gcr.io
PROJ ?= staging-k8s.gcr.io
TAG := 0.1
all: push