Skip to content

Commit

Permalink
Merge pull request #882 from kubernetes/revert-880-update-make-push
Browse files Browse the repository at this point in the history
Revert "Remove push-tar"
  • Loading branch information
k8s-ci-robot committed Mar 11, 2024
2 parents 1667bae + b193e6e commit 58211f1
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 58211f1

Please sign in to comment.