refactor pvbr doc

Signed-off-by: Lyndon-Li <lyonghui@vmware.com> Add credential file store in the backup deletion controller. Signed-off-by: Xun Jiang <blackpiglet@gmail.com> fix backup failure with self-signed certification Signed-off-by: Ming <mqiu@vmware.com> remove restic in docs (vmware-tanzu#5499) Signed-off-by: Lyndon-Li <lyonghui@vmware.com> repo config for s3 compatible store Signed-off-by: Lyndon-Li <lyonghui@vmware.com> issue fix 5505 Signed-off-by: Lyndon-Li <lyonghui@vmware.com> fix restic backup progress error Signed-off-by: Ming <mqiu@vmware.com> Fix GCP StorageClass used for E2E testing's YAML syntax error. (vmware-tanzu#5536) Signed-off-by: Xun Jiang <blackpiglet@gmail.com> Signed-off-by: Xun Jiang <blackpiglet@gmail.com> Co-authored-by: Xun Jiang <blackpiglet@gmail.com> Enhance the restore priorities list to support specifying the low prioritized resources that need to be restored in the last Enhance the restore priorities list to support specifying the low prioritized resources that need to be r estored in the last Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com> Update Community meetings times vmware-tanzu#5091 Signed-off-by: OrlinVasilev <ovasilev@vmware.com> Update Community meetings times vmware-tanzu#5091 Signed-off-by: OrlinVasilev <ovasilev@vmware.com> Update Community meetings times vmware-tanzu#5091 Signed-off-by: OrlinVasilev <ovasilev@vmware.com> Update Community meetings times vmware-tanzu#5091 Signed-off-by: OrlinVasilev <ovasilev@vmware.com> Update Community meetings times vmware-tanzu#5091 Signed-off-by: OrlinVasilev <ovasilev@vmware.com> Update Community meetings times vmware-tanzu#5091 Signed-off-by: OrlinVasilev <ovasilev@vmware.com> Update Community meetings times vmware-tanzu#5091 Signed-off-by: OrlinVasilev <ovasilev@vmware.com> Update Community meetings times vmware-tanzu#5091 Signed-off-by: OrlinVasilev <ovasilev@vmware.com> feat: dependabot workflow automation for updating dependency Signed-off-by: Pratik Raj <Rajpratik71@gmail.com> Fix pointer deference to string in error message Signed-off-by: Faizan Ahmad <faizan@obmondo.com> add VSL credentials documentation. Signed-off-by: Scott Seago <sseago@redhat.com> Add v1.10 velero upgrade doc Signed-off-by: Ming <mqiu@vmware.com> fix main TOC for 1.10 Signed-off-by: OrlinVasilev <ovasilev@vmware.com> add note for left over resources Signed-off-by: Ming <mqiu@vmware.com> Modify dependabot rules by only fix security issues Signed-off-by: Ming <mqiu@vmware.com> remove gofrs uuid Signed-off-by: Lyndon-Li <lyonghui@vmware.com> Upload Velero build package saved from build image to Google cloud storage Signed-off-by: danfengl <danfengl@vmware.com> Fix controller problematic log output Signed-off-by: Ming <mqiu@vmware.com> Add compile restic binary for CVE fix Signed-off-by: Ming <mqiu@vmware.com> Rename secret for Google cloud storage Signed-off-by: danfengl <danfengl@vmware.com> Fix restic cross platform compile Signed-off-by: Ming <mqiu@vmware.com> debug opt in out Signed-off-by: danfengl <danfengl@vmware.com> Update upgrade test for 1.10 Signed-off-by: danfengl <danfengl@vmware.com> Save vvelero image tarball only for velero namespace in docker registry (vmware-tanzu#5581) Signed-off-by: danfengl <danfengl@vmware.com> 1.10 changelog and doc (vmware-tanzu#5583) Signed-off-by: Lyndon-Li <lyonghui@vmware.com> update 1.10 readme Signed-off-by: Lyndon-Li <lyonghui@vmware.com> Add Velero behind proxy document. Signed-off-by: Xun Jiang <blackpiglet@gmail.com> Add Velero File System Backup Performance Guide Signed-off-by: Ming <mqiu@vmware.com> update 1.10 release notes Signed-off-by: Lyndon-Li <lyonghui@vmware.com> Update the Valero channel hash-name for Kubernetes Slack. Signed-off-by: Nikhil Maheshwari <nikhil.m2498@gmail.com> [Main Cherry-Pick]Enhance upgrade velero bash script Signed-off-by: Ming <mqiu@vmware.com> Add pause/unpause schedule e2e test (vmware-tanzu#5609) Signed-off-by: danfengl <danfengl@vmware.com> Restore ClusterBootstrap before Cluster Restore ClusterBootstrap before Cluster otherwise a new default ClusterBootstrap object is create for the cluster Signed-off-by: Wenkai Yin(尹文开) <yinw@vmware.com> remove versions from kind matrix Signed-off-by: Lyndon-Li <lyonghui@vmware.com> Bump goreleaser to v1.12.3 Signed-off-by: JenTing Hsiao <hsiaoairplane@gmail.com> Fix git action issue for setup-gcloud Signed-off-by: danfengl <danfengl@vmware.com> Add verification for CRD installation Signed-off-by: danfengl <danfengl@vmware.com> Update the api-types doc This commit makes update to the update api-types docs to add missing fields. It also includes misc changes to the inline comment, and a change to Dockerfile to make sure the build-image works on mac Signed-off-by: Daniel Jiang <jiangd@vmware.com> cut v1.10 docs on main Signed-off-by: Lyndon-Li <lyonghui@vmware.com> Add sleep before backing up new born CRD Signed-off-by: danfengl <danfengl@vmware.com> change image repository by configmap Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> correct changelog name Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> modified according review comments Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image replace rule to match all the cases Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> use single bit "," as the delimiter Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> removed section of juding DELIMITER_KEY Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> corrected code spell error Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> remove "Job" from the conditional Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image repository by configmap Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> correct changelog name Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> modified according review comments Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image replace rule to match all the cases Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> use single bit "," as the delimiter Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> removed section of juding DELIMITER_KEY Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> corrected code spell error Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> remove "Job" from the conditional Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> correct plugin name Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image repository by configmap Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> correct changelog name Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> modified according review comments Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image replace rule to match all the cases Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> use single bit "," as the delimiter Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> removed section of juding DELIMITER_KEY Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> corrected code spell error Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> remove "Job" from the conditional Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image repository by configmap Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> correct changelog name Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> modified according review comments Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image replace rule to match all the cases Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> use single bit "," as the delimiter Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> removed section of juding DELIMITER_KEY Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> corrected code spell error Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> remove "Job" from the conditional Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> correct plugin name Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> try to fix link check error Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> reversed the order of name and kind Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image repository by configmap Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> correct changelog name Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> modified according review comments Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image replace rule to match all the cases Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> use single bit "," as the delimiter Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> removed section of juding DELIMITER_KEY Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> corrected code spell error Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> remove "Job" from the conditional Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image repository by configmap Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> correct changelog name Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> modified according review comments Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image replace rule to match all the cases Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> use single bit "," as the delimiter Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> removed section of juding DELIMITER_KEY Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> corrected code spell error Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> remove "Job" from the conditional Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> correct plugin name Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image repository by configmap Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> correct changelog name Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> modified according review comments Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image replace rule to match all the cases Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> use single bit "," as the delimiter Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> removed section of juding DELIMITER_KEY Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> corrected code spell error Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> remove "Job" from the conditional Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image repository by configmap Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> correct changelog name Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> modified according review comments Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> change image replace rule to match all the cases Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> use single bit "," as the delimiter Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> removed section of juding DELIMITER_KEY Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> corrected code spell error Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> remove "Job" from the conditional Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> correct plugin name Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> try to fix link check error Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> Fix CVEs scanned by trivy Signed-off-by: Ming <mqiu@vmware.com> Fix links to compatibility matrix Signed-off-by: Lukas Hass <lukas@slucky.de> Update Velero and k8s version compatibility matrix. Due to CSIDriver is checked for Restic volume mounting path, and CSIDriver is GA and moved to storage v1 group in k8s v1.18, so update Velero v1.8, v1.9 and v1.10 compatible k8s version to 1.18-latest. Signed-off-by: Xun Jiang <blackpiglet@gmail.com> Item action progress monitoring design This design combines the requirements for the previously-merged Upload Progress Monitoring design with the requirements for the (not submitted but discussed in meetings and slack) proposed asynchronous item action plugins into one integrated proposal. Signed-off-by: Scott Seago <sseago@redhat.com> BackupItemAction v2 design This includes necessary changes to support async item action monitoring. Signed-off-by: Scott Seago <sseago@redhat.com> reversethe order of name and kind Signed-off-by: wenterjoy <zhaoxin26@lenovo.com> RestoreItemAction v2 design Signed-off-by: Scott Seago <sseago@redhat.com> VolumeSnapshotter v2 API design Signed-off-by: Scott Seago <sseago@redhat.com> Prevent nil panic on exec restore hooks (vmware-tanzu#5675) * Prevent nil panic on exec restore hooks Signed-off-by: Dylan Murray <dymurray@redhat.com>
wenterjoy · Dec 21, 2022 · e9deac8 · e9deac8
1 parent 150570f
commit e9deac8
Show file tree

Hide file tree

Showing 271 changed files with 11,020 additions and 1,135 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+updates:
+  # Dependencies listed in go.mod
+  - package-ecosystem: "gomod"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    labels:
+      - "kind/changelog-not-required"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
diff --git a/.github/workflows/crds-verify-kind.yaml b/.github/workflows/crds-verify-kind.yaml
@@ -57,15 +57,13 @@ jobs:
       matrix:
         # Latest k8s versions. There's no series-based tag, nor is there a latest tag.
         k8s:
-          - 1.16.15
-          - 1.17.17
-          - 1.18.15
           - 1.19.7
           - 1.20.2
           - 1.21.1
           - 1.22.0
           - 1.23.6
           - 1.24.2
+          - 1.25.3
     # All steps run in parallel unless otherwise specified.
     # See https://docs.github.com/en/actions/learn-github-actions/managing-complex-workflows#creating-dependent-jobs
     steps:
@@ -83,7 +81,7 @@ jobs:
             velero-${{ github.event.pull_request.number }}-
       - uses: engineerd/setup-kind@v0.5.0
         with:
-          version: "v0.14.0"
+          version: "v0.17.0"
           image: "kindest/node:v${{ matrix.k8s }}"
       - name: Install CRDs
         run: |

diff --git a/.github/workflows/e2e-test-kind.yaml b/.github/workflows/e2e-test-kind.yaml
@@ -60,17 +60,13 @@ jobs:
     strategy:
       matrix:
         k8s:
-          # doesn't cover 1.15 as 1.15 doesn't support "apiextensions.k8s.io/v1" that is needed for the case
-          #- 1.15.12
-          - 1.16.15
-          - 1.17.17
-          - 1.18.20
           - 1.19.16
           - 1.20.15
           - 1.21.12
           - 1.22.9
           - 1.23.6
           - 1.24.0
+          - 1.25.3
       fail-fast: false
     steps:
       - name: Set up Go
@@ -85,7 +81,7 @@ jobs:
           docker run -d --rm -p 9000:9000 -e "MINIO_ACCESS_KEY=minio" -e "MINIO_SECRET_KEY=minio123" -e "MINIO_DEFAULT_BUCKETS=bucket,additional-bucket" bitnami/minio:2021.6.17-debian-10-r7
       - uses: engineerd/setup-kind@v0.5.0
         with:
-          version: "v0.14.0"
+          version: "v0.17.0"
           image: "kindest/node:v${{ matrix.k8s }}"
       - name: Fetch built CLI
         id: cli-cache

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -21,8 +21,19 @@ jobs:
         go-version: 1.18
       id: go
 
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+
+    # Fix issue of setup-gcloud
+    - run: |
+        sudo apt-get install python2.7
+        export CLOUDSDK_PYTHON="/usr/bin/python2"
+
+    - uses: google-github-actions/setup-gcloud@v0
+      with:
+        version: '285.0.0'
+        service_account_key: ${{ secrets.GCS_SA_KEY }}
+        export_default_credentials: true
+    - run: gcloud info
 
     - name: Set up QEMU
       id: qemu
@@ -53,8 +64,29 @@ jobs:
     - name: Publish container image
       if: github.repository == 'vmware-tanzu/velero'
       run: |
+        # Build and push Velero image to docker registry
         docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
-        ./hack/docker-push.sh
+        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}
 
     # Use the JSON key in secret to login gcr.io
     - uses: 'docker/login-action@v1'

