From c74bf4e01c940c4aebb2198d2a72ad9991537c20 Mon Sep 17 00:00:00 2001 From: Zhen Wang Date: Sat, 9 Mar 2024 14:44:59 +0000 Subject: [PATCH] Remove push-tar The release process and `make push` pushes the tar files to `gs://kubernetes-release` historically. No one has write permission to the GCS bucket anymore. We haven't pushed NPD tar files to that GCS bucket after v0.8.10. k/k has been using NPD v0.8.13+ since 1.29. This PR cleans up the Make file. NPD release should just include the tar files in the release note. Related issues: - https://github.com/kubernetes/node-problem-detector/issues/874 - https://github.com/kubernetes/node-problem-detector/issues/878 --- Makefile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index c02b85b4..6c943eb7 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-tar push clean depup + docker-builder build-in-docker push-container push clean depup all: build @@ -35,11 +35,6 @@ 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 @@ -264,11 +259,7 @@ 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-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 +push: push-container build-tar coverage.out: rm -f coverage.out