mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-01-05 04:55:22 +00:00
Revert "Rename secret for Google cloud storage"
This reverts commit 4ab2712f6b.
This commit is contained in:
2
.github/workflows/e2e-test-kind.yaml
vendored
2
.github/workflows/e2e-test-kind.yaml
vendored
@@ -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
|
||||
|
||||
3
Makefile
3
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
|
||||
|
||||
Reference in New Issue
Block a user