From de7231cf8636ec527b01befa644bdb6a346b919b Mon Sep 17 00:00:00 2001 From: Lyndon-Li Date: Tue, 19 Nov 2024 16:58:19 +0800 Subject: [PATCH 1/3] Revert "Save vvelero image tarball only for velero namespace in docker registry (#5581)" This reverts commit 1ea1d4df67361a7857e5c3027e1bcc4701dce53d. --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 98fd436eb4..f746722998 100644 --- a/Makefile +++ b/Makefile @@ -213,11 +213,10 @@ endif --build-arg=RESTIC_VERSION=$(RESTIC_VERSION) \ -f $(VELERO_DOCKERFILE) . @echo "container: $(IMAGE):$(VERSION)" -ifeq ($(BUILDX_OUTPUT_TYPE)_$(REGISTRY), registry_velero) - docker pull $(IMAGE):$(VERSION) - rm -f $(BIN)-$(VERSION).tar - docker save $(IMAGE):$(VERSION) -o $(BIN)-$(VERSION).tar - gzip -f $(BIN)-$(VERSION).tar +ifeq ($(BUILDX_OUTPUT_TYPE), "registry") + @docker pull $(IMAGE):$(VERSION) + @docker save $(IMAGE):$(VERSION) -o $(BIN)-$(VERSION).tar + @gzip $(BIN)-$(VERSION).tar endif SKIP_TESTS ?= From 7cc0c99a08acb3f2697d788f495763c820dc7e1a Mon Sep 17 00:00:00 2001 From: Lyndon-Li Date: Tue, 19 Nov 2024 19:05:02 +0800 Subject: [PATCH 2/3] Revert "Rename secret for Google cloud storage" This reverts commit 4ab2712f6b017faf94dcc11d66cf35fc5eb01fff. --- .github/workflows/e2e-test-kind.yaml | 2 +- Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-test-kind.yaml b/.github/workflows/e2e-test-kind.yaml index 6df789f894..a3d92d8e18 100644 --- a/.github/workflows/e2e-test-kind.yaml +++ b/.github/workflows/e2e-test-kind.yaml @@ -42,7 +42,7 @@ jobs: - name: Build Velero Image if: steps.image-cache.outputs.cache-hit != 'true' run: | - IMAGE=velero VERSION=pr-test make container + SAVE_IMAGE=false IMAGE=velero VERSION=pr-test make container docker save velero:pr-test -o ./velero.tar # Create json of k8s versions to test # from guide: https://stackoverflow.com/a/65094398/4590470 diff --git a/Makefile b/Makefile index f746722998..6b423dba86 100644 --- a/Makefile +++ b/Makefile @@ -66,6 +66,7 @@ VERSION ?= main TAG_LATEST ?= false +SAVE_IMAGE ?= true ifeq ($(TAG_LATEST), true) IMAGE_TAGS ?= $(IMAGE):$(VERSION) $(IMAGE):latest GCR_IMAGE_TAGS ?= $(GCR_IMAGE):$(VERSION) $(GCR_IMAGE):latest @@ -213,7 +214,7 @@ endif --build-arg=RESTIC_VERSION=$(RESTIC_VERSION) \ -f $(VELERO_DOCKERFILE) . @echo "container: $(IMAGE):$(VERSION)" -ifeq ($(BUILDX_OUTPUT_TYPE), "registry") +ifeq ($(SAVE_IMAGE), true) @docker pull $(IMAGE):$(VERSION) @docker save $(IMAGE):$(VERSION) -o $(BIN)-$(VERSION).tar @gzip $(BIN)-$(VERSION).tar From cc47be933d371bcb3f51e1e56076c11eeff1012d Mon Sep 17 00:00:00 2001 From: Lyndon-Li Date: Tue, 19 Nov 2024 19:15:41 +0800 Subject: [PATCH 3/3] Revert "Upload Velero build package saved from build image to Google cloud storage" This reverts commit 0b6df61ecaf86e5b03ba914db88db25d72ebe771. --- .github/workflows/e2e-test-kind.yaml | 2 +- .github/workflows/push.yml | 22 +--------------------- Makefile | 6 ------ hack/ci/build_util.sh | 9 --------- 4 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 hack/ci/build_util.sh diff --git a/.github/workflows/e2e-test-kind.yaml b/.github/workflows/e2e-test-kind.yaml index a3d92d8e18..6df789f894 100644 --- a/.github/workflows/e2e-test-kind.yaml +++ b/.github/workflows/e2e-test-kind.yaml @@ -42,7 +42,7 @@ jobs: - name: Build Velero Image if: steps.image-cache.outputs.cache-hit != 'true' run: | - SAVE_IMAGE=false IMAGE=velero VERSION=pr-test make container + IMAGE=velero VERSION=pr-test make container docker save velero:pr-test -o ./velero.tar # Create json of k8s versions to test # from guide: https://stackoverflow.com/a/65094398/4590470 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a4d2371734..7ca58cc3ec 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -68,24 +68,4 @@ jobs: # Build and push Velero image to docker registry docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }} - VERSION=$(./hack/docker-push.sh | grep 'VERSION:' | awk -F: '{print $2}' | xargs) - - # Upload Velero image package to GCS - source hack/ci/build_util.sh - BIN=velero - RESTORE_HELPER_BIN=velero-restore-helper - GCS_BUCKET=velero-builds - VELERO_IMAGE=${BIN}-${VERSION} - VELERO_RESTORE_HELPER_IMAGE=${RESTORE_HELPER_BIN}-${VERSION} - VELERO_IMAGE_FILE=${VELERO_IMAGE}.tar.gz - VELERO_RESTORE_HELPER_IMAGE_FILE=${VELERO_RESTORE_HELPER_IMAGE}.tar.gz - VELERO_IMAGE_BACKUP_FILE=${VELERO_IMAGE}-'build.'${GITHUB_RUN_NUMBER}.tar.gz - VELERO_RESTORE_HELPER_IMAGE_BACKUP_FILE=${VELERO_RESTORE_HELPER_IMAGE}-'build.'${GITHUB_RUN_NUMBER}.tar.gz - - cp ${VELERO_IMAGE_FILE} ${VELERO_IMAGE_BACKUP_FILE} - cp ${VELERO_RESTORE_HELPER_IMAGE_FILE} ${VELERO_RESTORE_HELPER_IMAGE_BACKUP_FILE} - - uploader ${VELERO_IMAGE_FILE} ${GCS_BUCKET} - uploader ${VELERO_RESTORE_HELPER_IMAGE_FILE} ${GCS_BUCKET} - uploader ${VELERO_IMAGE_BACKUP_FILE} ${GCS_BUCKET} - uploader ${VELERO_RESTORE_HELPER_IMAGE_BACKUP_FILE} ${GCS_BUCKET} + ./hack/docker-push.sh diff --git a/Makefile b/Makefile index 6b423dba86..1f743a09e4 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,6 @@ VERSION ?= main TAG_LATEST ?= false -SAVE_IMAGE ?= true ifeq ($(TAG_LATEST), true) IMAGE_TAGS ?= $(IMAGE):$(VERSION) $(IMAGE):latest GCR_IMAGE_TAGS ?= $(GCR_IMAGE):$(VERSION) $(GCR_IMAGE):latest @@ -214,11 +213,6 @@ endif --build-arg=RESTIC_VERSION=$(RESTIC_VERSION) \ -f $(VELERO_DOCKERFILE) . @echo "container: $(IMAGE):$(VERSION)" -ifeq ($(SAVE_IMAGE), true) - @docker pull $(IMAGE):$(VERSION) - @docker save $(IMAGE):$(VERSION) -o $(BIN)-$(VERSION).tar - @gzip $(BIN)-$(VERSION).tar -endif SKIP_TESTS ?= test: build-dirs diff --git a/hack/ci/build_util.sh b/hack/ci/build_util.sh deleted file mode 100644 index 599c84b638..0000000000 --- a/hack/ci/build_util.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -set -x - -set -e - -function uploader { - gsutil cp $1 gs://$2/$1 - gsutil -D setacl public-read gs://$2/$1 &> /dev/null -}