diff --git a/Dockerfile b/Dockerfile
@@ -29,8 +29,6 @@ WORKDIR /go/src/github.com/vmware-tanzu/velero
 
 COPY . /go/src/github.com/vmware-tanzu/velero
 
-RUN apt-get update && apt-get install -y bzip2
-
 FROM --platform=$BUILDPLATFORM builder-env as builder
 
 ARG TARGETOS
@@ -45,8 +43,8 @@ ENV GOOS=${TARGETOS} \
     GOARM=${TARGETVARIANT}
 
 RUN mkdir -p /output/usr/bin && \
-    bash ./hack/download-restic.sh && \
     export GOARM=$( echo "${GOARM}" | cut -c2-) && \
+    bash ./hack/build-restic.sh && \
     go build -o /output/${BIN} \
     -ldflags "${LDFLAGS}" ${PKG}/cmd/${BIN}
 

diff --git a/Makefile b/Makefile
@@ -82,7 +82,7 @@ see: https://velero.io/docs/main/build-from-source/#making-images-and-updating-v
 endef
 
 # The version of restic binary to be downloaded
-RESTIC_VERSION ?= 0.13.1
+RESTIC_VERSION ?= 0.14.0
 
 CLI_PLATFORMS ?= linux-amd64 linux-arm linux-arm64 darwin-amd64 darwin-arm64 windows-amd64 linux-ppc64le
 BUILDX_PLATFORMS ?= $(subst -,/,$(ARCH))
@@ -209,6 +209,12 @@ 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
+endif
 
 SKIP_TESTS ?=
 test: build-dirs

diff --git a/README.md b/README.md
@@ -40,8 +40,9 @@ The following is a list of the supported Kubernetes versions for each Velero ver
 
 | Velero version | Expected Kubernetes version compatibility| Tested on Kubernetes version|
 |----------------|--------------------|--------------------|
-| 1.9            | 1.16-latest        |  1.20.5, 1.21.2, 1.22.5, 1.23, and 1.24 |
-| 1.8            | 1.16-latest        |  |
+| 1.10           | 1.18-latest        |  1.22.5, 1.23.8, 1.24.6 and 1.25.1 |
+| 1.9            | 1.18-latest        |  1.20.5, 1.21.2, 1.22.5, 1.23, and 1.24 |
+| 1.8            | 1.18-latest        |  |
 | 1.6.3-1.7.1    | 1.12-latest        ||
 | 1.60-1.6.2     | 1.12-1.21          ||
 | 1.5            | 1.12-1.21          ||