Skip to content

Commit 58211f1

Browse files
authored
Merge pull request #882 from kubernetes/revert-880-update-make-push
Revert "Remove push-tar"
2 parents 1667bae + b193e6e commit 58211f1

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

Makefile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
.PHONY: all \
1818
vet fmt version test e2e-test \
1919
build-binaries build-container build-tar build \
20-
docker-builder build-in-docker push-container push clean depup
20+
docker-builder build-in-docker push-container push-tar push clean depup
2121

2222
all: build
2323

@@ -35,6 +35,11 @@ TAG?=$(VERSION)
3535
# REGISTRY is the container registry to push into.
3636
REGISTRY?=gcr.io/k8s-staging-npd
3737

38+
# UPLOAD_PATH is the cloud storage path to upload release tar.
39+
UPLOAD_PATH?=gs://kubernetes-release
40+
# Trim the trailing '/' in the path
41+
UPLOAD_PATH:=$(shell echo $(UPLOAD_PATH) | sed '$$s/\/*$$//')
42+
3843
# PKG is the package name of node problem detector repo.
3944
PKG:=k8s.io/node-problem-detector
4045

@@ -259,7 +264,11 @@ endif
259264
# Build should be cached from build-container
260265
docker buildx build --push --platform $(DOCKER_PLATFORMS) -t $(IMAGE) --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg LOGCOUNTER=$(LOGCOUNTER) .
261266

262-
push: push-container build-tar
267+
push-tar: build-tar
268+
gsutil cp $(TARBALL) $(UPLOAD_PATH)/node-problem-detector/
269+
gsutil cp node-problem-detector-$(VERSION)-*.tar.gz* $(UPLOAD_PATH)/node-problem-detector/
270+
271+
push: push-container push-tar
263272

264273
coverage.out:
265274
rm -f coverage.out

0 commit comments

Comments
 (0)