From b193e6e392bd88ba2047cb68449f9eb6d3b0a2a7 Mon Sep 17 00:00:00 2001 From: Zhen Wang Date: Sun, 10 Mar 2024 11:50:58 -0700 Subject: [PATCH] Revert "Remove push-tar" --- Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6c943eb75..c02b85b4e 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ .PHONY: all \ vet fmt version test e2e-test \ build-binaries build-container build-tar build \ - docker-builder build-in-docker push-container push clean depup + docker-builder build-in-docker push-container push-tar push clean depup all: build @@ -35,6 +35,11 @@ TAG?=$(VERSION) # REGISTRY is the container registry to push into. REGISTRY?=gcr.io/k8s-staging-npd +# UPLOAD_PATH is the cloud storage path to upload release tar. +UPLOAD_PATH?=gs://kubernetes-release +# Trim the trailing '/' in the path +UPLOAD_PATH:=$(shell echo $(UPLOAD_PATH) | sed '$$s/\/*$$//') + # PKG is the package name of node problem detector repo. PKG:=k8s.io/node-problem-detector @@ -259,7 +264,11 @@ endif # Build should be cached from build-container docker buildx build --push --platform $(DOCKER_PLATFORMS) -t $(IMAGE) --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg LOGCOUNTER=$(LOGCOUNTER) . -push: push-container build-tar +push-tar: build-tar + gsutil cp $(TARBALL) $(UPLOAD_PATH)/node-problem-detector/ + gsutil cp node-problem-detector-$(VERSION)-*.tar.gz* $(UPLOAD_PATH)/node-problem-detector/ + +push: push-container push-tar coverage.out: rm -f coverage.out