Add missing files

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,13 +10,10 @@ about: Tell us about a problem you are experiencing
 
 **What did you expect to happen:**
 
-**The following information will help us better understand what's going on**:
 
-_If you are using velero v1.7.0+:_  
-Please use `velero debug  --backup <backupname> --restore <restorename>` to generate the support bundle, and attach to this issue, more options please refer to `velero debug --help` 
+**The output of the following commands will help us better understand what's going on**:
+(Pasting long output into a [GitHub gist](https://gist.github.com) or other pastebin is fine.)
 
-_If you are using earlier versions:_  
-Please provide the output of the following commands (Pasting long output into a [GitHub gist](https://gist.github.com) or other pastebin is fine.)
 - `kubectl logs deployment/velero -n velero`
 - `velero backup describe <backupname>` or `kubectl get backup/<backupname> -n velero -o yaml`
 - `velero backup logs <backupname>`

.github/auto-assignees.yml

@@ -9,13 +9,12 @@ reviewers:
 
   groups:
     maintainers:
+      - zubron
       - dsu-igeek
+      - jenting
       - sseago
       - reasonerjt
       - ywk253100
-      - blackpiglet
-      - qiuming-best
-      - shubham-pampattiwar
 
     tech-writer:
       - a-mccarthy

.github/pull_request_template.md

@@ -9,5 +9,5 @@ Fixes #(issue)
 # Please indicate you've done the following:
 
 - [ ] [Accepted the DCO](https://velero.io/docs/v1.5/code-standards/#dco-sign-off). Commits without the DCO will delay acceptance.
-- [ ] [Created a changelog file](https://velero.io/docs/v1.5/code-standards/#adding-a-changelog) or added `/kind changelog-not-required` as a comment on this pull request.
+- [ ] [Created a changelog file](https://velero.io/docs/v1.5/code-standards/#adding-a-changelog) or added `/kind changelog-not-required`.
 - [ ] Updated the corresponding documentation in `site/content/docs/main`.

.github/stale.yml

@@ -14,15 +14,9 @@ exemptLabels:
   - Area/Design
   - Area/Documentation
   - Area/Plugins
-  - Bug
   - Enhancement/User
-  - kind/requirement
-  - kind/refactor
   - kind/tech-debt
-  - limitation
   - Needs investigation
-  - Needs triage
-  - Needs Product
   - P0 - Hair on fire
   - P1 - Important
   - P2 - Long-term important

.github/workflows/crds-verify-kind.yaml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18.10
+          go-version: 1.16
         id: go
       # Look for a CLI that's made for this PR
       - name: Fetch built CLI
@@ -57,6 +57,10 @@ jobs:
       matrix:
         # Latest k8s versions. There's no series-based tag, nor is there a latest tag.
         k8s:
+          - 1.15.12
+          - 1.16.15
+          - 1.17.17
+          - 1.18.15
           - 1.19.7
           - 1.20.2
           - 1.21.1

.github/workflows/e2e-test-kind.yaml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18.10
+          go-version: 1.16
         id: go
       # Look for a CLI that's made for this PR
       - name: Fetch built CLI
@@ -60,18 +60,21 @@ jobs:
     strategy:
       matrix:
         k8s:
-          - 1.19.16
-          - 1.20.15
-          - 1.21.12
-          - 1.22.9
-          - 1.23.6
-          - 1.24.0
+          # 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.15
+          - 1.19.7
+          - 1.20.2
+          - 1.21.1
+          - 1.22.0
       fail-fast: false
     steps:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18.10
+          go-version: 1.16
         id: go
       - name: Check out the code
         uses: actions/checkout@v2
@@ -80,7 +83,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.11.1"
           image: "kindest/node:v${{ matrix.k8s }}"
       - name: Fetch built CLI
         id: cli-cache
@@ -117,12 +120,5 @@ jobs:
               CREDS_FILE=/tmp/credential BSL_BUCKET=bucket \
               ADDITIONAL_OBJECT_STORE_PROVIDER=aws ADDITIONAL_BSL_CONFIG=region=minio,s3ForcePathStyle="true",s3Url=http://$(hostname -i):9000 \
               ADDITIONAL_CREDS_FILE=/tmp/credential ADDITIONAL_BSL_BUCKET=additional-bucket \
-              GINKGO_FOCUS='Basic\]\[ClusterResource' VELERO_IMAGE=velero:pr-test \
-              make -C test/e2e run
-        timeout-minutes: 30
-      - name: Upload debug bundle
-        if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
-        with:
-          name: DebugBundle
-          path: /home/runner/work/velero/velero/test/e2e/debug-bundle*
+              GINKGO_FOCUS=Basic VELERO_IMAGE=velero:pr-test \
+              make -C test/e2e run

.github/workflows/pr-ci-check.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18.10
+          go-version: 1.16
         id: go
       - name: Check out the code
         uses: actions/checkout@v2
@@ -21,9 +21,3 @@ jobs:
             ${{ runner.os }}-go-
       - name: Make ci
         run: make ci
-      - name: Upload test coverage
-        uses: codecov/codecov-action@v2
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: coverage.out
-          verbose: true

.github/workflows/pr-codespell.yml

@@ -14,7 +14,7 @@ jobs:
       uses: codespell-project/actions-codespell@master
       with:
         # ignore the config/.../crd.go file as it's generated binary data that is edited elswhere.
-        skip: .git,*.png,*.jpg,*.woff,*.ttf,*.gif,*.ico,./config/crd/v1beta1/crds/crds.go,./config/crd/v1/crds/crds.go,./go.sum
-        ignore_words_list: iam,aks,ist,bridget,ue,shouldnot
+        skip: .git,*.png,*.jpg,*.woff,*.ttf,*.gif,*.ico,./config/crd/v1beta1/crds/crds.go,./config/crd/v1/crds/crds.go
+        ignore_words_list: iam,aks,ist,bridget,ue
         check_filenames: true
         check_hidden: true

.github/workflows/pr-containers.yml

@@ -1,37 +0,0 @@
-name: build Velero containers on Dockerfile change
-
-on:
-  pull_request:
-    branches:
-      - 'main'
-      - 'release-**'
-    paths:
-      - 'Dockerfile'
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-      name: Checkout
-
-    - name: Set up QEMU
-      id: qemu
-      uses: docker/setup-qemu-action@v1
-      with:
-        platforms: all
-
-    - name: Set up Docker Buildx
-      id: buildx
-      uses: docker/setup-buildx-action@v1
-      with:
-        version: latest
-
-    # Although this action also calls docker-push.sh, it is not triggered
-    # by push, so BRANCH and TAG are empty by default. docker-push.sh will
-    # only build Velero image without pushing.
-    - name: Make Velero container without pushing to registry.
-      if: github.repository == 'vmware-tanzu/velero'
-      run: |
-        ./hack/docker-push.sh

.github/workflows/push-builder.yml

@@ -12,16 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@v2
-      with:
-        # The default value is "1" which fetches only a single commit. If we merge PR without squash or rebase,
-        # there are at least two commits: the first one is the merge commit and the second one is the real commit
-        # contains the changes.
-        # As we use the Dockerfile's commit ID as the tag of the build-image, fetching only 1 commit causes the merge
-        # commit ID to be the tag.
-        # While when running make commands locally, as the local git repository usually contains all commits, the Dockerfile's
-        # commit ID is the second one. This is mismatch with the images in Dockerhub
-        fetch-depth: 2
+    - uses: actions/checkout@master
 
     - name: Build
       run: make build-image

.github/workflows/push.yml

@@ -2,9 +2,7 @@ name: Main CI
 
 on:
   push:
-    branches:
-      - 'main'
-      - 'release-**'
+    branches: [ main ]
     tags:
       - '*'
 
@@ -18,7 +16,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18.10
+        go-version: 1.16
       id: go
 
     - name: Check out code into the Go module directory
@@ -42,29 +40,9 @@ jobs:
     - name: Test
       run: make test
 
-    - name: Upload test coverage
-      uses: codecov/codecov-action@v2
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        files: coverage.out
-        verbose: true
-
     # Only try to publish the container image from the root repo; forks don't have permission to do so and will always get failures.
     - name: Publish container image
       if: github.repository == 'vmware-tanzu/velero'
       run: |
         docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
         ./hack/docker-push.sh
-
-    # Use the JSON key in secret to login gcr.io
-    - uses: 'docker/login-action@v1'
-      with:
-        registry: 'gcr.io' # or REGION.docker.pkg.dev
-        username: '_json_key'
-        password: '${{ secrets.GCR_SA_KEY }}'
-
-    # Push image to GCR to facilitate some environments that have rate limitation to docker hub, e.g. vSphere.
-    - name: Publish container image to GCR
-      if: github.repository == 'vmware-tanzu/velero'
-      run: |
-        REGISTRY=gcr.io/velero-gcp ./hack/docker-push.sh

.goreleaser.yml

@@ -14,7 +14,7 @@
 
 dist: _output
 builds:
-  - main: ./cmd/velero/velero.go
+  - main: ./cmd/velero/main.go
     env:
       - CGO_ENABLED=0
     goos:
@@ -27,9 +27,11 @@ builds:
       - arm64
       - ppc64le
     ignore:
-      # don't build arm for darwin and arm/arm64 for windows
+      # don't build arm/arm64 for darwin or windows
       - goos: darwin
         goarch: arm
+      - goos: darwin
+        goarch: arm64
       - goos: darwin
         goarch: ppc64le
       - goos: windows

ADOPTERS.md

@@ -14,7 +14,7 @@ If you're using Velero and want to add your organization to this list,
 <a href="https://sighup.io/" border="0" target="_blank"><img alt="sighup.io" src="site/static/img/adopters/sighup.svg" height="50"></a>&nbsp; &nbsp; &nbsp;
 <a href="https://mayadata.io/" border="0" target="_blank"><img alt="mayadata.io" src="site/static/img/adopters/mayadata.svg" height="50"></a>&nbsp; &nbsp; &nbsp;
 <a href="https://www.replicated.com/" border="0" target="_blank"><img alt="replicated.com" src="site/static/img/adopters/replicated-logo-red.svg" height="50"></a>
-<a href="https://cloudcasa.io/" border="0" target="_blank"><img alt="cloudcasa.io" src="site/static/img/adopters/cloudcasa.svg" height="50"></a>
+
 ## Success Stories
 
 Below is a list of adopters of Velero in **production environments** that have
@@ -56,11 +56,8 @@ MayaData is a large user of Velero as well as a contributor. MayaData offers a D
 Okteto integrates Velero in [Okteto Cloud][94] and [Okteto Enterprise][95] to periodically backup and restore our clusters for disaster recovery. Velero is also a core software building block to provide namespace cloning capabilities, a feature that allows our users cloning staging environments into their personal development namespace for providing production-like development environments.
 
 **[Replicated][100]**<br>
-Replicated uses the Velero open source project to enable snapshots in [KOTS][101] to backup Kubernetes manifests & persistent volumes. In addition to the default functionality that Velero provides, [KOTS][101] provides a detailed interface in the [Admin Console][102] that can be used to manage the storage destination and schedule, and to perform and monitor the backup and restore process.<br>
-
-**[CloudCasa][103]**<br>
-[Catalogic Software][104] integrates Velero with [CloudCasa][103] - A Smart Home in the Cloud for Backups. CloudCasa is a simple, scalable, cloud-native solution providing data protection and disaster recovery as a service. This solution is built using Kubernetes for protecting Kubernetes clusters.<br>
-
+Replicated uses the Velero open source project to enable snapshots in [KOTS][101] to backup Kubernetes manifests & persistent volumes. In addition to the default functionality that Velero provides, [KOTS][101] provides a detailed interface in the [Admin Console][102] that can be used to manage the storage destination and schedule, and to perform and monitor the backup and restore process.
+​
 ## Adding your organization to the list of Velero Adopters
 
 If you are using Velero and would like to be included in the list of `Velero Adopters`, add an SVG version of your logo to the `site/static/img/adopters` directory in this repo and submit a [pull request][3] with your change. Name the image file something that reflects your company (e.g., if your company is called Acme, name the image acme.png). See this for an example [PR][4].
@@ -113,6 +110,3 @@ If you would like to add your logo to a future `Adopters of Velero` section on [
 [100]: https://www.replicated.com
 [101]: https://kots.io
 [102]: https://kots.io/kotsadm/snapshots/overview/
-
-[103]: https://cloudcasa.io/
-[104]: https://www.catalogicsoftware.com/

CHANGELOG.md

@@ -1,9 +1,7 @@
 ## Current release:
-  * [CHANGELOG-1.9.md][19]
+  * [CHANGELOG-1.7.md][17]
 
 ## Older releases:
-  * [CHANGELOG-1.8.md][18]
-  * [CHANGELOG-1.7.md][17]
   * [CHANGELOG-1.6.md][16]
   * [CHANGELOG-1.5.md][15]
   * [CHANGELOG-1.4.md][14]
@@ -22,8 +20,6 @@
   * [CHANGELOG-0.3.md][1]
 
 
-[19]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.9.md
-[18]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.8.md
 [17]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.7.md
 [16]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.6.md
 [15]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.5.md

Dockerfile

@@ -11,70 +11,50 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-# Velero binary build section
-FROM --platform=$BUILDPLATFORM golang:1.18.10 as velero-builder
+FROM --platform=$BUILDPLATFORM golang:1.16 as builder-env
 
 ARG GOPROXY
-ARG BIN
 ARG PKG
 ARG VERSION
-ARG REGISTRY
 ARG GIT_SHA
 ARG GIT_TREE_STATE
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
+ARG REGISTRY
 
 ENV CGO_ENABLED=0 \
     GO111MODULE=on \
     GOPROXY=${GOPROXY} \
-    GOOS=${TARGETOS} \
-    GOARCH=${TARGETARCH} \
-    GOARM=${TARGETVARIANT} \
     LDFLAGS="-X ${PKG}/pkg/buildinfo.Version=${VERSION} -X ${PKG}/pkg/buildinfo.GitSHA=${GIT_SHA} -X ${PKG}/pkg/buildinfo.GitTreeState=${GIT_TREE_STATE} -X ${PKG}/pkg/buildinfo.ImageRegistry=${REGISTRY}"
 
 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
+ARG TARGETARCH
+ARG TARGETVARIANT
+ARG PKG
+ARG BIN
+ARG RESTIC_VERSION
+
+ENV GOOS=${TARGETOS} \
+    GOARCH=${TARGETARCH} \
+    GOARM=${TARGETVARIANT}
+
 RUN mkdir -p /output/usr/bin && \
+    bash ./hack/download-restic.sh && \
     export GOARM=$( echo "${GOARM}" | cut -c2-) && \
     go build -o /output/${BIN} \
     -ldflags "${LDFLAGS}" ${PKG}/cmd/${BIN}
 
-# Restic binary build section
-FROM --platform=$BUILDPLATFORM golang:1.19.4-bullseye as restic-builder
-
-ARG BIN
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
-ARG RESTIC_VERSION
-
-env CGO_ENABLED=0 \
-    GO111MODULE=on \
-    GOPROXY=${GOPROXY} \
-    GOOS=${TARGETOS} \
-    GOARCH=${TARGETARCH} \
-    GOARM=${TARGETVARIANT}
-
-COPY . /go/src/github.com/vmware-tanzu/velero
-
-# Not sure why v1.10 and main branch works without adding executable permission.
-# Only v1.9 has the problem.
-RUN mkdir -p /output/usr/bin && \
-    export GOARM=$(echo "${GOARM}" | cut -c2-) && \
-    chmod +x /go/src/github.com/vmware-tanzu/velero/hack/build-restic.sh && \
-    /go/src/github.com/vmware-tanzu/velero/hack/build-restic.sh
-
-# Velero image packing section
-FROM gcr.io/distroless/base-debian11@sha256:db7ea5913b13bb5fc4a5f5ee5a1fab693d262846d3e7b28efd3f8f62f835c161
+FROM gcr.io/distroless/base-debian10:nonroot
 
 LABEL maintainer="Nolan Brubaker <brubakern@vmware.com>"
 
-COPY --from=velero-builder /output /
-
-COPY --from=restic-builder /output /
+COPY --from=builder /output /
 
 USER nonroot:nonroot
+

MAINTAINERS.md

@@ -6,13 +6,12 @@
 
 | Maintainer | GitHub ID | Affiliation |
 | --------------- | --------- | ----------- |
-| Dave Smith-Uchida | [dsu-igeek](https://github.com/dsu-igeek) | [Kasten](https://github.com/kastenhq/) |
+| Bridget McErlean | [zubron](https://github.com/zubron) | [VMware](https://www.github.com/vmware/) |
+| Dave Smith-Uchida | [dsu-igeek](https://github.com/dsu-igeek) | [VMware](https://www.github.com/vmware/) |
+| JenTing Hsiao | [jenting](https://github.com/jenting) | [SUSE](https://github.com/SUSE/)
 | Scott Seago | [sseago](https://github.com/sseago) | [OpenShift](https://github.com/openshift)
 | Daniel Jiang | [reasonerjt](https://github.com/reasonerjt) | [VMware](https://www.github.com/vmware/)
 | Wenkai Yin | [ywk253100](https://github.com/ywk253100) | [VMware](https://www.github.com/vmware/) |
-| Xun Jiang | [blackpiglet](https://github.com/blackpiglet) | [VMware](https://www.github.com/vmware/) |
-| Ming Qiu | [qiuming-best](https://github.com/qiuming-best) | [VMware](https://www.github.com/vmware/) |
-| Shubham Pampattiwar | [shubham-pampattiwar](https://github.com/shubham-pampattiwar) | [OpenShift](https://github.com/openshift)
 
 ## Emeritus Maintainers
 * Adnan Abdulhussein ([prydonius](https://github.com/prydonius))
@@ -22,8 +21,6 @@
 * Nolan Brubaker ([nrb](https://github.com/nrb))
 * Ashish Amarnath ([ashish-amarnath](https://github.com/ashish-amarnath))
 * Carlisia Thompson ([carlisia](https://github.com/carlisia))
-* Bridget McErlean ([zubron](https://github.com/zubron))
-* JenTing Hsiao ([jenting](https://github.com/jenting))
 
 ## Velero Contributors & Stakeholders
 
@@ -32,6 +29,6 @@
 | Architect | Dave Smith-Uchida (dsu-igeek) |
 | Technical Lead | Daniel Jiang (reasonerjt) |
 | Kubernetes CSI Liaison |  |
-| Deployment |  |
-| Community Management | Orlin Vasilev (OrlinVasilev) |
+| Deployment | JenTing Hsiao (jenting) |
+| Community Management | Jonas Rosland (jonasrosland) |
 | Product Management | Eleanor Millman (eleanor-millman) |

Makefile

@@ -82,9 +82,9 @@ 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.14.0
+RESTIC_VERSION ?= 0.12.1
 
-CLI_PLATFORMS ?= linux-amd64 linux-arm linux-arm64 darwin-amd64 darwin-arm64 windows-amd64 linux-ppc64le
+CLI_PLATFORMS ?= linux-amd64 linux-arm linux-arm64 darwin-amd64 windows-amd64 linux-ppc64le
 BUILDX_PLATFORMS ?= $(subst -,/,$(ARCH))
 BUILDX_OUTPUT_TYPE ?= docker
 
@@ -120,12 +120,11 @@ build-%:
 
 all-build: $(addprefix build-, $(CLI_PLATFORMS))
 
-all-containers:
+all-containers: container-builder-env
 	@$(MAKE) --no-print-directory container
 	@$(MAKE) --no-print-directory container BIN=velero-restic-restore-helper
 
 local: build-dirs
-# Add DEBUG=1 to enable debug locally
 	GOOS=$(GOOS) \
 	GOARCH=$(GOARCH) \
 	VERSION=$(VERSION) \
@@ -177,6 +176,20 @@ shell: build-dirs build-env
 		$(BUILDER_IMAGE) \
 		/bin/sh $(CMD)
 
+container-builder-env:
+ifneq ($(BUILDX_ENABLED), true)
+	$(error $(BUILDX_ERROR))
+endif
+	@docker buildx build \
+	--target=builder-env \
+	--build-arg=GOPROXY=$(GOPROXY) \
+	--build-arg=PKG=$(PKG) \
+	--build-arg=VERSION=$(VERSION) \
+	--build-arg=GIT_SHA=$(GIT_SHA) \
+	--build-arg=GIT_TREE_STATE=$(GIT_TREE_STATE) \
+	--build-arg=REGISTRY=$(REGISTRY) \
+	-f $(VELERO_DOCKERFILE) .
+
 container:
 ifneq ($(BUILDX_ENABLED), true)
 	$(error $(BUILDX_ERROR))
@@ -185,7 +198,6 @@ endif
 	--output=type=$(BUILDX_OUTPUT_TYPE) \
 	--platform $(BUILDX_PLATFORMS) \
 	$(addprefix -t , $(IMAGE_TAGS)) \
-	--build-arg=GOPROXY=$(GOPROXY) \
 	--build-arg=PKG=$(PKG) \
 	--build-arg=BIN=$(BIN) \
 	--build-arg=VERSION=$(VERSION) \
@@ -326,9 +338,9 @@ changelog:
 #		PUBLISH=false \
 #		make release
 #
-# To run the release, which will publish a *DRAFT* GitHub release in github.com/vmware-tanzu/velero
+# To run the release, which will publish a *DRAFT* GitHub release in github.com/vmware-tanzu/velero 
 # (you still need to review/publish the GitHub release manually):
-#		GITHUB_TOKEN=your-github-token \
+#		GITHUB_TOKEN=your-github-token \ 
 #		RELEASE_NOTES_FILE=changelogs/CHANGELOG-1.2.md \
 #		PUBLISH=true \
 #		make release
@@ -347,7 +359,7 @@ serve-docs: build-image-hugo
 	-it -p 1313:1313 \
 	$(HUGO_IMAGE) \
 	hugo server --bind=0.0.0.0 --enableGitInfo=false
-# gen-docs generates a new versioned docs directory under site/content/docs.
+# gen-docs generates a new versioned docs directory under site/content/docs. 
 # Please read the documentation in the script for instructions on how to use it.
 gen-docs:
 	@hack/release-tools/gen-docs.sh

PROJECT

@@ -0,0 +1,7 @@
+domain: io
+repo: github.com/vmware-tanzu/velero
+resources:
+- group: velero
+  kind: BackupStorageLocation
+  version: v1
+version: "2"

README.md

@@ -34,25 +34,6 @@ If you are ready to jump in and test, add code, or help with documentation, foll
 
 See [the list of releases][6] to find out about feature changes.
 
-### Velero compatibility matrix
-
-The following is a list of the supported Kubernetes versions for each Velero version.
-
-| 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.6.3-1.7.1    | 1.12-latest        ||
-| 1.60-1.6.2     | 1.12-1.21          ||
-| 1.5            | 1.12-1.21          ||
-| 1.4            | 1.10-1.21          | |
-
-Velero supports IPv4, IPv6, and dual stack environments. Support for this was tested against Velero v1.8.
-
-The Velero maintainers are continuously working to expand testing coverage, but are not able to test every combination of Velero and supported Kubernetes versions for each Velero release. The table above is meant to track the current testing coverage and the expected supported Kubernetes versions for each Velero version. If you have a question about test coverage before v1.9, please reach out in the [#velero-users](https://kubernetes.slack.com/archives/C6VCGP4MT) Slack channel.
-
-If you are interested in using a different version of Kubernetes with a given Velero version, we'd recommend that you perform testing before installing or upgrading your environment. For full information around capabilities within a release, also see the Velero [release notes](https://github.com/vmware-tanzu/velero/releases) or Kubernetes [release notes](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG). See the Velero [support page](https://velero.io/docs/latest/support-process/) for information about supported versions of Velero.
-
 [1]: https://github.com/vmware-tanzu/velero/workflows/Main%20CI/badge.svg
 [2]: https://github.com/vmware-tanzu/velero/actions?query=workflow%3A"Main+CI"
 [4]: https://github.com/vmware-tanzu/velero/issues

ROADMAP.md

@@ -1 +1,42 @@
-# Please go to the [Velero Wiki](https://github.com/vmware-tanzu/velero/wiki/) to see our latest roadmap, archived roadmaps and roadmap guidance.
+## Velero Roadmap
+
+### About this document
+This document provides a link to the [Velero Project boards](https://github.com/vmware-tanzu/velero/projects) that serves as the up to date description of items that are in the release pipeline. The release boards have separate swim lanes based on prioritization. Most items are gathered from the community or include a feedback loop with the community. This should serve as a reference point for Velero users and contributors to understand where the project is heading, and help determine if a contribution could be conflicting with a longer term plan. 
+
+### How to help?
+Discussion on the roadmap can take place in threads under [Issues](https://github.com/vmware-tanzu/velero/issues) or in [community meetings](https://velero.io/community/). Please open and comment on an issue if you want to provide suggestions, use cases, and feedback to an item in the roadmap. Please review the roadmap to avoid potential duplicated effort.
+
+### How to add an item to the roadmap?
+One of the most important aspects in any open source community is the concept of proposals. Large changes to the codebase and / or new features should be preceded by a [proposal](https://github.com/vmware-tanzu/velero/blob/main/GOVERNANCE.md#proposal-process) in our repo.
+For smaller enhancements, you can open an issue to track that initiative or feature request.
+We work with and rely on community feedback to focus our efforts to improve Velero and maintain a healthy roadmap.
+
+### Current Roadmap
+The following table includes the current roadmap for Velero. If you have any questions or would like to contribute to Velero, please attend a [community meeting](https://velero.io/community/) to discuss with our team. If you don't know where to start, we are always looking for contributors that will help us reduce technical, automation, and documentation debt.
+Please take the timelines & dates as proposals and goals. Priorities and requirements change based on community feedback, roadblocks encountered, community contributions, etc. If you depend on a specific item, we encourage you to attend community meetings to get updated status information, or help us deliver that feature by contributing to Velero.
+
+`Last Updated: October 2021`
+
+#### 1.8.0 Roadmap (to be delivered January/February 2021)
+
+|Issue|Description|Timeline|Notes|
+|---|---|---|---|
+|[4108](https://github.com/vmware-tanzu/velero/issues/4108), [4109](https://github.com/vmware-tanzu/velero/issues/4109)|Solution for CSI - Azure and AWS|2022 H1|Currently, Velero plugins for AWS and Azure cannot back up persistent volumes that were provisioned using the CSI driver. This will fix that.|
+|[3229](https://github.com/vmware-tanzu/velero/issues/3229),[4112](https://github.com/vmware-tanzu/velero/issues/4112)|Moving data mover functionality from the Velero Plugin for vSphere into Velero proper|2022 H1|This work is a precursor to decoupling the Astrolabe snapshotting infrastructure.|
+|[3533](https://github.com/vmware-tanzu/velero/issues/3533)|Upload Progress Monitoring|2022 H1|Finishing up the work done in the 1.7 timeframe. The data mover work depends on this.|
+|[1975](https://github.com/vmware-tanzu/velero/issues/1975)|Test dual stack mode|2022 H1|We already tested IPv6, but we want to confirm that dual stack mode works as well.|
+|[2082](https://github.com/vmware-tanzu/velero/issues/2082)|Delete Backup CRs on removing target location. |2022 H1||
+|[3516](https://github.com/vmware-tanzu/velero/issues/3516)|Restore issue with MutatingWebhookConfiguration v1beta1 API version|2022 H1||
+|[2308](https://github.com/vmware-tanzu/velero/issues/2308)|Restoring nodePort service that has nodePort preservation always fails if service already exists in the namespace|2022 H1||
+|[4115](https://github.com/vmware-tanzu/velero/issues/4115)|Support for multiple set of credentials for VolumeSnapshotLocations|2022 H1||
+|[1980](https://github.com/vmware-tanzu/velero/issues/1980)|Velero triggers backup immediately for scheduled backups|2022 H1||
+|[4067](https://github.com/vmware-tanzu/velero/issues/4067)|Pre and post backup and restore hooks|2022 H1||
+|[3742](https://github.com/vmware-tanzu/velero/issues/3742)|Carvel packaging for Velero for vSphere|2022 H1|AWS and Azure have been completed already.|
+|[3285](https://github.com/vmware-tanzu/velero/issues/3285)|Design doc for Velero plugin versioning|2022 H1||
+|[4231](https://github.com/vmware-tanzu/velero/issues/4231)|Technical health (prioritizing giving developers confidence and saving developers time)|2022 H1|More automated tests (especially the pre-release manual tests) and more automation of the running of tests.|
+|[4110](https://github.com/vmware-tanzu/velero/issues/4110)|Solution for CSI - GCP|2022 H1|Currently, the Velero plugin for GCP cannot back up persistent volumes that were provisioned using the CSI driver. This will fix that.|
+|[3742](https://github.com/vmware-tanzu/velero/issues/3742)|Carvel packaging for Velero for restic|2022 H1|AWS and Azure have been completed already.|
+|[3454](https://github.com/vmware-tanzu/velero/issues/3454),[4134](https://github.com/vmware-tanzu/velero/issues/4134),[4135](https://github.com/vmware-tanzu/velero/issues/4135)|Kubebuilder tech debt|2022 H1||
+|[4111](https://github.com/vmware-tanzu/velero/issues/4111)|Ignore items returned by ItemSnapshotter.AlsoHandles during backup|2022 H1|This will enable backup of complex objects, because we can then tell Velero to ignore things that were already backed up when Velero was previously called recursively.|
+
+Other work may make it into the 1.8 release, but this is the work that will be prioritized first.

Tiltfile

@@ -50,7 +50,7 @@ git_sha = str(local("git rev-parse HEAD", quiet = True, echo_off = True)).strip(
 
 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.18.10 as tilt-helper
+FROM golang:1.16.6 as tilt-helper
 
 # Support live reloading with Tilt
 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh  && \
@@ -103,7 +103,7 @@ local_resource(
 
 local_resource(
     "restic_binary",
-    cmd = 'cd ' + '.' + ';mkdir -p _tiltbuild/restic; BIN=velero GOOS=linux GOARCH=amd64 RESTIC_VERSION=0.13.1 OUTPUT_DIR=_tiltbuild/restic ./hack/download-restic.sh',
+    cmd = 'cd ' + '.' + ';mkdir -p _tiltbuild/restic; BIN=velero GOOS=' + local_goos + ' GOARCH=amd64 RESTIC_VERSION=0.12.0 OUTPUT_DIR=_tiltbuild/restic ./hack/download-restic.sh',
 )
 
 # Note: we need a distro with a bash shell to exec into the Velero container

changelogs/CHANGELOG-1.8.md

@@ -1,110 +0,0 @@
-## v1.8.0
-### 2022-01-14
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.8.0
-
-### Container Image
-`velero/velero:v1.8.0`
-
-### Documentation
-https://velero.io/docs/v1.8
-
-### Upgrading
-https://velero.io/docs/v1.8/upgrade-to-1.8/
-
-### Highlights
-
-#### Velero plugins now support handling volumes created by the CSI drivers of cloud providers
-Versions 1.4 of the Velero plugins for AWS, Azure and GCP now support snapshotting and restoring the persistent volumes provisioned by CSI driver via the APIs of the cloud providers. With this enhancement, users can backup and restore the persistent volumes on these cloud providers without using the Velero CSI plugin. The CSI plugin will remain beta and the feature flag `EnableCSI` will be disabled by default.
-
-For the version of the plugins and the CSI drivers they support respectively please see the table:
-
-| Plugin | Version | CSI Driver |
-| --- | ----------- | ---------- |
-| velero-plugin-for-aws | v1.4.0 | ebs.csi.aws.com |
-| velero-plugin-for-microsoft-azure | v1.4.0 | disk.csi.azure.com |
-| velero-plugin-for-gcp | v1.4.0 | pd.csi.storage.gke.io |
-
-#### IPv6 dual stack support
-We've verified the functionality of Velero on IPv6 dual stack by successfully running the E2E test on IPv6 dual stack environment.
-#### Refactor the controllers using Kubebuilder v3
-In this release we continued our code modernization work, rewriting some controllers using Kubebuilder v3. This work is ongoing and we will continue to make progress in future releases.
-#### Enhancements to E2E test cases
-More test cases have been added to the E2E test suite to improve the release health.
-#### Respect the cron setting of scheduled backup
-The creation time is now taken into account to calculate the next run for scheduled backup.
-
-#### Deleting BSLs also cleans up related resources
-
-When a Backup Storage Location (BSL) is deleted, backup and Restic repository resources will also be deleted.
-
-#### Breaking changes
-
-Starting in v1.8, Velero will only support Kubernetes v1 CRD meaning that Velero v1.8+ will only run on Kubernetes v1.16+. Before upgrading, make sure you are running a supported Kubernetes version. For more information, see our [compatibility matrix](https://github.com/vmware-tanzu/velero#velero-compatibility-matrix).
-
-#### Upload Progress Monitoring and Item Snapshotter
-Item Snapshotter plugin API was merged.  This will support both Upload Progress
-monitoring and the planned Data Mover.  Upload Progress monitoring PRs are
-in progress for 1.9.
-
-### All changes
-
-* E2E test on ssr object with controller namespace mix-ups (#4521, @mqiu)
-* Check whether the volume is provisioned by CSI driver or not by the annotation as well (#4513, @ywk253100)
-* Initialize the labels field of `velero backup-location create` option to avoid #4484 (#4491, @ywk253100)
-* Fix e2e 2500 namespaces scale test timeout problem (#4480, @mqiu)
-* Add backup deletion e2e test  (#4401, @danfengliu)
-* Return the error when getting backup store in backup deletion controller (#4465, @reasonerjt)
-* Ignore the provided port is already allocated error when restoring the LoadBalancer service (#4462, @ywk253100)
-* Revert #4423 migrate backup sync controller to kubebuilder. (#4457, @jxun)
-* Add rbac and annotation test cases (#4455, @mqiu)
-* remove --crds-version in velero install command. (#4446, @jxun)
-* Upgrade e2e test vsphere plugin (#4440, @mqiu)
-* Fix e2e test failures for the inappropriate optimaze of velero install (#4438, @mqiu)
-* Limit backup namespaces on test resource filtering cases (#4437, @mqiu)
-* Bump up Go to 1.17 (#4431, @reasonerjt)
-* Added `<backup name>`-itemsnapshots.json.gz to the backup format.  This file exists
-  when item snapshots are taken and contains an array of volume.Itemsnapshots
-  containing the information about the snapshots.  This will not be used unless
-  upload progress monitoring and item snapshots are enabled and an ItemSnapshot
-  plugin is used to take snapshots.
-
-Also added DownloadTargetKindBackupItemSnapshots for retrieving the signed URL to download only the `<backup name>`-itemsnapshots.json.gz part of a backup for use by
-`velero backup describe`. (#4429, @dsmithuchida)
-* Migrate backup sync controller from code-generator to kubebuilder. (#4423, @jxun)
-* Added UploadProgressFeature flag to enable Upload Progress Monitoring and Item
-  Snapshotters. (#4416, @dsmithuchida)
-* Added BackupWithResolvers and RestoreWithResolvers calls.  Will eventually replace Backup and Restore methods.
-  Adds ItemSnapshotters to Backup and Restore workflows. (#4410, @dsu)
-* Build for darwin-arm64 (#4409, @epk)
-* Add resource filtering test cases (#4404, @mqiu)
-* Fix the issue that the backup cannot be deleted after the application uninstalled (#4398, @ywk253100)
-* Add restoreactionitem plugin to handle admission webhook configurations (#4397, @reasonerjt)
-* Keep the annotation "pv.kubernetes.io/provisioned-by" when restoring PVs (#4391, @ywk253100)
-* Adjust structure of e2e test codes (#4386, @mqiu)
-* feat: migrate velero controller from kubebuilder v2 to v3
-  From Velero v1.8, apiextesions.k8s.io/v1beta1 is no longer supported,
-  which means only CRD of apiextensions.k8s.io/v1 is supported,
-  and the supported Kubernetes version is updated to v1.16 and later. (#4382, @jxun)
-* Delete backups and Restic repos associated with deleted BSL(s) (#4377, @codegold79)
-* Add the key for GKE zone for AZ collection (#4376, @reasonerjt)
-* Fix statefulsets volumeClaimTemplates storageClassName when use Changing PV/PVC Storage Classes (#4375, @Box-Cube)
-* Fix snapshot e2e test issue of jsonpath (#4372, @danfengliu)
-* Modify the timestamp in the name of a backup generated from schedule to use UTC. (#4353, @jxun)
-* Read Availability zone from nodeAffinity requirements  (#4350, @reasonerjt)
-* Use factory.Namespace() to replace hardcoded velero namespace (#4346, @half-life666)
-* Return the error if velero failed to detect S3 region for restic repo (#4343, @reasonerjt)
-* Add init log option for velero controller-runtime manager. (#4341, @jxun)
-* Ignore the `provided port is already allocated` error when restoring the `NodePort` service (#4336, @ywk253100)
-* Fixed an issue with the `backup-location create` command where the BSL Credential field would be set to an invalid empty SecretKeySelector when no credential details were provided. (#4322, @zubron)
-* fix buggy pager func (#4306, @alaypatel07)
-* Don't create a backup immediately after creating a schedule (#4281, @ywk253100)
-* Fix CVE-2020-29652 and CVE-2020-26160 (#4274, @ywk253100)
-* Refine tag-release.sh to align with change in release process (#4185, @reasonerjt)
-* Fix plugins incompatible issue in upgrade test (#4141, @danfengliu)
-* Verify group before treating resource as cohabitating (#4126, @sseago)
-* Added ItemSnapshotter plugin definition and plugin framework - addresses #3533.
-  Part of the Upload Progress enhancement (#3533) (#4077, @dsmithuchida)
-* Add upgrade test in E2E test (#4058, @danfengliu)
-* Handle namespace mapping for PVs without snapshots on restore (#3708, @sseago)

changelogs/CHANGELOG-1.9.md

@@ -1,243 +0,0 @@
-## v1.9.6
-### 2023-02-21
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.9.6
-
-### Container Image
-`velero/velero:v1.9.6`
-
-### Documentation
-https://velero.io/docs/v1.9/
-
-### Upgrading
-https://velero.io/docs/v1.9/upgrade-to-1.9/
-
-### All changes
-  * Bump up Golang version and fix CVEs. (#5884, @blackpiglet)
-  * Add labels for velero installed namespace to support PSA. (#5887, @blackpiglet)
-  * Fix Dockerfile issue. (#5761, @blackpiglet)
-  * Add PR container build action, which will not push image. Add GOARM parameter. (#5777, @blackpiglet)
-  * Correct PVB/PVR Failed Phase patching during startup (#5829, @kaovilai)
-
-## v1.9.5
-### 2022-12-19
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.9.5
-
-### Container Image
-`velero/velero:v1.9.5`
-
-### Documentation
-https://velero.io/docs/v1.9/
-
-### Upgrading
-https://velero.io/docs/v1.9/upgrade-to-1.9/
-
-### All changes
-  * Add Restic builder in Dockerfile, and keep the used built Golang image version in accordance with upstream Restic. (#5685, @blackpiglet)
-
-## v1.9.4
-### 2022-11-30
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.9.4
-
-### Container Image
-`velero/velero:v1.9.4`
-
-### Documentation
-https://velero.io/docs/v1.9/
-
-### Upgrading
-https://velero.io/docs/v1.9/upgrade-to-1.9/
-
-### All changes
-  * Fix CVE for trivy scan (#5642, @qiuming-best)
-  * Remove old kubernetes versions from kind CI (#5627, @Lyndon-Li))
-  * Restore ClusterBootstrap before Cluster (#5617, @ywk253100)
-
-## v1.9.3
-### 2022-11-03
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.9.3
-
-### Container Image
-`velero/velero:v1.9.3`
-
-### Documentation
-https://velero.io/docs/v1.9/
-
-### Upgrading
-https://velero.io/docs/v1.9/upgrade-to-1.9/
-
-### All changes
-  * Fix controller problematic log output (#5570, @qiuming-best) 
-  * Add compile restic binary for CVE fix (#5564, @qiuming-best) 
-  * Bump up golang version to 1.18.8 (#5558, @qiuming-best) 
-  * Enhance the restore priorities list to support specifying the low prioritized resources that need to be restored in the last (#5529, @ywk253100)
-  * Fix v1.9.3 CSI VolumeSnapshot status duplicate issue. (#5518, @blackpiglet)
-  * Bump up the distroless image to the latest version (#5500, @ywk253100)
-  * Add some corner cases checking for CSI snapshot in backup controller. (#5482, @blackpiglet)
-  * Skip the exclusion check for additional resources returned by BIA (#5406, @reasonerjt)
-  * Exclude "csinodes.storage.k8s.io" and "volumeattachments.storage.k8s.io" from restore by default. (#5448, @jxun)
-  * Update the k8s.io dependencies to 0.24.0 and Removed the `WithClusterName` method as it is a "legacy field that was always cleared by the system and never used" as per upstream k8s. (#5472, @kcboyle)
-
-## v1.9.2
-### 2022-09-14
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.9.2
-
-### Container Image
-`velero/velero:v1.9.2`
-
-### Documentation
-https://velero.io/docs/v1.9/
-
-### Upgrading
-https://velero.io/docs/v1.9/upgrade-to-1.9/
-
-### All changes
-
-  * Fix CVE-2022-1962 by bumping up golang version to 1.17.13 (#5286, @qiuming-best)
-  * Fix code spell check fail (#5300, @qiuming-best)
-  * Fix nil pointer panic when restoring StatefulSets (#5301, @divolgin)
-  * Check for empty ns list before checking nslist[0] (#5302, @sseago)
-  * check vsc null pointer (#5303, @lilongfeng0902)
-  * Fix edge cases for already exists resources (#5304, @shubham-pampattiwar)
-  * Increase ensure restic repository timeout to 5m (#5336, @shubham-pampattiwar)
-  * Added DownloadTargetKindCSIBackupVolumeSnapshots for retrieving the signed URL to download only the `<backup name>`-csi-volumesnapshots.json.gz  and DownloadTargetKindCSIBackupVolumeSnapshotContents to download only `<backup name>`-csi-volumesnapshotcontents.json.gz in the DownloadRequest CR structure. These files are already present in the backup layout. (#5307, @anshulahuja98)
-## v1.9.1
-### 2022-08-03
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.9.1
-
-### Container Image
-`velero/velero:v1.9.1`
-
-### Documentation
-https://velero.io/docs/v1.9/
-
-### Upgrading
-https://velero.io/docs/v1.9/upgrade-to-1.9/
-
-### All changes
-
-  * Fix bsl validation bug: the BSL is validated continually and doesn't respect the validation period configured (#5112, @ywk253100)
-  * Modify BackupStoreGetter to avoid BSL spec changes (#5134, @sseago)
-  * Delay CA file deletion in PVB controller. (#5150, @jxun)
-  * Skip registering "crd-remap-version" plugin when feature flag "EnableAPIGroupVersions" is set (#5173, @reasonerjt)
-  * Fix restic backups to multiple backup storage locations bug (#5175, @qiuming-best)
-  * Make CSI snapshot creation timeout configurable. (#5189, @jxun)
-  * Add annotation "pv.kubernetes.io/migrated-to" for CSI checking. (#5186, @jxun)
-  * Bump up base image and package version to fix CVEs. (#5202, @ywk253100)
-
-## v1.9.0
-### 2022-06-13
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.9.0
-
-### Container Image
-`velero/velero:v1.9.0`
-
-### Documentation
-https://velero.io/docs/v1.9/
-
-### Upgrading
-https://velero.io/docs/v1.9/upgrade-to-1.9/
-
-### Highlights
-
-#### Improvement to the CSI plugin
-- Bump up to the CSI volume snapshot v1 API
-- No VolumeSnapshot will be left in the source namespace of the workload
-- Report metrics for CSI snapshots
-
-More improvements please refer to [CSI plugin improvement](https://github.com/vmware-tanzu/velero/issues?q=is%3Aissue+label%3A%22CSI+plugin+-+GA+-+phase1%22+is%3Aclosed)
-
-With these improvements we'll provide official support for CSI snapshots on AKS/EKS clusters. (with CSI plugin v0.3.0)
-
-#### Refactor the controllers using Kubebuilder v3
-In this release we continued our code modernization work, rewriting some controllers using Kubebuilder v3. This work is ongoing and we will continue to make progress in future releases.
-
-#### Optionally restore status on selected resources
-Options are added to the CLI and Restore spec to control the group of resources whose status will be restored.
-
-#### ExistingResourcePolicy in the restore API
-Users can choose to overwrite or patch the existing resources during restore by setting this policy.
-
-#### Upgrade integrated Restic version and add skip TLS validation in Restic command
-Upgrade integrated Restic version, which will resolve some of the CVEs, and support skip TLS validation in Restic backup/restore.
-
-#### Breaking changes
-With bumping up the API to v1 in CSI plugin, the v0.3.0 CSI plugin will only work for Kubernetes v1.20+
-
-### All changes
-
-  * restic: add full support for setting SecurityContext for restore init container from configMap. (#4084, @MatthieuFin)
-  * Add metrics backup_items_total and backup_items_errors (#4296, @tobiasgiese)
-  * Convert PodVolumebackup controller to the Kubebuilder framework (#4436, @fgold)
-  * Skip not mounted volumes when backing up (#4497, @dkeven)
-  * Update doc for v1.8 (#4517, @reasonerjt)
-  * Fix bug to make the restic prune frequency configurable (#4518, @ywk253100)
-  * Add E2E test of backups sync from BSL (#4545, @mqiu)
-  * Fix: OrderedResources in Schedules (#4550, @dbrekau)
-  * Skip volumes of non-running pods when backing up (#4584, @bynare)
-  * E2E SSR test add retry mechanism and logs  (#4591, @mqiu)
-  * Add pushing image to GCR in github workflow to facilitate some environments that have rate limitation to docker hub, e.g. vSphere. (#4623, @jxun)
-  * Add existingResourcePolicy to Restore API (#4628, @shubham-pampattiwar)
-  * Fix E2E backup namespaces test (#4634, @qiuming-best)
-  * Update image used by E2E test to gcr.io (#4639, @jxun)
-  * Add multiple label selector support to Velero Backup and Restore APIs (#4650, @shubham-pampattiwar)
-  * Convert Pod Volume Restore resource/controller to the Kubebuilder framework (#4655, @ywk253100)
-  * Update --use-owner-references-in-backup description in velero command line. (#4660, @jxun)
-  * Avoid overwritten hook's exec.container parameter when running pod command executor. (#4661, @jxun)
-  * Support regional pv for GKE (#4680, @jxun)
-  * Bypass the remap CRD version plugin when v1beta1 CRD is not supported (#4686, @reasonerjt)
-  * Add GINKGO_SKIP to support skip specific case in e2e test. (#4692, @jxun)
-  * Add --pod-labels flag to velero install (#4694, @j4m3s-s)
-  * Enable coverage in test.sh and upload to codecov (#4704, @reasonerjt)
-  * Mark the BSL as "Unavailable" when gets any error and add a new field "Message" to the status to record the error message (#4719, @ywk253100)
-  * Support multiple skip option for E2E test (#4725, @jxun)
-  * Add PriorityClass to the AdditionalItems of Backup's PodAction and Restore's PodAction plugin to backup and restore PriorityClass if it is used by a Pod. (#4740, @phuongatemc)
-  * Insert all restore errors and warnings into restore log. (#4743, @sseago)
-  * Refactor schedule controller with kubebuilder (#4748, @ywk253100)
-  * Garbage collector now adds labels to backups that failed to delete for BSLNotFound, BSLCannotGet, BSLReadOnly reasons. (#4757, @kaovilai)
-  * Skip podvolumerestore creation when restore excludes pv/pvc (#4769, @half-life666)
-  * Add parameter for e2e test to support modify kibishii install path. (#4778, @jxun)
-  * Ensure the restore hook applied to new namespace based on the mapping (#4779, @reasonerjt)
-  * Add ability to restore status on selected resources (#4785, @RafaeLeal)
-  * Do not take snapshot for PV to avoid duplicated snapshotting, when CSI feature is enabled. (#4797, @jxun)
-  * Bump up to v1 API for CSI snapshot (#4800, @reasonerjt)
-  * fix: delete empty backups (#4817, @yuvalman)
-  * Add CSI VolumeSnapshot related metrics. (#4818, @jxun)
-  * Fix default-backup-ttl not work (#4831, @qiuming-best)
-  * Make the vsc created by backup sync controller deletable (#4832, @reasonerjt)
-  * Make in-progress backup/restore as failed when doing the reconcile to avoid hanging in in-progress status (#4833, @ywk253100)
-  * Use controller-gen to generate the deep copy methods for objects (#4838, @ywk253100)
-  * Update integrated Restic version and add insecureSkipTLSVerify for Restic CLI. (#4839, @jxun)
-  * Modify CSI VolumeSnapshot metric related code. (#4854, @jxun)
-  * Refactor backup deletion controller based on kubebuilder (#4855, @reasonerjt)
-  * Remove VolumeSnapshots created during backup when CSI feature is enabled. (#4858, @jxun)
-  * Convert Restic Repository resource/controller to the Kubebuilder framework (#4859, @qiuming-best)
-  * Add ClusterClasses to the restore priority list (#4866, @reasonerjt)
-  * Cleanup the .velero folder after restic done (#4872, @big-appled)
-  * Delete orphan CSI snapshots in backup sync controller (#4887, @reasonerjt)
-  * Make waiting VolumeSnapshot to ready process parallel. (#4889, @jxun)
-  * continue rather than return for non-matching restore action label (#4890, @sseago)
-  * Make in-progress PVB/PVR as failed when restic controller restarts to avoid hanging backup/restore (#4893, @ywk253100)
-  * Refactor BSL controller with periodical enqueue source (#4894, @jxun)
-  * Make garbage collection for expired backups configurable (#4897, @ywk253100)
-  * Bump up the version of distroless to base-debian11 (#4898, @ywk253100)
-  * Add schedule ordered resources E2E test (#4913, @qiuming-best)
-  * Make velero completion zsh command output can be used by `source` command. (#4914, @jxun)
-  * Enhance the map flag to support parsing input value contains entry delimiters (#4920, @ywk253100)
-  * Fix E2E test [Backups][Deletion][Restic] on GCP. (#4968, @jxun)
-  * Disable status as sub resource in CRDs (#4972, @ywk253100)
-  * Add more information for failing to get path or snapshot in restic backup and restore. (#4988, @jxun)
-  * When spec.RestoreStatus is empty, don't restore status (#5015, @sseago)

changelogs/unreleased/4058-danfengliu

@@ -0,0 +1 @@
+Add upgrade test in E2E test

changelogs/unreleased/4126-sseago

@@ -0,0 +1 @@
+Verify group before treating resource as cohabitating

changelogs/unreleased/4141-danfengliu

@@ -0,0 +1 @@
+Fix plugins incompatible issue in upgrade test

changelogs/unreleased/4185-reasonerjt

@@ -0,0 +1 @@
+Refine tag-release.sh to align with change in release process

changelogs/unreleased/4274-ywk253100

@@ -0,0 +1 @@
+Fix CVE-2020-29652 and CVE-2020-26160

changelogs/unreleased/4281-ywk253100

@@ -0,0 +1 @@
+Don't create a backup immediately after creating a schedule

cmd/velero-restic-restore-helper/main.go

@@ -38,12 +38,6 @@ func main() {
 		case <-ticker.C:
 			if done() {
 				fmt.Println("All restic restores are done")
-				err := removeFolder()
-				if err != nil {
-					fmt.Println(err)
-				} else {
-					fmt.Println("Done cleanup .velero folder")
-				}
 				return
 			}
 		}
@@ -81,28 +75,3 @@ func done() bool {
 
 	return true
 }
-
-// remove .velero folder
-func removeFolder() error {
-	children, err := ioutil.ReadDir("/restores")
-	if err != nil {
-		return err
-	}
-
-	for _, child := range children {
-		if !child.IsDir() {
-			fmt.Printf("%s is not a directory, skipping.\n", child.Name())
-			continue
-		}
-
-		donePath := filepath.Join("/restores", child.Name(), ".velero")
-
-		err = os.RemoveAll(donePath)
-		if err != nil {
-			return err
-		}
-		fmt.Printf("Deleted %s", donePath)
-	}
-
-	return nil
-}

config/crd/v1/bases/velero.io_backups.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: backups.velero.io
 spec:
@@ -37,11 +37,6 @@ spec:
           spec:
             description: BackupSpec defines the specification for a Velero backup.
             properties:
-              csiSnapshotTimeout:
-                description: CSISnapshotTimeout specifies the time used to wait for
-                  CSI VolumeSnapshot status turns to ReadyToUse during creation, before
-                  returning error as timeout. The default value is 10 minute.
-                type: string
               defaultVolumesToRestic:
                 description: DefaultVolumesToRestic specifies whether restic should
                   be used to take a backup of all pod volumes by default.
@@ -319,61 +314,6 @@ spec:
                       type: string
                     type: object
                 type: object
-              orLabelSelectors:
-                description: OrLabelSelectors is list of metav1.LabelSelector to filter
-                  with when adding individual objects to the backup. If multiple provided
-                  they will be joined by the OR operator. LabelSelector as well as
-                  OrLabelSelectors cannot co-exist in backup request, only one of
-                  them can be used.
-                items:
-                  description: A label selector is a label query over a set of resources.
-                    The result of matchLabels and matchExpressions are ANDed. An empty
-                    label selector matches all objects. A null label selector matches
-                    no objects.
-                  properties:
-                    matchExpressions:
-                      description: matchExpressions is a list of label selector requirements.
-                        The requirements are ANDed.
-                      items:
-                        description: A label selector requirement is a selector that
-                          contains values, a key, and an operator that relates the
-                          key and values.
-                        properties:
-                          key:
-                            description: key is the label key that the selector applies
-                              to.
-                            type: string
-                          operator:
-                            description: operator represents a key's relationship
-                              to a set of values. Valid operators are In, NotIn, Exists
-                              and DoesNotExist.
-                            type: string
-                          values:
-                            description: values is an array of string values. If the
-                              operator is In or NotIn, the values array must be non-empty.
-                              If the operator is Exists or DoesNotExist, the values
-                              array must be empty. This array is replaced during a
-                              strategic merge patch.
-                            items:
-                              type: string
-                            type: array
-                        required:
-                        - key
-                        - operator
-                        type: object
-                      type: array
-                    matchLabels:
-                      additionalProperties:
-                        type: string
-                      description: matchLabels is a map of {key,value} pairs. A single
-                        {key,value} in the matchLabels map is equivalent to an element
-                        of matchExpressions, whose key field is "key", the operator
-                        is "In", and the values array contains only "value". The requirements
-                        are ANDed.
-                      type: object
-                  type: object
-                nullable: true
-                type: array
               orderedResources:
                 additionalProperties:
                   type: string
@@ -414,14 +354,6 @@ spec:
                 format: date-time
                 nullable: true
                 type: string
-              csiVolumeSnapshotsAttempted:
-                description: CSIVolumeSnapshotsAttempted is the total number of attempted
-                  CSI VolumeSnapshots for this backup.
-                type: integer
-              csiVolumeSnapshotsCompleted:
-                description: CSIVolumeSnapshotsCompleted is the total number of successfully
-                  completed CSI VolumeSnapshots for this backup.
-                type: integer
               errors:
                 description: Errors is a count of all error messages that were generated
                   during execution of the backup.  The actual errors are in the backup's
@@ -432,10 +364,6 @@ spec:
                 format: date-time
                 nullable: true
                 type: string
-              failureReason:
-                description: FailureReason is an error that caused the entire backup
-                  to fail.
-                type: string
               formatVersion:
                 description: FormatVersion is the backup format version, including
                   major, minor, and patch version.

config/crd/v1/bases/velero.io_backupstoragelocations.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: backupstoragelocations.velero.io
 spec:
@@ -158,10 +158,6 @@ spec:
                 format: date-time
                 nullable: true
                 type: string
-              message:
-                description: Message is a message about the backup storage location's
-                  status.
-                type: string
               phase:
                 description: Phase is the current state of the BackupStorageLocation.
                 enum:
@@ -172,7 +168,8 @@ spec:
         type: object
     served: true
     storage: true
-    subresources: {}
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""

config/crd/v1/bases/velero.io_deletebackuprequests.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: deletebackuprequests.velero.io
 spec:
@@ -16,16 +16,7 @@ spec:
     singular: deletebackuprequest
   scope: Namespaced
   versions:
-  - additionalPrinterColumns:
-    - description: The name of the backup to be deleted
-      jsonPath: .spec.backupName
-      name: BackupName
-      type: string
-    - description: The status of the deletion request
-      jsonPath: .status.phase
-      name: Status
-      type: string
-    name: v1
+  - name: v1
     schema:
       openAPIV3Schema:
         description: DeleteBackupRequest is a request to delete one or more backups.
@@ -72,7 +63,6 @@ spec:
         type: object
     served: true
     storage: true
-    subresources: {}
 status:
   acceptedNames:
     kind: ""

config/crd/v1/bases/velero.io_downloadrequests.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: downloadrequests.velero.io
 spec:
@@ -46,12 +46,9 @@ spec:
                     - BackupLog
                     - BackupContents
                     - BackupVolumeSnapshots
-                    - BackupItemSnapshots
                     - BackupResourceList
                     - RestoreLog
                     - RestoreResults
-                    - CSIBackupVolumeSnapshots
-                    - CSIBackupVolumeSnapshotContents
                     type: string
                   name:
                     description: Name is the name of the kubernetes resource with
@@ -87,6 +84,8 @@ spec:
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""

config/crd/v1/bases/velero.io_podvolumebackups.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: podvolumebackups.velero.io
 spec:
@@ -16,40 +16,7 @@ spec:
     singular: podvolumebackup
   scope: Namespaced
   versions:
-  - additionalPrinterColumns:
-    - description: Pod Volume Backup status such as New/InProgress
-      jsonPath: .status.phase
-      name: Status
-      type: string
-    - description: Time when this backup was started
-      jsonPath: .status.startTimestamp
-      name: Created
-      type: date
-    - description: Namespace of the pod containing the volume to be backed up
-      jsonPath: .spec.pod.namespace
-      name: Namespace
-      type: string
-    - description: Name of the pod containing the volume to be backed up
-      jsonPath: .spec.pod.name
-      name: Pod
-      type: string
-    - description: Name of the volume to be backed up
-      jsonPath: .spec.volume
-      name: Volume
-      type: string
-    - description: Restic repository identifier for this backup
-      jsonPath: .spec.repoIdentifier
-      name: Restic Repo
-      type: string
-    - description: Name of the Backup Storage Location where this backup should be
-        stored
-      jsonPath: .spec.backupStorageLocation
-      name: Storage Location
-      type: string
-    - jsonPath: .metadata.creationTimestamp
-      name: Age
-      type: date
-    name: v1
+  - name: v1
     schema:
       openAPIV3Schema:
         properties:
@@ -186,7 +153,6 @@ spec:
         type: object
     served: true
     storage: true
-    subresources: {}
 status:
   acceptedNames:
     kind: ""

config/crd/v1/bases/velero.io_podvolumerestores.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: podvolumerestores.velero.io
 spec:
@@ -16,37 +16,7 @@ spec:
     singular: podvolumerestore
   scope: Namespaced
   versions:
-  - additionalPrinterColumns:
-    - description: Namespace of the pod containing the volume to be restored
-      jsonPath: .spec.pod.namespace
-      name: Namespace
-      type: string
-    - description: Name of the pod containing the volume to be restored
-      jsonPath: .spec.pod.name
-      name: Pod
-      type: string
-    - description: Name of the volume to be restored
-      jsonPath: .spec.volume
-      name: Volume
-      type: string
-    - description: Pod Volume Restore status such as New/InProgress
-      jsonPath: .status.phase
-      name: Status
-      type: string
-    - description: Pod Volume Restore status such as New/InProgress
-      format: int64
-      jsonPath: .status.progress.totalBytes
-      name: TotalBytes
-      type: integer
-    - description: Pod Volume Restore status such as New/InProgress
-      format: int64
-      jsonPath: .status.progress.bytesDone
-      name: BytesDone
-      type: integer
-    - jsonPath: .metadata.creationTimestamp
-      name: Age
-      type: date
-    name: v1
+  - name: v1
     schema:
       openAPIV3Schema:
         properties:
@@ -166,7 +136,6 @@ spec:
         type: object
     served: true
     storage: true
-    subresources: {}
 status:
   acceptedNames:
     kind: ""

config/crd/v1/bases/velero.io_resticrepositories.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: resticrepositories.velero.io
 spec:
@@ -16,11 +16,7 @@ spec:
     singular: resticrepository
   scope: Namespaced
   versions:
-  - additionalPrinterColumns:
-    - jsonPath: .metadata.creationTimestamp
-      name: Age
-      type: date
-    name: v1
+  - name: v1
     schema:
       openAPIV3Schema:
         properties:
@@ -85,7 +81,6 @@ spec:
         type: object
     served: true
     storage: true
-    subresources: {}
 status:
   acceptedNames:
     kind: ""

config/crd/v1/bases/velero.io_restores.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: restores.velero.io
 spec:
@@ -53,11 +53,6 @@ spec:
                   type: string
                 nullable: true
                 type: array
-              existingResourcePolicy:
-                description: ExistingResourcePolicy specifies the restore behaviour
-                  for the kubernetes resource to be restored
-                nullable: true
-                type: string
               hooks:
                 description: Hooks represent custom behaviors that should be executed
                   during or post restore.
@@ -205,14 +200,14 @@ spec:
                                       properties:
                                         args:
                                           description: 'Arguments to the entrypoint.
-                                            The container image''s CMD is used if
-                                            this is not provided. Variable references
-                                            $(VAR_NAME) are expanded using the container''s
-                                            environment. If a variable cannot be resolved,
-                                            the reference in the input string will
-                                            be unchanged. Double $$ are reduced to
-                                            a single $, which allows for escaping
-                                            the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
+                                            The docker image''s CMD is used if this
+                                            is not provided. Variable references $(VAR_NAME)
+                                            are expanded using the container''s environment.
+                                            If a variable cannot be resolved, the
+                                            reference in the input string will be
+                                            unchanged. Double $$ are reduced to a
+                                            single $, which allows for escaping the
+                                            $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)"
                                             will produce the string literal "$(VAR_NAME)".
                                             Escaped references will never be expanded,
                                             regardless of whether the variable exists
@@ -223,15 +218,15 @@ spec:
                                           type: array
                                         command:
                                           description: 'Entrypoint array. Not executed
-                                            within a shell. The container image''s
-                                            ENTRYPOINT is used if this is not provided.
-                                            Variable references $(VAR_NAME) are expanded
-                                            using the container''s environment. If
-                                            a variable cannot be resolved, the reference
-                                            in the input string will be unchanged.
-                                            Double $$ are reduced to a single $, which
-                                            allows for escaping the $(VAR_NAME) syntax:
-                                            i.e. "$$(VAR_NAME)" will produce the string
+                                            within a shell. The docker image''s ENTRYPOINT
+                                            is used if this is not provided. Variable
+                                            references $(VAR_NAME) are expanded using
+                                            the container''s environment. If a variable
+                                            cannot be resolved, the reference in the
+                                            input string will be unchanged. Double
+                                            $$ are reduced to a single $, which allows
+                                            for escaping the $(VAR_NAME) syntax: i.e.
+                                            "$$(VAR_NAME)" will produce the string
                                             literal "$(VAR_NAME)". Escaped references
                                             will never be expanded, regardless of
                                             whether the variable exists or not. Cannot
@@ -427,8 +422,8 @@ spec:
                                             type: object
                                           type: array
                                         image:
-                                          description: 'Container image name. More
-                                            info: https://kubernetes.io/docs/concepts/containers/images
+                                          description: 'Docker image name. More info:
+                                            https://kubernetes.io/docs/concepts/containers/images
                                             This field is optional to allow higher
                                             level config management to default or
                                             override container images in workload
@@ -456,8 +451,9 @@ spec:
                                                 info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
                                               properties:
                                                 exec:
-                                                  description: Exec specifies the
-                                                    action to take.
+                                                  description: One and only one of
+                                                    the following should be specified.
+                                                    Exec specifies the action to take.
                                                   properties:
                                                     command:
                                                       description: Command is the
@@ -533,13 +529,11 @@ spec:
                                                   - port
                                                   type: object
                                                 tcpSocket:
-                                                  description: Deprecated. TCPSocket
-                                                    is NOT supported as a LifecycleHandler
-                                                    and kept for the backward compatibility.
-                                                    There are no validation of this
-                                                    field and lifecycle hooks will
-                                                    fail in runtime when tcp handler
-                                                    is specified.
+                                                  description: 'TCPSocket specifies
+                                                    an action involving a TCP port.
+                                                    TCP hooks not yet supported TODO:
+                                                    implement a realistic TCP lifecycle
+                                                    hook'
                                                   properties:
                                                     host:
                                                       description: 'Optional: Host
@@ -567,21 +561,23 @@ spec:
                                                 such as liveness/startup probe failure,
                                                 preemption, resource contention, etc.
                                                 The handler is not called if the container
-                                                crashes or exits. The Pod''s termination
-                                                grace period countdown begins before
-                                                the PreStop hook is executed. Regardless
-                                                of the outcome of the handler, the
-                                                container will eventually terminate
-                                                within the Pod''s termination grace
-                                                period (unless delayed by finalizers).
-                                                Other management of the container
-                                                blocks until the hook completes or
-                                                until the termination grace period
-                                                is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+                                                crashes or exits. The reason for termination
+                                                is passed to the handler. The Pod''s
+                                                termination grace period countdown
+                                                begins before the PreStop hooked is
+                                                executed. Regardless of the outcome
+                                                of the handler, the container will
+                                                eventually terminate within the Pod''s
+                                                termination grace period. Other management
+                                                of the container blocks until the
+                                                hook completes or until the termination
+                                                grace period is reached. More info:
+                                                https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
                                               properties:
                                                 exec:
-                                                  description: Exec specifies the
-                                                    action to take.
+                                                  description: One and only one of
+                                                    the following should be specified.
+                                                    Exec specifies the action to take.
                                                   properties:
                                                     command:
                                                       description: Command is the
@@ -657,13 +653,11 @@ spec:
                                                   - port
                                                   type: object
                                                 tcpSocket:
-                                                  description: Deprecated. TCPSocket
-                                                    is NOT supported as a LifecycleHandler
-                                                    and kept for the backward compatibility.
-                                                    There are no validation of this
-                                                    field and lifecycle hooks will
-                                                    fail in runtime when tcp handler
-                                                    is specified.
+                                                  description: 'TCPSocket specifies
+                                                    an action involving a TCP port.
+                                                    TCP hooks not yet supported TODO:
+                                                    implement a realistic TCP lifecycle
+                                                    hook'
                                                   properties:
                                                     host:
                                                       description: 'Optional: Host
@@ -692,8 +686,9 @@ spec:
                                             More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
                                           properties:
                                             exec:
-                                              description: Exec specifies the action
-                                                to take.
+                                              description: One and only one of the
+                                                following should be specified. Exec
+                                                specifies the action to take.
                                               properties:
                                                 command:
                                                   description: Command is the command
@@ -720,29 +715,6 @@ spec:
                                                 3. Minimum value is 1.
                                               format: int32
                                               type: integer
-                                            grpc:
-                                              description: GRPC specifies an action
-                                                involving a GRPC port. This is a beta
-                                                field and requires enabling GRPCContainerProbe
-                                                feature gate.
-                                              properties:
-                                                port:
-                                                  description: Port number of the
-                                                    gRPC service. Number must be in
-                                                    the range 1 to 65535.
-                                                  format: int32
-                                                  type: integer
-                                                service:
-                                                  description: "Service is the name
-                                                    of the service to place in the
-                                                    gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                                    \n If this is not specified, the
-                                                    default behavior is defined by
-                                                    gRPC."
-                                                  type: string
-                                              required:
-                                              - port
-                                              type: object
                                             httpGet:
                                               description: HTTPGet specifies the http
                                                 request to perform.
@@ -816,8 +788,10 @@ spec:
                                               format: int32
                                               type: integer
                                             tcpSocket:
-                                              description: TCPSocket specifies an
-                                                action involving a TCP port.
+                                              description: 'TCPSocket specifies an
+                                                action involving a TCP port. TCP hooks
+                                                not yet supported TODO: implement
+                                                a realistic TCP lifecycle hook'
                                               properties:
                                                 host:
                                                   description: 'Optional: Host name
@@ -918,7 +892,6 @@ spec:
                                                   by services.
                                                 type: string
                                               protocol:
-                                                default: TCP
                                                 description: Protocol for port. Must
                                                   be UDP, TCP, or SCTP. Defaults to
                                                   "TCP".
@@ -939,8 +912,9 @@ spec:
                                             Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
                                           properties:
                                             exec:
-                                              description: Exec specifies the action
-                                                to take.
+                                              description: One and only one of the
+                                                following should be specified. Exec
+                                                specifies the action to take.
                                               properties:
                                                 command:
                                                   description: Command is the command
@@ -967,29 +941,6 @@ spec:
                                                 3. Minimum value is 1.
                                               format: int32
                                               type: integer
-                                            grpc:
-                                              description: GRPC specifies an action
-                                                involving a GRPC port. This is a beta
-                                                field and requires enabling GRPCContainerProbe
-                                                feature gate.
-                                              properties:
-                                                port:
-                                                  description: Port number of the
-                                                    gRPC service. Number must be in
-                                                    the range 1 to 65535.
-                                                  format: int32
-                                                  type: integer
-                                                service:
-                                                  description: "Service is the name
-                                                    of the service to place in the
-                                                    gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                                    \n If this is not specified, the
-                                                    default behavior is defined by
-                                                    gRPC."
-                                                  type: string
-                                              required:
-                                              - port
-                                              type: object
                                             httpGet:
                                               description: HTTPGet specifies the http
                                                 request to perform.
@@ -1063,8 +1014,10 @@ spec:
                                               format: int32
                                               type: integer
                                             tcpSocket:
-                                              description: TCPSocket specifies an
-                                                action involving a TCP port.
+                                              description: 'TCPSocket specifies an
+                                                action involving a TCP port. TCP hooks
+                                                not yet supported TODO: implement
+                                                a realistic TCP lifecycle hook'
                                               properties:
                                                 host:
                                                   description: 'Optional: Host name
@@ -1162,17 +1115,13 @@ spec:
                                                 no_new_privs flag will be set on the
                                                 container process. AllowPrivilegeEscalation
                                                 is true always when the container
-                                                is: 1) run as Privileged 2) has CAP_SYS_ADMIN
-                                                Note that this field cannot be set
-                                                when spec.os.name is windows.'
+                                                is: 1) run as Privileged 2) has CAP_SYS_ADMIN'
                                               type: boolean
                                             capabilities:
                                               description: The capabilities to add/drop
                                                 when running containers. Defaults
                                                 to the default set of capabilities
                                                 granted by the container runtime.
-                                                Note that this field cannot be set
-                                                when spec.os.name is windows.
                                               properties:
                                                 add:
                                                   description: Added capabilities
@@ -1193,9 +1142,7 @@ spec:
                                               description: Run container in privileged
                                                 mode. Processes in privileged containers
                                                 are essentially equivalent to root
-                                                on the host. Defaults to false. Note
-                                                that this field cannot be set when
-                                                spec.os.name is windows.
+                                                on the host. Defaults to false.
                                               type: boolean
                                             procMount:
                                               description: procMount denotes the type
@@ -1204,15 +1151,12 @@ spec:
                                                 uses the container runtime defaults
                                                 for readonly paths and masked paths.
                                                 This requires the ProcMountType feature
-                                                flag to be enabled. Note that this
-                                                field cannot be set when spec.os.name
-                                                is windows.
+                                                flag to be enabled.
                                               type: string
                                             readOnlyRootFilesystem:
                                               description: Whether this container
                                                 has a read-only root filesystem. Default
-                                                is false. Note that this field cannot
-                                                be set when spec.os.name is windows.
+                                                is false.
                                               type: boolean
                                             runAsGroup:
                                               description: The GID to run the entrypoint
@@ -1221,9 +1165,7 @@ spec:
                                                 in PodSecurityContext.  If set in
                                                 both SecurityContext and PodSecurityContext,
                                                 the value specified in SecurityContext
-                                                takes precedence. Note that this field
-                                                cannot be set when spec.os.name is
-                                                windows.
+                                                takes precedence.
                                               format: int64
                                               type: integer
                                             runAsNonRoot:
@@ -1248,9 +1190,7 @@ spec:
                                                 PodSecurityContext.  If set in both
                                                 SecurityContext and PodSecurityContext,
                                                 the value specified in SecurityContext
-                                                takes precedence. Note that this field
-                                                cannot be set when spec.os.name is
-                                                windows.
+                                                takes precedence.
                                               format: int64
                                               type: integer
                                             seLinuxOptions:
@@ -1261,9 +1201,7 @@ spec:
                                                 container.  May also be set in PodSecurityContext.  If
                                                 set in both SecurityContext and PodSecurityContext,
                                                 the value specified in SecurityContext
-                                                takes precedence. Note that this field
-                                                cannot be set when spec.os.name is
-                                                windows.
+                                                takes precedence.
                                               properties:
                                                 level:
                                                   description: Level is SELinux level
@@ -1287,9 +1225,7 @@ spec:
                                                 use by this container. If seccomp
                                                 options are provided at both the pod
                                                 & container level, the container options
-                                                override the pod options. Note that
-                                                this field cannot be set when spec.os.name
-                                                is windows.
+                                                override the pod options.
                                               properties:
                                                 localhostProfile:
                                                   description: localhostProfile indicates
@@ -1322,8 +1258,7 @@ spec:
                                                 will be used. If set in both SecurityContext
                                                 and PodSecurityContext, the value
                                                 specified in SecurityContext takes
-                                                precedence. Note that this field cannot
-                                                be set when spec.os.name is linux.
+                                                precedence.
                                               properties:
                                                 gmsaCredentialSpec:
                                                   description: GMSACredentialSpec
@@ -1385,8 +1320,9 @@ spec:
                                             updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
                                           properties:
                                             exec:
-                                              description: Exec specifies the action
-                                                to take.
+                                              description: One and only one of the
+                                                following should be specified. Exec
+                                                specifies the action to take.
                                               properties:
                                                 command:
                                                   description: Command is the command
@@ -1413,29 +1349,6 @@ spec:
                                                 3. Minimum value is 1.
                                               format: int32
                                               type: integer
-                                            grpc:
-                                              description: GRPC specifies an action
-                                                involving a GRPC port. This is a beta
-                                                field and requires enabling GRPCContainerProbe
-                                                feature gate.
-                                              properties:
-                                                port:
-                                                  description: Port number of the
-                                                    gRPC service. Number must be in
-                                                    the range 1 to 65535.
-                                                  format: int32
-                                                  type: integer
-                                                service:
-                                                  description: "Service is the name
-                                                    of the service to place in the
-                                                    gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md).
-                                                    \n If this is not specified, the
-                                                    default behavior is defined by
-                                                    gRPC."
-                                                  type: string
-                                              required:
-                                              - port
-                                              type: object
                                             httpGet:
                                               description: HTTPGet specifies the http
                                                 request to perform.
@@ -1509,8 +1422,10 @@ spec:
                                               format: int32
                                               type: integer
                                             tcpSocket:
-                                              description: TCPSocket specifies an
-                                                action involving a TCP port.
+                                              description: 'TCPSocket specifies an
+                                                action involving a TCP port. TCP hooks
+                                                not yet supported TODO: implement
+                                                a realistic TCP lifecycle hook'
                                               properties:
                                                 host:
                                                   description: 'Optional: Host name
@@ -1787,61 +1702,6 @@ spec:
                   included in the map will be restored into namespaces of the same
                   name.
                 type: object
-              orLabelSelectors:
-                description: OrLabelSelectors is list of metav1.LabelSelector to filter
-                  with when restoring individual objects from the backup. If multiple
-                  provided they will be joined by the OR operator. LabelSelector as
-                  well as OrLabelSelectors cannot co-exist in restore request, only
-                  one of them can be used
-                items:
-                  description: A label selector is a label query over a set of resources.
-                    The result of matchLabels and matchExpressions are ANDed. An empty
-                    label selector matches all objects. A null label selector matches
-                    no objects.
-                  properties:
-                    matchExpressions:
-                      description: matchExpressions is a list of label selector requirements.
-                        The requirements are ANDed.
-                      items:
-                        description: A label selector requirement is a selector that
-                          contains values, a key, and an operator that relates the
-                          key and values.
-                        properties:
-                          key:
-                            description: key is the label key that the selector applies
-                              to.
-                            type: string
-                          operator:
-                            description: operator represents a key's relationship
-                              to a set of values. Valid operators are In, NotIn, Exists
-                              and DoesNotExist.
-                            type: string
-                          values:
-                            description: values is an array of string values. If the
-                              operator is In or NotIn, the values array must be non-empty.
-                              If the operator is Exists or DoesNotExist, the values
-                              array must be empty. This array is replaced during a
-                              strategic merge patch.
-                            items:
-                              type: string
-                            type: array
-                        required:
-                        - key
-                        - operator
-                        type: object
-                      type: array
-                    matchLabels:
-                      additionalProperties:
-                        type: string
-                      description: matchLabels is a map of {key,value} pairs. A single
-                        {key,value} in the matchLabels map is equivalent to an element
-                        of matchExpressions, whose key field is "key", the operator
-                        is "In", and the values array contains only "value". The requirements
-                        are ANDed.
-                      type: object
-                  type: object
-                nullable: true
-                type: array
               preserveNodePorts:
                 description: PreserveNodePorts specifies whether to restore old nodePorts
                   from backup.
@@ -1852,26 +1712,6 @@ spec:
                   PVs from snapshot (via the cloudprovider).
                 nullable: true
                 type: boolean
-              restoreStatus:
-                description: RestoreStatus specifies which resources we should restore
-                  the status field. If nil, no objects are included. Optional.
-                nullable: true
-                properties:
-                  excludedResources:
-                    description: ExcludedResources specifies the resources to which
-                      will not restore the status.
-                    items:
-                      type: string
-                    nullable: true
-                    type: array
-                  includedResources:
-                    description: IncludedResources specifies the resources to which
-                      will restore the status. If empty, it applies to all resources.
-                    items:
-                      type: string
-                    nullable: true
-                    type: array
-                type: object
               scheduleName:
                 description: ScheduleName is the unique name of the Velero schedule
                   to restore from. If specified, and BackupName is empty, Velero will

config/crd/v1/bases/velero.io_schedules.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: schedules.velero.io
 spec:
@@ -16,23 +16,7 @@ spec:
     singular: schedule
   scope: Namespaced
   versions:
-  - additionalPrinterColumns:
-    - description: Status of the schedule
-      jsonPath: .status.phase
-      name: Status
-      type: string
-    - description: A Cron expression defining when to run the Backup
-      jsonPath: .spec.schedule
-      name: Schedule
-      type: string
-    - description: The last time a Backup was run for this schedule
-      jsonPath: .status.lastBackup
-      name: LastBackup
-      type: date
-    - jsonPath: .metadata.creationTimestamp
-      name: Age
-      type: date
-    name: v1
+  - name: v1
     schema:
       openAPIV3Schema:
         description: Schedule is a Velero resource that represents a pre-scheduled
@@ -61,11 +45,6 @@ spec:
                 description: Template is the definition of the Backup to be run on
                   the provided schedule
                 properties:
-                  csiSnapshotTimeout:
-                    description: CSISnapshotTimeout specifies the time used to wait
-                      for CSI VolumeSnapshot status turns to ReadyToUse during creation,
-                      before returning error as timeout. The default value is 10 minute.
-                    type: string
                   defaultVolumesToRestic:
                     description: DefaultVolumesToRestic specifies whether restic should
                       be used to take a backup of all pod volumes by default.
@@ -348,61 +327,6 @@ spec:
                           type: string
                         type: object
                     type: object
-                  orLabelSelectors:
-                    description: OrLabelSelectors is list of metav1.LabelSelector
-                      to filter with when adding individual objects to the backup.
-                      If multiple provided they will be joined by the OR operator.
-                      LabelSelector as well as OrLabelSelectors cannot co-exist in
-                      backup request, only one of them can be used.
-                    items:
-                      description: A label selector is a label query over a set of
-                        resources. The result of matchLabels and matchExpressions
-                        are ANDed. An empty label selector matches all objects. A
-                        null label selector matches no objects.
-                      properties:
-                        matchExpressions:
-                          description: matchExpressions is a list of label selector
-                            requirements. The requirements are ANDed.
-                          items:
-                            description: A label selector requirement is a selector
-                              that contains values, a key, and an operator that relates
-                              the key and values.
-                            properties:
-                              key:
-                                description: key is the label key that the selector
-                                  applies to.
-                                type: string
-                              operator:
-                                description: operator represents a key's relationship
-                                  to a set of values. Valid operators are In, NotIn,
-                                  Exists and DoesNotExist.
-                                type: string
-                              values:
-                                description: values is an array of string values.
-                                  If the operator is In or NotIn, the values array
-                                  must be non-empty. If the operator is Exists or
-                                  DoesNotExist, the values array must be empty. This
-                                  array is replaced during a strategic merge patch.
-                                items:
-                                  type: string
-                                type: array
-                            required:
-                            - key
-                            - operator
-                            type: object
-                          type: array
-                        matchLabels:
-                          additionalProperties:
-                            type: string
-                          description: matchLabels is a map of {key,value} pairs.
-                            A single {key,value} in the matchLabels map is equivalent
-                            to an element of matchExpressions, whose key field is
-                            "key", the operator is "In", and the values array contains
-                            only "value". The requirements are ANDed.
-                          type: object
-                      type: object
-                    nullable: true
-                    type: array
                   orderedResources:
                     additionalProperties:
                       type: string
@@ -469,7 +393,6 @@ spec:
         type: object
     served: true
     storage: true
-    subresources: {}
 status:
   acceptedNames:
     kind: ""

config/crd/v1/bases/velero.io_serverstatusrequests.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: serverstatusrequests.velero.io
 spec:
@@ -77,6 +77,8 @@ spec:
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""

config/crd/v1/bases/velero.io_volumesnapshotlocations.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: volumesnapshotlocations.velero.io
 spec:

config/crd/v1beta1/bases/velero.io_backups.yaml

@@ -0,0 +1,439 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: backups.velero.io
+spec:
+  group: velero.io
+  names:
+    kind: Backup
+    listKind: BackupList
+    plural: backups
+    singular: backup
+  preserveUnknownFields: false
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      description: Backup is a Velero resource that represents the capture of Kubernetes
+        cluster state at a point in time (API objects and associated volume state).
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: BackupSpec defines the specification for a Velero backup.
+          properties:
+            defaultVolumesToRestic:
+              description: DefaultVolumesToRestic specifies whether restic should
+                be used to take a backup of all pod volumes by default.
+              type: boolean
+            excludedNamespaces:
+              description: ExcludedNamespaces contains a list of namespaces that are
+                not included in the backup.
+              items:
+                type: string
+              nullable: true
+              type: array
+            excludedResources:
+              description: ExcludedResources is a slice of resource names that are
+                not included in the backup.
+              items:
+                type: string
+              nullable: true
+              type: array
+            hooks:
+              description: Hooks represent custom behaviors that should be executed
+                at different phases of the backup.
+              properties:
+                resources:
+                  description: Resources are hooks that should be executed when backing
+                    up individual instances of a resource.
+                  items:
+                    description: BackupResourceHookSpec defines one or more BackupResourceHooks
+                      that should be executed based on the rules defined for namespaces,
+                      resources, and label selector.
+                    properties:
+                      excludedNamespaces:
+                        description: ExcludedNamespaces specifies the namespaces to
+                          which this hook spec does not apply.
+                        items:
+                          type: string
+                        nullable: true
+                        type: array
+                      excludedResources:
+                        description: ExcludedResources specifies the resources to
+                          which this hook spec does not apply.
+                        items:
+                          type: string
+                        nullable: true
+                        type: array
+                      includedNamespaces:
+                        description: IncludedNamespaces specifies the namespaces to
+                          which this hook spec applies. If empty, it applies to all
+                          namespaces.
+                        items:
+                          type: string
+                        nullable: true
+                        type: array
+                      includedResources:
+                        description: IncludedResources specifies the resources to
+                          which this hook spec applies. If empty, it applies to all
+                          resources.
+                        items:
+                          type: string
+                        nullable: true
+                        type: array
+                      labelSelector:
+                        description: LabelSelector, if specified, filters the resources
+                          to which this hook spec applies.
+                        nullable: true
+                        properties:
+                          matchExpressions:
+                            description: matchExpressions is a list of label selector
+                              requirements. The requirements are ANDed.
+                            items:
+                              description: A label selector requirement is a selector
+                                that contains values, a key, and an operator that
+                                relates the key and values.
+                              properties:
+                                key:
+                                  description: key is the label key that the selector
+                                    applies to.
+                                  type: string
+                                operator:
+                                  description: operator represents a key's relationship
+                                    to a set of values. Valid operators are In, NotIn,
+                                    Exists and DoesNotExist.
+                                  type: string
+                                values:
+                                  description: values is an array of string values.
+                                    If the operator is In or NotIn, the values array
+                                    must be non-empty. If the operator is Exists or
+                                    DoesNotExist, the values array must be empty.
+                                    This array is replaced during a strategic merge
+                                    patch.
+                                  items:
+                                    type: string
+                                  type: array
+                              required:
+                              - key
+                              - operator
+                              type: object
+                            type: array
+                          matchLabels:
+                            additionalProperties:
+                              type: string
+                            description: matchLabels is a map of {key,value} pairs.
+                              A single {key,value} in the matchLabels map is equivalent
+                              to an element of matchExpressions, whose key field is
+                              "key", the operator is "In", and the values array contains
+                              only "value". The requirements are ANDed.
+                            type: object
+                        type: object
+                      name:
+                        description: Name is the name of this hook.
+                        type: string
+                      post:
+                        description: PostHooks is a list of BackupResourceHooks to
+                          execute after storing the item in the backup. These are
+                          executed after all "additional items" from item actions
+                          are processed.
+                        items:
+                          description: BackupResourceHook defines a hook for a resource.
+                          properties:
+                            exec:
+                              description: Exec defines an exec hook.
+                              properties:
+                                command:
+                                  description: Command is the command and arguments
+                                    to execute.
+                                  items:
+                                    type: string
+                                  minItems: 1
+                                  type: array
+                                container:
+                                  description: Container is the container in the pod
+                                    where the command should be executed. If not specified,
+                                    the pod's first container is used.
+                                  type: string
+                                onError:
+                                  description: OnError specifies how Velero should
+                                    behave if it encounters an error executing this
+                                    hook.
+                                  enum:
+                                  - Continue
+                                  - Fail
+                                  type: string
+                                timeout:
+                                  description: Timeout defines the maximum amount
+                                    of time Velero should wait for the hook to complete
+                                    before considering the execution a failure.
+                                  type: string
+                              required:
+                              - command
+                              type: object
+                          required:
+                          - exec
+                          type: object
+                        type: array
+                      pre:
+                        description: PreHooks is a list of BackupResourceHooks to
+                          execute prior to storing the item in the backup. These are
+                          executed before any "additional items" from item actions
+                          are processed.
+                        items:
+                          description: BackupResourceHook defines a hook for a resource.
+                          properties:
+                            exec:
+                              description: Exec defines an exec hook.
+                              properties:
+                                command:
+                                  description: Command is the command and arguments
+                                    to execute.
+                                  items:
+                                    type: string
+                                  minItems: 1
+                                  type: array
+                                container:
+                                  description: Container is the container in the pod
+                                    where the command should be executed. If not specified,
+                                    the pod's first container is used.
+                                  type: string
+                                onError:
+                                  description: OnError specifies how Velero should
+                                    behave if it encounters an error executing this
+                                    hook.
+                                  enum:
+                                  - Continue
+                                  - Fail
+                                  type: string
+                                timeout:
+                                  description: Timeout defines the maximum amount
+                                    of time Velero should wait for the hook to complete
+                                    before considering the execution a failure.
+                                  type: string
+                              required:
+                              - command
+                              type: object
+                          required:
+                          - exec
+                          type: object
+                        type: array
+                    required:
+                    - name
+                    type: object
+                  nullable: true
+                  type: array
+              type: object
+            includeClusterResources:
+              description: IncludeClusterResources specifies whether cluster-scoped
+                resources should be included for consideration in the backup.
+              nullable: true
+              type: boolean
+            includedNamespaces:
+              description: IncludedNamespaces is a slice of namespace names to include
+                objects from. If empty, all namespaces are included.
+              items:
+                type: string
+              nullable: true
+              type: array
+            includedResources:
+              description: IncludedResources is a slice of resource names to include
+                in the backup. If empty, all resources are included.
+              items:
+                type: string
+              nullable: true
+              type: array
+            labelSelector:
+              description: LabelSelector is a metav1.LabelSelector to filter with
+                when adding individual objects to the backup. If empty or nil, all
+                objects are included. Optional.
+              nullable: true
+              properties:
+                matchExpressions:
+                  description: matchExpressions is a list of label selector requirements.
+                    The requirements are ANDed.
+                  items:
+                    description: A label selector requirement is a selector that contains
+                      values, a key, and an operator that relates the key and values.
+                    properties:
+                      key:
+                        description: key is the label key that the selector applies
+                          to.
+                        type: string
+                      operator:
+                        description: operator represents a key's relationship to a
+                          set of values. Valid operators are In, NotIn, Exists and
+                          DoesNotExist.
+                        type: string
+                      values:
+                        description: values is an array of string values. If the operator
+                          is In or NotIn, the values array must be non-empty. If the
+                          operator is Exists or DoesNotExist, the values array must
+                          be empty. This array is replaced during a strategic merge
+                          patch.
+                        items:
+                          type: string
+                        type: array
+                    required:
+                    - key
+                    - operator
+                    type: object
+                  type: array
+                matchLabels:
+                  additionalProperties:
+                    type: string
+                  description: matchLabels is a map of {key,value} pairs. A single
+                    {key,value} in the matchLabels map is equivalent to an element
+                    of matchExpressions, whose key field is "key", the operator is
+                    "In", and the values array contains only "value". The requirements
+                    are ANDed.
+                  type: object
+              type: object
+            metadata:
+              properties:
+                labels:
+                  additionalProperties:
+                    type: string
+                  type: object
+              type: object
+            orderedResources:
+              additionalProperties:
+                type: string
+              description: OrderedResources specifies the backup order of resources
+                of specific Kind. The map key is the Kind name and value is a list
+                of resource names separated by commas. Each resource name has format
+                "namespace/resourcename".  For cluster resources, simply use "resourcename".
+              nullable: true
+              type: object
+            snapshotVolumes:
+              description: SnapshotVolumes specifies whether to take cloud snapshots
+                of any PV's referenced in the set of objects included in the Backup.
+              nullable: true
+              type: boolean
+            storageLocation:
+              description: StorageLocation is a string containing the name of a BackupStorageLocation
+                where the backup should be stored.
+              type: string
+            ttl:
+              description: TTL is a time.Duration-parseable string describing how
+                long the Backup should be retained for.
+              type: string
+            volumeSnapshotLocations:
+              description: VolumeSnapshotLocations is a list containing names of VolumeSnapshotLocations
+                associated with this backup.
+              items:
+                type: string
+              type: array
+          type: object
+        status:
+          description: BackupStatus captures the current status of a Velero backup.
+          properties:
+            completionTimestamp:
+              description: CompletionTimestamp records the time a backup was completed.
+                Completion time is recorded even on failed backups. Completion time
+                is recorded before uploading the backup object. The server's time
+                is used for CompletionTimestamps
+              format: date-time
+              nullable: true
+              type: string
+            errors:
+              description: Errors is a count of all error messages that were generated
+                during execution of the backup.  The actual errors are in the backup's
+                log file in object storage.
+              type: integer
+            expiration:
+              description: Expiration is when this Backup is eligible for garbage-collection.
+              format: date-time
+              nullable: true
+              type: string
+            formatVersion:
+              description: FormatVersion is the backup format version, including major,
+                minor, and patch version.
+              type: string
+            phase:
+              description: Phase is the current state of the Backup.
+              enum:
+              - New
+              - FailedValidation
+              - InProgress
+              - Completed
+              - PartiallyFailed
+              - Failed
+              - Deleting
+              type: string
+            progress:
+              description: Progress contains information about the backup's execution
+                progress. Note that this information is best-effort only -- if Velero
+                fails to update it during a backup for any reason, it may be inaccurate/stale.
+              nullable: true
+              properties:
+                itemsBackedUp:
+                  description: ItemsBackedUp is the number of items that have actually
+                    been written to the backup tarball so far.
+                  type: integer
+                totalItems:
+                  description: TotalItems is the total number of items to be backed
+                    up. This number may change throughout the execution of the backup
+                    due to plugins that return additional related items to back up,
+                    the velero.io/exclude-from-backup label, and various other filters
+                    that happen as items are processed.
+                  type: integer
+              type: object
+            startTimestamp:
+              description: StartTimestamp records the time a backup was started. Separate
+                from CreationTimestamp, since that value changes on restores. The
+                server's time is used for StartTimestamps
+              format: date-time
+              nullable: true
+              type: string
+            validationErrors:
+              description: ValidationErrors is a slice of all validation errors (if
+                applicable).
+              items:
+                type: string
+              nullable: true
+              type: array
+            version:
+              description: 'Version is the backup format major version. Deprecated:
+                Please see FormatVersion'
+              type: integer
+            volumeSnapshotsAttempted:
+              description: VolumeSnapshotsAttempted is the total number of attempted
+                volume snapshots for this backup.
+              type: integer
+            volumeSnapshotsCompleted:
+              description: VolumeSnapshotsCompleted is the total number of successfully
+                completed volume snapshots for this backup.
+              type: integer
+            warnings:
+              description: Warnings is a count of all warning messages that were generated
+                during execution of the backup. The actual warnings are in the backup's
+                log file in object storage.
+              type: integer
+          type: object
+      type: object
+  version: v1
+  versions:
+  - name: v1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/v1beta1/bases/velero.io_backupstoragelocations.yaml

@@ -0,0 +1,179 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: backupstoragelocations.velero.io
+spec:
+  additionalPrinterColumns:
+  - JSONPath: .status.phase
+    description: Backup Storage Location status such as Available/Unavailable
+    name: Phase
+    type: string
+  - JSONPath: .status.lastValidationTime
+    description: LastValidationTime is the last time the backup store location was
+      validated
+    name: Last Validated
+    type: date
+  - JSONPath: .metadata.creationTimestamp
+    name: Age
+    type: date
+  - JSONPath: .spec.default
+    description: Default backup storage location
+    name: Default
+    type: boolean
+  group: velero.io
+  names:
+    kind: BackupStorageLocation
+    listKind: BackupStorageLocationList
+    plural: backupstoragelocations
+    shortNames:
+    - bsl
+    singular: backupstoragelocation
+  preserveUnknownFields: false
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: BackupStorageLocation is a location where Velero stores backup
+        objects
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: BackupStorageLocationSpec defines the desired state of a Velero
+            BackupStorageLocation
+          properties:
+            accessMode:
+              description: AccessMode defines the permissions for the backup storage
+                location.
+              enum:
+              - ReadOnly
+              - ReadWrite
+              type: string
+            backupSyncPeriod:
+              description: BackupSyncPeriod defines how frequently to sync backup
+                API objects from object storage. A value of 0 disables sync.
+              nullable: true
+              type: string
+            config:
+              additionalProperties:
+                type: string
+              description: Config is for provider-specific configuration fields.
+              type: object
+            credential:
+              description: Credential contains the credential information intended
+                to be used with this location
+              properties:
+                key:
+                  description: The key of the secret to select from.  Must be a valid
+                    secret key.
+                  type: string
+                name:
+                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                    TODO: Add other useful fields. apiVersion, kind, uid?'
+                  type: string
+                optional:
+                  description: Specify whether the Secret or its key must be defined
+                  type: boolean
+              required:
+              - key
+              type: object
+            default:
+              description: Default indicates this location is the default backup storage
+                location.
+              type: boolean
+            objectStorage:
+              description: ObjectStorageLocation specifies the settings necessary
+                to connect to a provider's object storage.
+              properties:
+                bucket:
+                  description: Bucket is the bucket to use for object storage.
+                  type: string
+                caCert:
+                  description: CACert defines a CA bundle to use when verifying TLS
+                    connections to the provider.
+                  format: byte
+                  type: string
+                prefix:
+                  description: Prefix is the path inside a bucket to use for Velero
+                    storage. Optional.
+                  type: string
+              required:
+              - bucket
+              type: object
+            provider:
+              description: Provider is the provider of the backup storage.
+              type: string
+            validationFrequency:
+              description: ValidationFrequency defines how frequently to validate
+                the corresponding object storage. A value of 0 disables validation.
+              nullable: true
+              type: string
+          required:
+          - objectStorage
+          - provider
+          type: object
+        status:
+          description: BackupStorageLocationStatus defines the observed state of BackupStorageLocation
+          properties:
+            accessMode:
+              description: "AccessMode is an unused field. \n Deprecated: there is
+                now an AccessMode field on the Spec and this field will be removed
+                entirely as of v2.0."
+              enum:
+              - ReadOnly
+              - ReadWrite
+              type: string
+            lastSyncedRevision:
+              description: "LastSyncedRevision is the value of the `metadata/revision`
+                file in the backup storage location the last time the BSL's contents
+                were synced into the cluster. \n Deprecated: this field is no longer
+                updated or used for detecting changes to the location's contents and
+                will be removed entirely in v2.0."
+              type: string
+            lastSyncedTime:
+              description: LastSyncedTime is the last time the contents of the location
+                were synced into the cluster.
+              format: date-time
+              nullable: true
+              type: string
+            lastValidationTime:
+              description: LastValidationTime is the last time the backup store location
+                was validated the cluster.
+              format: date-time
+              nullable: true
+              type: string
+            phase:
+              description: Phase is the current state of the BackupStorageLocation.
+              enum:
+              - Available
+              - Unavailable
+              type: string
+          type: object
+      type: object
+  version: v1
+  versions:
+  - name: v1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/v1beta1/bases/velero.io_deletebackuprequests.yaml

@@ -0,0 +1,73 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: deletebackuprequests.velero.io
+spec:
+  group: velero.io
+  names:
+    kind: DeleteBackupRequest
+    listKind: DeleteBackupRequestList
+    plural: deletebackuprequests
+    singular: deletebackuprequest
+  preserveUnknownFields: false
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      description: DeleteBackupRequest is a request to delete one or more backups.
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: DeleteBackupRequestSpec is the specification for which backups
+            to delete.
+          properties:
+            backupName:
+              type: string
+          required:
+          - backupName
+          type: object
+        status:
+          description: DeleteBackupRequestStatus is the current status of a DeleteBackupRequest.
+          properties:
+            errors:
+              description: Errors contains any errors that were encountered during
+                the deletion process.
+              items:
+                type: string
+              nullable: true
+              type: array
+            phase:
+              description: Phase is the current state of the DeleteBackupRequest.
+              enum:
+              - New
+              - InProgress
+              - Processed
+              type: string
+          type: object
+      type: object
+  version: v1
+  versions:
+  - name: v1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/v1beta1/bases/velero.io_downloadrequests.yaml

@@ -0,0 +1,96 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: downloadrequests.velero.io
+spec:
+  group: velero.io
+  names:
+    kind: DownloadRequest
+    listKind: DownloadRequestList
+    plural: downloadrequests
+    singular: downloadrequest
+  preserveUnknownFields: false
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: DownloadRequest is a request to download an artifact from backup
+        object storage, such as a backup log file.
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: DownloadRequestSpec is the specification for a download request.
+          properties:
+            target:
+              description: Target is what to download (e.g. logs for a backup).
+              properties:
+                kind:
+                  description: Kind is the type of file to download.
+                  enum:
+                  - BackupLog
+                  - BackupContents
+                  - BackupVolumeSnapshots
+                  - BackupResourceList
+                  - RestoreLog
+                  - RestoreResults
+                  type: string
+                name:
+                  description: Name is the name of the kubernetes resource with which
+                    the file is associated.
+                  type: string
+              required:
+              - kind
+              - name
+              type: object
+          required:
+          - target
+          type: object
+        status:
+          description: DownloadRequestStatus is the current status of a DownloadRequest.
+          properties:
+            downloadURL:
+              description: DownloadURL contains the pre-signed URL for the target
+                file.
+              type: string
+            expiration:
+              description: Expiration is when this DownloadRequest expires and can
+                be deleted by the system.
+              format: date-time
+              nullable: true
+              type: string
+            phase:
+              description: Phase is the current state of the DownloadRequest.
+              enum:
+              - New
+              - Processed
+              type: string
+          type: object
+      type: object
+  version: v1
+  versions:
+  - name: v1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/v1beta1/bases/velero.io_podvolumebackups.yaml

@@ -0,0 +1,162 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: podvolumebackups.velero.io
+spec:
+  group: velero.io
+  names:
+    kind: PodVolumeBackup
+    listKind: PodVolumeBackupList
+    plural: podvolumebackups
+    singular: podvolumebackup
+  preserveUnknownFields: false
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: PodVolumeBackupSpec is the specification for a PodVolumeBackup.
+          properties:
+            backupStorageLocation:
+              description: BackupStorageLocation is the name of the backup storage
+                location where the restic repository is stored.
+              type: string
+            node:
+              description: Node is the name of the node that the Pod is running on.
+              type: string
+            pod:
+              description: Pod is a reference to the pod containing the volume to
+                be backed up.
+              properties:
+                apiVersion:
+                  description: API version of the referent.
+                  type: string
+                fieldPath:
+                  description: 'If referring to a piece of an object instead of an
+                    entire object, this string should contain a valid JSON/Go field
+                    access statement, such as desiredState.manifest.containers[2].
+                    For example, if the object reference is to a container within
+                    a pod, this would take on a value like: "spec.containers{name}"
+                    (where "name" refers to the name of the container that triggered
+                    the event) or if no container name is specified "spec.containers[2]"
+                    (container with index 2 in this pod). This syntax is chosen only
+                    to have some well-defined way of referencing a part of an object.
+                    TODO: this design is not final and this field is subject to change
+                    in the future.'
+                  type: string
+                kind:
+                  description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                  type: string
+                name:
+                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                  type: string
+                namespace:
+                  description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                  type: string
+                resourceVersion:
+                  description: 'Specific resourceVersion to which this reference is
+                    made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                  type: string
+                uid:
+                  description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                  type: string
+              type: object
+            repoIdentifier:
+              description: RepoIdentifier is the restic repository identifier.
+              type: string
+            tags:
+              additionalProperties:
+                type: string
+              description: Tags are a map of key-value pairs that should be applied
+                to the volume backup as tags.
+              type: object
+            volume:
+              description: Volume is the name of the volume within the Pod to be backed
+                up.
+              type: string
+          required:
+          - backupStorageLocation
+          - node
+          - pod
+          - repoIdentifier
+          - volume
+          type: object
+        status:
+          description: PodVolumeBackupStatus is the current status of a PodVolumeBackup.
+          properties:
+            completionTimestamp:
+              description: CompletionTimestamp records the time a backup was completed.
+                Completion time is recorded even on failed backups. Completion time
+                is recorded before uploading the backup object. The server's time
+                is used for CompletionTimestamps
+              format: date-time
+              nullable: true
+              type: string
+            message:
+              description: Message is a message about the pod volume backup's status.
+              type: string
+            path:
+              description: Path is the full path within the controller pod being backed
+                up.
+              type: string
+            phase:
+              description: Phase is the current state of the PodVolumeBackup.
+              enum:
+              - New
+              - InProgress
+              - Completed
+              - Failed
+              type: string
+            progress:
+              description: Progress holds the total number of bytes of the volume
+                and the current number of backed up bytes. This can be used to display
+                progress information about the backup operation.
+              properties:
+                bytesDone:
+                  format: int64
+                  type: integer
+                totalBytes:
+                  format: int64
+                  type: integer
+              type: object
+            snapshotID:
+              description: SnapshotID is the identifier for the snapshot of the pod
+                volume.
+              type: string
+            startTimestamp:
+              description: StartTimestamp records the time a backup was started. Separate
+                from CreationTimestamp, since that value changes on restores. The
+                server's time is used for StartTimestamps
+              format: date-time
+              nullable: true
+              type: string
+          type: object
+      type: object
+  version: v1
+  versions:
+  - name: v1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/v1beta1/bases/velero.io_podvolumerestores.yaml

@@ -0,0 +1,145 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: podvolumerestores.velero.io
+spec:
+  group: velero.io
+  names:
+    kind: PodVolumeRestore
+    listKind: PodVolumeRestoreList
+    plural: podvolumerestores
+    singular: podvolumerestore
+  preserveUnknownFields: false
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: PodVolumeRestoreSpec is the specification for a PodVolumeRestore.
+          properties:
+            backupStorageLocation:
+              description: BackupStorageLocation is the name of the backup storage
+                location where the restic repository is stored.
+              type: string
+            pod:
+              description: Pod is a reference to the pod containing the volume to
+                be restored.
+              properties:
+                apiVersion:
+                  description: API version of the referent.
+                  type: string
+                fieldPath:
+                  description: 'If referring to a piece of an object instead of an
+                    entire object, this string should contain a valid JSON/Go field
+                    access statement, such as desiredState.manifest.containers[2].
+                    For example, if the object reference is to a container within
+                    a pod, this would take on a value like: "spec.containers{name}"
+                    (where "name" refers to the name of the container that triggered
+                    the event) or if no container name is specified "spec.containers[2]"
+                    (container with index 2 in this pod). This syntax is chosen only
+                    to have some well-defined way of referencing a part of an object.
+                    TODO: this design is not final and this field is subject to change
+                    in the future.'
+                  type: string
+                kind:
+                  description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+                  type: string
+                name:
+                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
+                  type: string
+                namespace:
+                  description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
+                  type: string
+                resourceVersion:
+                  description: 'Specific resourceVersion to which this reference is
+                    made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
+                  type: string
+                uid:
+                  description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
+                  type: string
+              type: object
+            repoIdentifier:
+              description: RepoIdentifier is the restic repository identifier.
+              type: string
+            snapshotID:
+              description: SnapshotID is the ID of the volume snapshot to be restored.
+              type: string
+            volume:
+              description: Volume is the name of the volume within the Pod to be restored.
+              type: string
+          required:
+          - backupStorageLocation
+          - pod
+          - repoIdentifier
+          - snapshotID
+          - volume
+          type: object
+        status:
+          description: PodVolumeRestoreStatus is the current status of a PodVolumeRestore.
+          properties:
+            completionTimestamp:
+              description: CompletionTimestamp records the time a restore was completed.
+                Completion time is recorded even on failed restores. The server's
+                time is used for CompletionTimestamps
+              format: date-time
+              nullable: true
+              type: string
+            message:
+              description: Message is a message about the pod volume restore's status.
+              type: string
+            phase:
+              description: Phase is the current state of the PodVolumeRestore.
+              enum:
+              - New
+              - InProgress
+              - Completed
+              - Failed
+              type: string
+            progress:
+              description: Progress holds the total number of bytes of the snapshot
+                and the current number of restored bytes. This can be used to display
+                progress information about the restore operation.
+              properties:
+                bytesDone:
+                  format: int64
+                  type: integer
+                totalBytes:
+                  format: int64
+                  type: integer
+              type: object
+            startTimestamp:
+              description: StartTimestamp records the time a restore was started.
+                The server's time is used for StartTimestamps
+              format: date-time
+              nullable: true
+              type: string
+          type: object
+      type: object
+  version: v1
+  versions:
+  - name: v1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/v1beta1/bases/velero.io_resticrepositories.yaml

@@ -0,0 +1,89 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: resticrepositories.velero.io
+spec:
+  group: velero.io
+  names:
+    kind: ResticRepository
+    listKind: ResticRepositoryList
+    plural: resticrepositories
+    singular: resticrepository
+  preserveUnknownFields: false
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: ResticRepositorySpec is the specification for a ResticRepository.
+          properties:
+            backupStorageLocation:
+              description: BackupStorageLocation is the name of the BackupStorageLocation
+                that should contain this repository.
+              type: string
+            maintenanceFrequency:
+              description: MaintenanceFrequency is how often maintenance should be
+                run.
+              type: string
+            resticIdentifier:
+              description: ResticIdentifier is the full restic-compatible string for
+                identifying this repository.
+              type: string
+            volumeNamespace:
+              description: VolumeNamespace is the namespace this restic repository
+                contains pod volume backups for.
+              type: string
+          required:
+          - backupStorageLocation
+          - maintenanceFrequency
+          - resticIdentifier
+          - volumeNamespace
+          type: object
+        status:
+          description: ResticRepositoryStatus is the current status of a ResticRepository.
+          properties:
+            lastMaintenanceTime:
+              description: LastMaintenanceTime is the last time maintenance was run.
+              format: date-time
+              nullable: true
+              type: string
+            message:
+              description: Message is a message about the current status of the ResticRepository.
+              type: string
+            phase:
+              description: Phase is the current state of the ResticRepository.
+              enum:
+              - New
+              - Ready
+              - NotReady
+              type: string
+          type: object
+      type: object
+  version: v1
+  versions:
+  - name: v1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/v1beta1/bases/velero.io_schedules.yaml

@@ -0,0 +1,401 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: schedules.velero.io
+spec:
+  group: velero.io
+  names:
+    kind: Schedule
+    listKind: ScheduleList
+    plural: schedules
+    singular: schedule
+  preserveUnknownFields: false
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      description: Schedule is a Velero resource that represents a pre-scheduled or
+        periodic Backup that should be run.
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: ScheduleSpec defines the specification for a Velero schedule
+          properties:
+            schedule:
+              description: Schedule is a Cron expression defining when to run the
+                Backup.
+              type: string
+            template:
+              description: Template is the definition of the Backup to be run on the
+                provided schedule
+              properties:
+                defaultVolumesToRestic:
+                  description: DefaultVolumesToRestic specifies whether restic should
+                    be used to take a backup of all pod volumes by default.
+                  type: boolean
+                excludedNamespaces:
+                  description: ExcludedNamespaces contains a list of namespaces that
+                    are not included in the backup.
+                  items:
+                    type: string
+                  nullable: true
+                  type: array
+                excludedResources:
+                  description: ExcludedResources is a slice of resource names that
+                    are not included in the backup.
+                  items:
+                    type: string
+                  nullable: true
+                  type: array
+                hooks:
+                  description: Hooks represent custom behaviors that should be executed
+                    at different phases of the backup.
+                  properties:
+                    resources:
+                      description: Resources are hooks that should be executed when
+                        backing up individual instances of a resource.
+                      items:
+                        description: BackupResourceHookSpec defines one or more BackupResourceHooks
+                          that should be executed based on the rules defined for namespaces,
+                          resources, and label selector.
+                        properties:
+                          excludedNamespaces:
+                            description: ExcludedNamespaces specifies the namespaces
+                              to which this hook spec does not apply.
+                            items:
+                              type: string
+                            nullable: true
+                            type: array
+                          excludedResources:
+                            description: ExcludedResources specifies the resources
+                              to which this hook spec does not apply.
+                            items:
+                              type: string
+                            nullable: true
+                            type: array
+                          includedNamespaces:
+                            description: IncludedNamespaces specifies the namespaces
+                              to which this hook spec applies. If empty, it applies
+                              to all namespaces.
+                            items:
+                              type: string
+                            nullable: true
+                            type: array
+                          includedResources:
+                            description: IncludedResources specifies the resources
+                              to which this hook spec applies. If empty, it applies
+                              to all resources.
+                            items:
+                              type: string
+                            nullable: true
+                            type: array
+                          labelSelector:
+                            description: LabelSelector, if specified, filters the
+                              resources to which this hook spec applies.
+                            nullable: true
+                            properties:
+                              matchExpressions:
+                                description: matchExpressions is a list of label selector
+                                  requirements. The requirements are ANDed.
+                                items:
+                                  description: A label selector requirement is a selector
+                                    that contains values, a key, and an operator that
+                                    relates the key and values.
+                                  properties:
+                                    key:
+                                      description: key is the label key that the selector
+                                        applies to.
+                                      type: string
+                                    operator:
+                                      description: operator represents a key's relationship
+                                        to a set of values. Valid operators are In,
+                                        NotIn, Exists and DoesNotExist.
+                                      type: string
+                                    values:
+                                      description: values is an array of string values.
+                                        If the operator is In or NotIn, the values
+                                        array must be non-empty. If the operator is
+                                        Exists or DoesNotExist, the values array must
+                                        be empty. This array is replaced during a
+                                        strategic merge patch.
+                                      items:
+                                        type: string
+                                      type: array
+                                  required:
+                                  - key
+                                  - operator
+                                  type: object
+                                type: array
+                              matchLabels:
+                                additionalProperties:
+                                  type: string
+                                description: matchLabels is a map of {key,value} pairs.
+                                  A single {key,value} in the matchLabels map is equivalent
+                                  to an element of matchExpressions, whose key field
+                                  is "key", the operator is "In", and the values array
+                                  contains only "value". The requirements are ANDed.
+                                type: object
+                            type: object
+                          name:
+                            description: Name is the name of this hook.
+                            type: string
+                          post:
+                            description: PostHooks is a list of BackupResourceHooks
+                              to execute after storing the item in the backup. These
+                              are executed after all "additional items" from item
+                              actions are processed.
+                            items:
+                              description: BackupResourceHook defines a hook for a
+                                resource.
+                              properties:
+                                exec:
+                                  description: Exec defines an exec hook.
+                                  properties:
+                                    command:
+                                      description: Command is the command and arguments
+                                        to execute.
+                                      items:
+                                        type: string
+                                      minItems: 1
+                                      type: array
+                                    container:
+                                      description: Container is the container in the
+                                        pod where the command should be executed.
+                                        If not specified, the pod's first container
+                                        is used.
+                                      type: string
+                                    onError:
+                                      description: OnError specifies how Velero should
+                                        behave if it encounters an error executing
+                                        this hook.
+                                      enum:
+                                      - Continue
+                                      - Fail
+                                      type: string
+                                    timeout:
+                                      description: Timeout defines the maximum amount
+                                        of time Velero should wait for the hook to
+                                        complete before considering the execution
+                                        a failure.
+                                      type: string
+                                  required:
+                                  - command
+                                  type: object
+                              required:
+                              - exec
+                              type: object
+                            type: array
+                          pre:
+                            description: PreHooks is a list of BackupResourceHooks
+                              to execute prior to storing the item in the backup.
+                              These are executed before any "additional items" from
+                              item actions are processed.
+                            items:
+                              description: BackupResourceHook defines a hook for a
+                                resource.
+                              properties:
+                                exec:
+                                  description: Exec defines an exec hook.
+                                  properties:
+                                    command:
+                                      description: Command is the command and arguments
+                                        to execute.
+                                      items:
+                                        type: string
+                                      minItems: 1
+                                      type: array
+                                    container:
+                                      description: Container is the container in the
+                                        pod where the command should be executed.
+                                        If not specified, the pod's first container
+                                        is used.
+                                      type: string
+                                    onError:
+                                      description: OnError specifies how Velero should
+                                        behave if it encounters an error executing
+                                        this hook.
+                                      enum:
+                                      - Continue
+                                      - Fail
+                                      type: string
+                                    timeout:
+                                      description: Timeout defines the maximum amount
+                                        of time Velero should wait for the hook to
+                                        complete before considering the execution
+                                        a failure.
+                                      type: string
+                                  required:
+                                  - command
+                                  type: object
+                              required:
+                              - exec
+                              type: object
+                            type: array
+                        required:
+                        - name
+                        type: object
+                      nullable: true
+                      type: array
+                  type: object
+                includeClusterResources:
+                  description: IncludeClusterResources specifies whether cluster-scoped
+                    resources should be included for consideration in the backup.
+                  nullable: true
+                  type: boolean
+                includedNamespaces:
+                  description: IncludedNamespaces is a slice of namespace names to
+                    include objects from. If empty, all namespaces are included.
+                  items:
+                    type: string
+                  nullable: true
+                  type: array
+                includedResources:
+                  description: IncludedResources is a slice of resource names to include
+                    in the backup. If empty, all resources are included.
+                  items:
+                    type: string
+                  nullable: true
+                  type: array
+                labelSelector:
+                  description: LabelSelector is a metav1.LabelSelector to filter with
+                    when adding individual objects to the backup. If empty or nil,
+                    all objects are included. Optional.
+                  nullable: true
+                  properties:
+                    matchExpressions:
+                      description: matchExpressions is a list of label selector requirements.
+                        The requirements are ANDed.
+                      items:
+                        description: A label selector requirement is a selector that
+                          contains values, a key, and an operator that relates the
+                          key and values.
+                        properties:
+                          key:
+                            description: key is the label key that the selector applies
+                              to.
+                            type: string
+                          operator:
+                            description: operator represents a key's relationship
+                              to a set of values. Valid operators are In, NotIn, Exists
+                              and DoesNotExist.
+                            type: string
+                          values:
+                            description: values is an array of string values. If the
+                              operator is In or NotIn, the values array must be non-empty.
+                              If the operator is Exists or DoesNotExist, the values
+                              array must be empty. This array is replaced during a
+                              strategic merge patch.
+                            items:
+                              type: string
+                            type: array
+                        required:
+                        - key
+                        - operator
+                        type: object
+                      type: array
+                    matchLabels:
+                      additionalProperties:
+                        type: string
+                      description: matchLabels is a map of {key,value} pairs. A single
+                        {key,value} in the matchLabels map is equivalent to an element
+                        of matchExpressions, whose key field is "key", the operator
+                        is "In", and the values array contains only "value". The requirements
+                        are ANDed.
+                      type: object
+                  type: object
+                metadata:
+                  properties:
+                    labels:
+                      additionalProperties:
+                        type: string
+                      type: object
+                  type: object
+                orderedResources:
+                  additionalProperties:
+                    type: string
+                  description: OrderedResources specifies the backup order of resources
+                    of specific Kind. The map key is the Kind name and value is a
+                    list of resource names separated by commas. Each resource name
+                    has format "namespace/resourcename".  For cluster resources, simply
+                    use "resourcename".
+                  nullable: true
+                  type: object
+                snapshotVolumes:
+                  description: SnapshotVolumes specifies whether to take cloud snapshots
+                    of any PV's referenced in the set of objects included in the Backup.
+                  nullable: true
+                  type: boolean
+                storageLocation:
+                  description: StorageLocation is a string containing the name of
+                    a BackupStorageLocation where the backup should be stored.
+                  type: string
+                ttl:
+                  description: TTL is a time.Duration-parseable string describing
+                    how long the Backup should be retained for.
+                  type: string
+                volumeSnapshotLocations:
+                  description: VolumeSnapshotLocations is a list containing names
+                    of VolumeSnapshotLocations associated with this backup.
+                  items:
+                    type: string
+                  type: array
+              type: object
+            useOwnerReferencesInBackup:
+              description: UseOwnerReferencesBackup specifies whether to use OwnerReferences
+                on backups created by this Schedule.
+              nullable: true
+              type: boolean
+          required:
+          - schedule
+          - template
+          type: object
+        status:
+          description: ScheduleStatus captures the current state of a Velero schedule
+          properties:
+            lastBackup:
+              description: LastBackup is the last time a Backup was run for this Schedule
+                schedule
+              format: date-time
+              nullable: true
+              type: string
+            phase:
+              description: Phase is the current phase of the Schedule
+              enum:
+              - New
+              - Enabled
+              - FailedValidation
+              type: string
+            validationErrors:
+              description: ValidationErrors is a slice of all validation errors (if
+                applicable)
+              items:
+                type: string
+              type: array
+          type: object
+      type: object
+  version: v1
+  versions:
+  - name: v1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/v1beta1/bases/velero.io_serverstatusrequests.yaml

@@ -0,0 +1,89 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: serverstatusrequests.velero.io
+spec:
+  group: velero.io
+  names:
+    kind: ServerStatusRequest
+    listKind: ServerStatusRequestList
+    plural: serverstatusrequests
+    shortNames:
+    - ssr
+    singular: serverstatusrequest
+  preserveUnknownFields: false
+  scope: Namespaced
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: ServerStatusRequest is a request to access current status information
+        about the Velero server.
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: ServerStatusRequestSpec is the specification for a ServerStatusRequest.
+          type: object
+        status:
+          description: ServerStatusRequestStatus is the current status of a ServerStatusRequest.
+          properties:
+            phase:
+              description: Phase is the current lifecycle phase of the ServerStatusRequest.
+              enum:
+              - New
+              - Processed
+              type: string
+            plugins:
+              description: Plugins list information about the plugins running on the
+                Velero server
+              items:
+                description: PluginInfo contains attributes of a Velero plugin
+                properties:
+                  kind:
+                    type: string
+                  name:
+                    type: string
+                required:
+                - kind
+                - name
+                type: object
+              nullable: true
+              type: array
+            processedTimestamp:
+              description: ProcessedTimestamp is when the ServerStatusRequest was
+                processed by the ServerStatusRequestController.
+              format: date-time
+              nullable: true
+              type: string
+            serverVersion:
+              description: ServerVersion is the Velero server version.
+              type: string
+          type: object
+      type: object
+  version: v1
+  versions:
+  - name: v1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/v1beta1/bases/velero.io_volumesnapshotlocations.yaml

@@ -0,0 +1,74 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
+  name: volumesnapshotlocations.velero.io
+spec:
+  group: velero.io
+  names:
+    kind: VolumeSnapshotLocation
+    listKind: VolumeSnapshotLocationList
+    plural: volumesnapshotlocations
+    singular: volumesnapshotlocation
+  preserveUnknownFields: false
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      description: VolumeSnapshotLocation is a location where Velero stores volume
+        snapshots.
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: VolumeSnapshotLocationSpec defines the specification for a
+            Velero VolumeSnapshotLocation.
+          properties:
+            config:
+              additionalProperties:
+                type: string
+              description: Config is for provider-specific configuration fields.
+              type: object
+            provider:
+              description: Provider is the provider of the volume storage.
+              type: string
+          required:
+          - provider
+          type: object
+        status:
+          description: VolumeSnapshotLocationStatus describes the current status of
+            a Velero VolumeSnapshotLocation.
+          properties:
+            phase:
+              description: VolumeSnapshotLocationPhase is the lifecycle phase of a
+                Velero VolumeSnapshotLocation.
+              enum:
+              - Available
+              - Unavailable
+              type: string
+          type: object
+      type: object
+  version: v1
+  versions:
+  - name: v1
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

config/crd/v1beta1/crds/doc.go

@@ -0,0 +1,4 @@
+// Package crds embeds the controller-tools generated CRD manifests
+package crds
+
+//go:generate go run ../../../../hack/crd-gen/v1beta1/main.go

config/rbac/role.yaml

@@ -4,33 +4,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
-  name: velero-perms
+  name: manager-role
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumerclaims
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumes
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - get
-- apiGroups:
-  - velero.io
-  resources:
-  - backups
-  verbs:
-  - create
-  - delete
 - apiGroups:
   - velero.io
   resources:
@@ -51,26 +26,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - velero.io
-  resources:
-  - deletebackuprequests
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - velero.io
-  resources:
-  - deletebackuprequests/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - velero.io
   resources:
@@ -91,86 +46,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - velero.io
-  resources:
-  - podvolumebackups
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - velero.io
-  resources:
-  - podvolumebackups/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - velero.io
-  resources:
-  - podvolumerestores
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - velero.io
-  resources:
-  - podvolumerestores/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - velero.io
-  resources:
-  - resticrepositories
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - velero.io
-  resources:
-  - resticrepositories/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - velero.io
-  resources:
-  - schedules
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - velero.io
-  resources:
-  - schedules/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - velero.io
   resources:

design/2082-bsl-delete-associated-resources_design.md

@@ -1,40 +0,0 @@
-# Delete Backup and Restic Repo Resources when BSL is Deleted
-
-## Abstract
-
-Issue #2082 requested that with the command `velero backup-location delete <bsl name>` (implemented in Velero 1.6 with #3073), the following will be deleted:
-
-- associated Velero backups (to be clear, these are custom Kubernetes resources called "backups" that are stored in the API server)
-- associated Restic repositories (custom Kubernetes resources called "resticrepositories")
-
-This design doc explains how the request will be implemented.
-
-## Background
-
-When a BSL resource is deleted from its Velero namespace, the associated custom Kubernetes resources, backups and Restic repositories, can no longer be used.
-It makes sense to clean those resources up when a BSL is deleted.
-
-## Goals
-
-Update the `velero backup-location delete <bsl name>` command to delete associated backup and Restic repository resources in the same Velero namespace.
-
-## Non Goals
-
-[It was suggested](https://github.com/vmware-tanzu/velero/issues/2082#issuecomment-827951311) to fix bug #2697 alongside this issue.
-However, I think that should be fixed separately because although it is similar (restore objects are not being deleted), it is also quite different.
-One is adding a command feature update (this issue) and the other is a bug fix and each affect different parts of the code base.
-
-## High-Level Design
-
-Update the `velero backup-location delete <bsl name>` command to do the following:
-
-- find in the same Velero namespace from which the BSL was deleted the associated backup resources and Restic repositories, called "backups.velero.io" and "resticrepositories.velero.io" respectively
-- delete the resources found
-
-The above logic will be added to [where BSLs are deleted](https://github.com/vmware-tanzu/velero/blob/main/pkg/cmd/cli/backuplocation/delete.go).
-
-## Alternative Considered
-
-I had considered deleting the backup files (the ones in json format and tarballs) in the BSL itself.
-However, a standard use case is to back up a cluster and then restore into a new cluster.
-Deleting the backup storage location in either location is not expected to remove all of the backups in the backup storage location and should not be done.

design/CLI/PoC/base/CRDs.yaml

@@ -505,8 +505,6 @@ spec:
                       - BackupResourceList
                       - RestoreLog
                       - RestoreResults
-                      - CSIBackupVolumeSnapshots
-                      - CSIBackupVolumeSnapshotContents
                   type: string
                 name:
                   description: Name is the name of the kubernetes resource with

design/Implemented/backup-resources-order.md

@@ -2,7 +2,7 @@
 This document proposes a solution that allows user to specify a backup order for resources of specific resource type.
 
 ## Background
-During backup process, user may need to back up resources of specific type in some specific order to ensure the resources were backup properly because these resources are related and ordering might be required to preserve the consistency for the apps to recover itself from the backup image 
+During backup process, user may need to back up resources of specific type in some specific order to ensure the resources were backup properly because these resources are related and ordering might be required to preserve the consistency for the apps to recover itself <EFBFBD>from the backup image 
 (Ex: primary-secondary database pods in a cluster).
 
 ## Goals
@@ -12,7 +12,7 @@ During backup process, user may need to back up resources of specific type in so
 - Use a plugin to backup an resources and all the sub resources.  For example use a plugin for StatefulSet and backup pods belong to the StatefulSet in specific order.  This plugin solution is not generic and requires plugin for each resource type.
 
 ## High-Level Design
-User will specify a map of resource type to list resource names (separate by semicolons).  Each name will be in the format "namespaceName/resourceName" to enable ordering across namespaces.  Based on this map, the resources of each resource type will be sorted by the order specified in the list of resources.  If a resource instance belong to that specific type but its name is not in the order list, then it will be put behind other resources that are in the list.
+User will specify a map of resource type to list resource names (separate by semicolons).  Each name will be in the format "namespaceName/resourceName" to enable ordering accross namespaces.  Based on this map, the resources of each resource type will be sorted by the order specified in the list of resources.  If a resource instance belong to that specific type but its name is not in the order list, then it will be put behind other resources that are in the list.
 
 ### Changes to BackupSpec
 Add new field to BackupSpec
@@ -36,5 +36,5 @@ Example:
 >velero backup create mybackup --ordered-resources "pod=ns1/pod1,ns1/pod2;persistentvolumeclaim=n2/slavepod,ns2/primarypod"
 
 ## Open Issues
-- In the CLI, the design proposes to use commas to separate items of a resource type and semicolon to separate key-value pairs.  This follows the convention of using commas to separate items in a list (For example: --include-namespaces ns1,ns2).  However, the syntax for map in labels and annotations use commas to separate key-value pairs.  So it introduces some inconsistency.
+- In the CLI, the design proposes to use commas to separate items of a resource type and semicolon to separate key-value pairs.  This follows the convention of using commas to separate items in a list (For example: --include-namespaces ns1,ns2).  However, the syntax for map in labels and annotations use commas to seperate key-value pairs.  So it introduces some inconsistency.
 - For pods that managed by Deployment or DaemonSet, this design may not work because the pods' name is randomly generated and if pods are restarted, they would have different names so the Backup operation may not consider the restarted pods in the sorting algorithm.  This problem will be addressed when we enhance the design to use regular expression to specify the OrderResources instead of exact match. 

design/Implemented/generating-velero-crds-with-structural-schema.md

@@ -28,7 +28,7 @@ This document proposes adding _controller-tools_ to the project to automatically
 _controller-tools_ works by reading the Go files that contain the API type definitions.
 It uses a combination of the struct fields, types, tags and comments to build the OpenAPIv3 schema for the CRDs. The tooling makes some assumptions based on conventions followed in upstream Kubernetes and the ecosystem, which involves some changes to the Velero API type definitions, especially around optional fields.
 
-In order for _controller-tools_ to read the Go files containing Velero API type definitions, the CRDs need to be generated at build time, as these files are not available at runtime (i.e. the Go files are not accessible by the compiled binary).
+In order for _controller-tools_ to read the Go files containing Velero API type defintiions, the CRDs need to be generated at build time, as these files are not available at runtime (i.e. the Go files are not accessible by the compiled binary).
 These generated CRD manifests (YAML) will then need to be available to the `pkg/install` package for it to include when installing Velero resources.
 
 ## Detailed Design

design/Implemented/plugin-backup-and-restore-progress-design.md

@@ -429,7 +429,7 @@ Instead, a new method for 'Progress' will be added to interface. Velero server r
 
 But, this involves good amount of changes and needs a way for backward compatibility.
 
-As volume plugins are mostly K8s native, its fine to go ahead with current limitation.
+As volume plugins are mostly K8s native, its fine to go ahead with current limiation.
 
 ### Update Backup CR
 Instead of creating new CRs, plugins can directly update the status of Backup CR. But, this deviates from current approach of having separate CRs like PodVolumeBackup/PodVolumeRestore to know operations progress.

design/existing-resource-policy_design.md

@@ -1,262 +0,0 @@
-# Add support for `ExistingResourcePolicy` to restore API
-## Abstract
-Velero currently does not support any restore policy on kubernetes resources that are already present in-cluster. Velero skips over the restore of the resource if it already exists in the namespace/cluster irrespective of whether the resource present in the restore is the same or different from the one present on the cluster. It is desired that Velero gives the option to the user to decide whether or not the resource in backup should overwrite the one present in the cluster.
-
-## Background
-As of Today, Velero will skip over the restoration of resources that already exist in the cluster. The current workflow followed by Velero is (Using a `service` that is backed up for example):
-- Velero tries to attempt restore of the `service` 
-- Fetches the `service` from the cluster 
-- If the `service` exists then:
-    - Checks whether the `service` instance in the cluster is equal to the `service`  instance present in backup
-        - If not equal then skips the restore of the `service` and adds a restore warning (except for [ServiceAccount objects](https://github.com/vmware-tanzu/velero/blob/574baeb3c920f97b47985ec3957debdc70bcd5f8/pkg/restore/restore.go#L1246))
-        - If equal then skips the restore of the `service` and mentions that the restore of resource `service` is skipped in logs
-
-It is desired to add the functionality to specify whether or not to overwrite the instance of resource `service` in cluster with the one present in backup during the restore process.
-
-Related issue: https://github.com/vmware-tanzu/velero/issues/4066
-
-## Goals
-- Add support for `ExistingResourcePolicy` to restore API for Kubernetes resources.
-
-## Non Goals
-- Change existing restore workflow for `ServiceAccount` objects
-- Add support for `ExistingResourcePolicy` as `recreate` for Kubernetes resources. (Future scope feature)
-
-## Unrelated Proposals (Completely different functionalities than the one proposed in the design)
-- Add support for `ExistingResourcePolicy` to restore API for Non-Kubernetes resources.
-- Add support for `ExistingResourcePolicy` to restore API for `PersistentVolume` data.
-
-### Use-cases/Scenarios
-
-### A. Production Cluster - Backup Cluster:
-Let's say you have a Backup Cluster which is identical to the Production Cluster. After some operations/usage/time the Production Cluster had changed itself, there might be new deployments, some secrets might have been updated. Now, this means that the Backup cluster will no longer be identical to the Production Cluster. In order to keep the Backup Cluster up to date/identical to the Production Cluster with respect to Kubernetes resources except PV data we would like to use Velero for scheduling new backups which would in turn help us update the Backup Cluster via Velero restore.
-
-Reference: https://github.com/vmware-tanzu/velero/issues/4066#issuecomment-954320686
-
-### B. Help identify resource delta:
-Here delta resources mean the resources restored by a previous backup, but they are no longer in the latest backup. Let's follow a sequence of steps to understand this scenario:
-- Consider there are 2 clusters, Cluster A, which has 3 resources - P1, P2 and P3.
-- Create a Backup1 from Cluster A which has P1, P2 and P3.
-- Perform restore on a new Cluster B using Backup1.
-- Now, Lets say in Cluster A resource P1 gets deleted and resource P2 gets updated.
-- Create a new Backup2 with the new state of Cluster A, keep in mind Backup1 has P1, P2 and P3 while Backup2 has P2' and P3.
-- So the Delta here is (|Cluster B - Backup2|), Delete P1 and Update P2.
-- During Restore time we would want the Restore to help us identify this resource delta.
-
-Reference: https://github.com/vmware-tanzu/velero/pull/4613#issuecomment-1027260446
-
-## High-Level Design
-### Approach 1: Add a new spec field `existingResourcePolicy` to the Restore API
-In this approach we do *not* change existing velero behavior. If the resource to restore in cluster is equal to the one backed up then do nothing following current Velero behavior. For resources that already exist in the cluster that are not equal to the resource in the backup (other than Service Accounts). We add a new optional spec field `existingResourcePolicy` which can have the following values:
-1. `none`: This is the existing behavior, if Velero encounters a resource that already exists in the cluster, we simply
-skip restoration.
-2. `update`: This option would provide the following behavior.
-   - Unchanged resources: Velero would update the backup/restore labels on the unchanged resources, if labels patch fails Velero adds a restore error.
-   - Changed resources: Velero will first try to patch the changed resource, Now if the patch:
-       - succeeds: Then the in-cluster resource gets updated with the labels as well as the resource diff
-       - fails: Velero adds a restore warning and tries to just update the backup/restore labels on the resource, if the labels patch also fails then we add restore error.
-3. `recreate`:  If resource already exists, then Velero will delete it and recreate the resource.
-
-*Note:* The `recreate` option is a non-goal for this enhancement proposal, but it is considered as a future scope.
-Another thing to highlight is that Velero will not be deleting any resources in any of the policy options proposed in 
-this design but Velero will patch the resources in `update` policy option.
-
-Example:
-A. The following Restore will execute the `existingResourcePolicy` restore type `none` for the `services` and `deployments` present in the `velero-protection` namespace.
-
-```
-Kind: Restore
-
-…
-
-includeNamespaces: velero-protection
-includeResources:
-  - services
-  - deployments
-existingResourcePolicy: none
-
-```
-
-B. The following Restore will execute the `existingResourcePolicy` restore type `update` for the `secrets` and `daemonsets` present in the `gdpr-application` namespace.
-```
-Kind: Restore
-
-…
-includeNamespaces: gdpr-application
-includeResources:
-  - secrets
-  - daemonsets
-existingResourcePolicy: update
-```
-
-### Approach 2: Add a new spec field `existingResourcePolicyConfig` to the Restore API
-In this approach we give user the ability to specify which resources are to be included for a particular kind of force update behaviour, essentially a more granular approach where in the user is able to specify a resource:behaviour mapping. It would look like:
-`existingResourcePolicyConfig`:
-- `patch:` 
-    - `includedResources:` [ ]string
-- `recreate:`
-    - `includedResources:` [ ]string
-
-*Note:* 
-- There is no `none` behaviour in this approach as that would conform to the current/default Velero restore behaviour.
-- The `recreate` option is a non-goal for this enhancement proposal, but it is considered as a future scope.
-
-
-Example:
-A. The following Restore will execute the restore type `patch` and apply the `existingResourcePolicyConfig` for `secrets` and `daemonsets` present in the `inventory-app` namespace.
-```
-Kind: Restore
-…
-includeNamespaces: inventory-app
-existingResourcePolicyConfig:
-  patch:
-    includedResources
-     - secrets
-     - daemonsets
-
-```
-
-
-### Approach 3: Combination of Approach 1 and Approach 2
-
-Now, this approach is somewhat a combination of the aforementioned approaches. Here we propose addition of two spec fields to the Restore API - `existingResourceDefaultPolicy` and `existingResourcePolicyOverrides`. As the names suggest ,the idea being that `existingResourceDefaultPolicy` would describe the default velero behaviour for this restore and `existingResourcePolicyOverrides` would override the default policy explicitly for some resources.
-
-Example:
-A. The following Restore will execute the restore type `patch` as the `existingResourceDefaultPolicy` but will override the default policy for `secrets` using the `existingResourcePolicyOverrides` spec as `none`.
-```
-Kind: Restore
-…
-includeNamespaces: inventory-app
-existingResourceDefaultPolicy: patch
-existingResourcePolicyOverrides:
-  none:
-    includedResources
-     - secrets
-
-```
-
-## Detailed Design
-### Approach 1: Add a new spec field `existingResourcePolicy` to the Restore API
-The `existingResourcePolicy` spec field will be an `PolicyType` type field. 
-
-Restore API:
-```
-type RestoreSpec struct {
-.
-.
-.
-// ExistingResourcePolicy specifies the restore behaviour for the kubernetes resource to be restored
-// +optional
-ExistingResourcePolicy PolicyType
-
-}
-```
-PolicyType:
-```
-type PolicyType string
-const PolicyTypeNone PolicyType  = "none"
-const PolicyTypePatch PolicyType = "update"
-```
-
-### Approach 2: Add a new spec field `existingResourcePolicyConfig` to the Restore API
-The `existingResourcePolicyConfig` will be a spec of type `PolicyConfiguration` which gets added to the Restore API.
-
-Restore API:
-```
-type RestoreSpec struct {
-.
-.
-.
-// ExistingResourcePolicyConfig specifies the restore behaviour for a particular/list of kubernetes resource(s) to be restored
-// +optional
-ExistingResourcePolicyConfig []PolicyConfiguration
-
-}
-```
-
-PolicyConfiguration:
-```
-type PolicyConfiguration struct {
-
-PolicyTypeMapping map[PolicyType]ResourceList
-
-}
-```
-
-PolicyType:
-```
-type PolicyType string
-const PolicyTypePatch PolicyType = "patch"
-const PolicyTypeRecreate PolicyType = "recreate"
-```
-
-ResourceList:
-```
-type ResourceList struct {
-IncludedResources []string 
-}
-```
-
-### Approach 3: Combination of Approach 1 and Approach 2
-
-Restore API:
-```
-type RestoreSpec struct {
-.
-.
-.
-// ExistingResourceDefaultPolicy specifies the default restore behaviour for the kubernetes resource to be restored
-// +optional
-existingResourceDefaultPolicy PolicyType
-
-// ExistingResourcePolicyOverrides specifies the restore behaviour for a particular/list of kubernetes resource(s) to be restored
-// +optional
-existingResourcePolicyOverrides []PolicyConfiguration
-
-}
-```
-
-PolicyType:
-```
-type PolicyType string
-const PolicyTypeNone PolicyType  = "none"
-const PolicyTypePatch PolicyType = "patch"
-const PolicyTypeRecreate PolicyType = "recreate"
-```
-PolicyConfiguration:
-```
-type PolicyConfiguration struct {
-
-PolicyTypeMapping map[PolicyType]ResourceList
-
-}
-```
-ResourceList:
-```
-type ResourceList struct {
-IncludedResources []string 
-}
-```
-
-The restore workflow changes will be done [here](https://github.com/vmware-tanzu/velero/blob/b40bbda2d62af2f35d1406b9af4d387d4b396839/pkg/restore/restore.go#L1245)
-
-### CLI changes for Approach 1
-We would introduce a new CLI flag called `existing-resource-policy` of string type. This flag would be used to accept the 
-policy from the user. The velero restore command would look somewhat like this:
-```
-velero create restore <restore_name> --existing-resource-policy=update 
-```
-
-Help message `Restore Policy to be used during the restore workflow, can be - none, update`
-
-The CLI changes will go at `pkg/cmd/cli/restore/create.go`
-
-We would also add a validation which checks for invalid policy values provided to this flag.
-
-Restore describer will also be updated to reflect the policy `pkg/cmd/util/output/restore_describer.go`
-
-### Implementation Decision
-We have decided to go ahead with the implementation of Approach 1 as:
-- It is easier to implement 
-- It is also easier to scale and leaves room for improvement and the door open to expanding to approach 3
-- It also provides an option to preserve the existing velero restore workflow

design/multiple-label-selectors_design.md

@@ -1,138 +0,0 @@
-# Ensure support for backing up resources based on multiple labels
-## Abstract
-As of today Velero supports filtering of resources based on single label selector per backup. It is desired that Velero
-support backing up of resources based on multiple labels (OR logic).
-
-**Note:** This solution is required because kubernetes label selectors only allow AND logic of labels.
-
-## Background
-Currently, Velero's Backup/Restore API has a spec field `LabelSelector` which helps in filtering of resources based on
-a **single** label value per backup/restore request. For instance, if the user specifies the `Backup.Spec.LabelSelector` as
-`data-protection-app: true`, Velero will grab all the resources that possess this label and perform the backup
-operation on them. The `LabelSelector` field does not accept more than one labels, and thus if the user want to take
-backup for resources consisting of a label from a set of labels (label1 OR label2 OR label3) then the user needs to
-create multiple backups per label rule. It would be really useful if Velero Backup API could respect a set of
-labels (OR Rule) for a single backup request.
-
-Related Issue: https://github.com/vmware-tanzu/velero/issues/1508
-
-## Goals
-- Enable support for backing up resources based on multiple labels (OR Logic) in a single backup config.
-- Enable support for restoring resources based on multiple labels (OR Logic) in a single restore config.
-
-## Use Case/Scenario
-Let's say as a Velero user you want to take a backup of secrets, but all these secrets do not have one single consistent
-label on them. We want to take backup of secrets having any one label in `app=gdpr`, `app=wpa` and `app=ccpa`. Here
-we would have to create 3 instances of backup for each label rule. This can become cumbersome at scale.
-
-## High-Level Design
-### Addition of `OrLabelSelectors` spec to Velero Backup/Restore API
-For Velero to back up resources if they consist of any one label from a set of labels, we would like to add a new spec
-field `OrLabelSelectors` which would enable user to specify them. The Velero backup would somewhat look like:
-
-```
-apiVersion: velero.io/v1
-kind: Backup
-metadata:
-  name: backup-101
-  namespace: openshift-adp
-spec:
-  includedNamespaces:
-  - test
-  storageLocation: velero-sample-1
-  ttl: 720h0m0s
-  orLabelSelectors:
-  - matchLabels:
-      app=gdpr
-  - matchLabels:
-      app=wpa
-  - matchLabels:
-      app=ccpa
-```
-
-**Note:** This approach will **not** be changing any current behavior related to Backup API spec `LabelSelector`. Rather we
-propose that the label in `LabelSelector` spec and labels in `OrLabelSelectors` should be treated as different Velero functionalities.
-Both these fields will be treated as separate Velero Backup API specs. If `LabelSelector` (singular) is present then just match that label.
-And if `OrLabelSelectors` is present then match to any label in the set specified by the user. For backup case, if both the `LabelSelector` and `OrLabelSelectors` 
-are specified (we do not anticipate this as a real world use-case) then the `OrLabelSelectors` will take precedence, `LabelSelector` will
-only be used to filter only when `OrLabelSelectors` is not specified by the user. This helps to keep both spec behaviour independent and not confuse the users. 
-This way we preserve the existing Velero behaviour and implement the new functionality in a much cleaner way.
-For instance, let's take a look the following cases:
-
-1. Only `LabelSelector` specified: Velero will create a backup with resources matching label `app=protect-db`
-```
-apiVersion: velero.io/v1
-kind: Backup
-metadata:
-  name: backup-101
-  namespace: openshift-adp
-spec:
-  includedNamespaces:
-  - test
-  storageLocation: velero-sample-1
-  ttl: 720h0m0s
-  labelSelector:
-  - matchLabels:
-      app=gdpr
-```
-2. Only `OrLabelSelectors` specified: Velero will create a backup with resources matching any label from set `{app=gdpr, app=wpa, app=ccpa}`
-```
-apiVersion: velero.io/v1
-kind: Backup
-metadata:
-  name: backup-101
-  namespace: openshift-adp
-spec:
-  includedNamespaces:
-  - test
-  storageLocation: velero-sample-1
-  ttl: 720h0m0s
-  orLabelSelectors:
-  - matchLabels:
-      app=gdpr
-  - matchLabels:
-      app=wpa
-  - matchLabels:
-      app=ccpa
-```
-
-Similar implementation will be done for the Restore API as well.
-
-## Detailed Design
-With the Introduction of `OrLabelSelectors` the BackupSpec and RestoreSpec will look like:
-
-BackupSpec:
-```
-type BackupSpec struct {
-[...]
-// OrLabelSelectors is a set of []metav1.LabelSelector to filter with
-// when adding individual objects to the backup. Resources matching any one
-// label from the set of labels will be added to the backup. If empty
-// or nil, all objects are included. Optional.
-// +optional
-OrLabelSelectors []\*metav1.LabelSelector
-[...]
-}
-```
-
-RestoreSpec:
-```
-type RestoreSpec struct {
-[...]
-// OrLabelSelectors is a set of []metav1.LabelSelector to filter with
-// when restoring objects from the backup. Resources matching any one
-// label from the set of labels will be restored from the backup. If empty
-// or nil, all objects are included from the backup. Optional.
-// +optional
-OrLabelSelectors []\*metav1.LabelSelector
-[...]
-}
-```
-
-The logic to collect resources to be backed up for a particular backup will be updated in the `backup/item_collector.go`
-around [here](https://github.com/vmware-tanzu/velero/blob/574baeb3c920f97b47985ec3957debdc70bcd5f8/pkg/backup/item_collector.go#L294).
-
-And for filtering the resources to be restored, the changes will go [here](https://github.com/vmware-tanzu/velero/blob/d1063bda7e513150fd9ae09c3c3c8b1115cb1965/pkg/restore/restore.go#L1769)
-
-**Note:**
-- This feature will not be exposed via Velero CLI.

design/new-prepost-backuprestore-plugin-hooks.md

@@ -1,735 +0,0 @@
-# Pre-Backup, Post-Backup, Pre-Restore, and Post-Restore Action Plugin Hooks
-
-## Abstract
-
-Velero should provide a way to trigger actions before and after each backup and restore.
-**Important**: These proposed plugin hooks are fundamentally different from the existing plugin hooks, BackupItemAction and RestoreItemAction, which are triggered per resource item during backup and restore, respectively.
-The proposed plugin hooks are to be executed only once: pre-backup (before backup starts), post-backup (after the backup is completed and uploaded to object storage, including volumes snapshots), pre-restore (before restore starts) and post-restore (after the restore is completed, including volumes are restored).
-
-### PreBackup and PostBackup Actions
-
-For the backup,  the sequence of events of Velero backup are the following (these sequence depicted is prior upcoming changes for [upload progress #3533](https://github.com/vmware-tanzu/velero/issues/3533) ):
-
-```
-New Backup Request
- |--> Validation of the request
-       |--> Set Backup Phase "In Progress"
-            | --> Start Backup
-                  | --> Discover all Plugins
-                        |--> Check if Backup Exists
-                             |--> Backup all K8s Resource Items
-                                  |--> Perform all Volumes Snapshots
-                                       |--> Final Backup Phase is determined
-                                            |--> Persist Backup and Logs on Object Storage
-```
-We propose the pre-backup and post-backup plugin hooks to be executed in this sequence:
-
-```
-New Backup Request
- |--> Validation of the request
-       |--> Set Backup Phase "In Progress"
-            | --> Start Backup
-                  | --> Discover all Plugins
-                        |--> Check if Backup Exists
-                             |--> **PreBackupActions** are executed, logging actions on existent backup log file
-                                   |--> Backup all K8s Resource Items
-                                        |--> Perform all Volumes Snapshots
-                                            |--> Final Backup Phase is determined
-                                                 |--> Persist Backup and logs on Object Storage
-                                                    |--> **PostBackupActions** are executed, logging to its own file
-```
-These plugin hooks will be invoked:
-
-- PreBackupAction: plugin actions are executed after the backup object is created and validated but before the backup is being processed, more precisely _before_ function [c.backupper.Backup](https://github.com/vmware-tanzu/velero/blob/74476db9d791fa91bba0147eac8ec189820adb3d/pkg/controller/backup_controller.go#L590). If the PreBackupActions return an err, the backup object is not processed and the Backup phase will be set as `FailedPreBackupActions`.
-
-- PostBackupAction: plugin actions are executed after the backup is finished and persisted, more precisely _after_ function [c.runBackup](https://github.com/vmware-tanzu/velero/blob/74476db9d791fa91bba0147eac8ec189820adb3d/pkg/controller/backup_controller.go#L274).
-
-The proposed plugin hooks will execute actions that will have statuses on their own:
-`Backup.Status.PreBackupActionsStatuses` and `Backup.Status.PostBackupActionsStatuses` which will be an array of a proposed struct `ActionStatus` with PluginName, StartTimestamp, CompletionTimestamp and Phase.
-
-### PreRestore and PostRestore Actions
-
-For the restore,  the sequence of events of Velero restore are the following (these sequence depicted is prior upcoming changes for [upload progress #3533](https://github.com/vmware-tanzu/velero/issues/3533) ):
-```
-New Restore Request
- |--> Validation of the request
-      |--> Checks if restore is from a backup or a schedule
-           |--> Fetches backup
-                |--> Set Restore Phase "In Progress"
-                     |--> Start Restore
-                          |--> Discover all Plugins
-                               |--> Download backup file to temp
-                                    |--> Fetch list of volumes snapshots
-                                         |--> Restore K8s items, including PVs
-                                              |--> Final Restore Phase is determined
-                                                   |--> Persist Restore logs on Object Storage
-```
-We propose the pre-restore and post-restore plugin hooks to be executed in this sequence:
-```
-New Restore Request
- |--> Validation of the request
-      |--> Checks if restore is from a backup or a schedule
-           |--> Fetches backup
-                |--> Set Restore Phase "In Progress"
-                     |--> Start Restore
-                          |--> Discover all Plugins
-                                |--> Download backup file to temp
-                                         |--> Fetch list of volumes snapshots
-                                            |--> **PreRestoreActions** are executed, logging actions on existent backup log file
-                                              |--> Restore K8s items, including PVs
-                                                   |--> Final Restore Phase is determined
-                                                        |--> Persist Restore logs on Object Storage
-                                                            |--> **PostRestoreActions** are executed, logging to its own file
-```
-
-These plugin hooks will be invoked:
-
-- PreRestoreAction: plugin actions are executed after the restore object is created and validated and before the backup object is fetched, more precisely in function `runValidatedRestore` _after_ function [info.backupStore.GetBackupVolumeSnapshots](https://github.com/vmware-tanzu/velero/blob/7c75cd6cf854064c9a454e53ba22cc5881d3f1f0/pkg/controller/restore_controller.go#L460). If the PreRestoreActions return an err, the restore object is not processed and the Restore phase will be set a `FailedPreRestoreActions`.
-  
-- PostRestoreAction: plugin actions are executed after the restore finishes processing all items and volumes snapshots are restored and logs persisted, more precisely in function `processRestore` _after_ setting [`restore.Status.CompletionTimestamp`](https://github.com/vmware-tanzu/velero/blob/7c75cd6cf854064c9a454e53ba22cc5881d3f1f0/pkg/controller/restore_controller.go#L273).
-
-The proposed plugin hooks will execute actions that will have statuses on their own:
-`Restore.Status.PreRestoreActionsStatuses` and `Restore.Status.PostRestoreActionsStatuses` which will be an array of a proposed struct `ActionStatus` with PluginName, StartTimestamp, CompletionTimestamp and Phase.
-
-## Background
-
-Increasingly, Velero is employed for workload migrations across different Kubernetes clusters.
-Using Velero for migrations requires an atomic operation involving a Velero backup on a source cluster followed by a Velero restore on a destination cluster.
-
-It is common during these migrations to perform many actions inside and outside Kubernetes clusters.
-**Attention**: these actions are not per resource item, but they are actions to be executed _once_ before and/or after the migration itself (remember, migration in this context is Velero Backup + Velero Restore).
-
-One important use case driving this proposal is migrating stateful workloads at scale across different clusters/storage backends.
-Today, Velero's Restic integration is the response for such use cases, but there are some limitations:
-
-- Quiesce/unquiesce workloads: Pod hooks are useful for quiescing/unquiescing workloads, but platform engineers often do not have the luxury/visibility/time/knowledge to go through each pod in order to add specific commands to quiesce/unquiesce workloads.
-- Orphan PVC/PV pairs: PVCs/PVs that do not have associated running pods are not backed up and consequently, are not migrated.
-
-Aiming to address these two limitations, and separate from this proposal, we would like to write a Velero plugin that takes advantage of the proposed Pre-Backup plugin hook. This plugin will be executed _once_ (not per resource item) prior backup. It will scale down the applications setting `.spec.replicas=0` to all deployments, statefulsets, daemonsets, replicasets, etc. and will start a small-footprint staging pod that will mount all PVC/PV pairs. Similarly, we would like to write another plugin that will utilize the proposed Post-Restore plugin hook. This plugin will unquiesce migrated applications by killing the staging pod and reinstating original `.spec.replicas` values after the Velero restore is completed.
-
-Other examples of plugins that can use the proposed plugin hooks are:
-
-- PostBackupAction: trigger a Velero Restore after a successful Velero backup (and complete the migration operation).
-- PreRestoreAction: pre-expand the cluster's capacity via Cluster API to avoid starvation of cluster resources before the restore.
-- PostRestoreAction: call actions to be performed outside Kubernetes clusters, such as configure a global load balancer (GLB) that enables the new cluster.
-
-The post backup actions will be executed after the backup is uploaded (persisted) on the disk. The logs of post-backup actions will be uploaded on the disk once the actions are completed.
-
-The post restore actions will be executed after the restore is uploaded (persisted) on the disk. The logs of post-restore actions will be uploaded on the disk once the actions are completed.
-
-This design seeks to provide missing extension points. This proposal's scope is to only add the new plugin hooks, not the plugins themselves.
-
-## Goals
-
-- Provide PreBackupAction, PostBackupAction, PreRestoreAction, and PostRestoreAction APIs for plugins to implement.
-- Update Velero backup and restore creation logic to invoke registered PreBackupAction and PreRestoreAction plugins before processing the backup and restore respectively.
-- Update Velero backup and restore complete logic to invoke registered PostBackupAction and PostRestoreAction plugins the objects are uploaded on disk.
-- Create one `ActionStatus` struct to keep track of execution of the plugin hooks. This struct has PluginName, StartTimestamp, CompletionTimestamp and Phase.
-- Add sub statuses for the plugins on Backup object: `Backup.Status.PreBackupActionsStatuses` and `Backup.Status.PostBackupActionsStatuses`. They will be flagged as optional and nullable. They will be populated only each plugin registered for the PreBackup and PostBackup hooks, respectively.
-- Add sub statuses for the plugins on Restore object: `Backup.Status.PreRestoreActionsStatuses` and `Backup.Status.PostRestoreActionsStatuses`. They will be flagged as optional and nullable. They will be populated only each plugin registered for the PreRestore and PostRestore hooks, respectively.
-- that will be populated optionally if Pre/Post Backup/Restore.
-
-## Non-Goals
-
-- Specific implementations of the PreBackupAction, PostBackupAction, PreRestoreAction and PostRestoreAction API beyond test cases.
-- For migration specific actions (Velero Backup + Velero Restore), add disk synchronization during the validation of the Restore (making sure the newly created backup will show during restore)
-
-## High-Level Design
-
-The Velero backup controller package will be modified for `PreBackupAction` and `PostBackupAction`.
-
-The PreBackupAction plugin API will resemble the BackupItemAction plugin hook design, but with the fundamental difference that it will receive only as input the Velero `Backup` object created.
-It will not receive any resource list items because the backup is not yet running at that stage.
-In addition, the `PreBackupAction` interface will only have an `Execute()` method since the plugin will be executed once per Backup creation, not per item.
-
-The Velero backup controller will be modified so that if there are any PreBackupAction plugins registered, they will be
-
-The PostBackupAction plugin API will resemble the BackupItemAction plugin design, but with the fundamental difference that it will receive only as input the Velero `Backup` object without any resource list items.
-By this stage, the backup has already been executed, with items backed up and volumes snapshots processed and persisted.
-The `PostBackupAction` interface will only have an `Execute()` method since the plugin will be executed only once per Backup, not per item.
-
-If there are any PostBackupAction plugins registered, they will be executed after the backup is finished and persisted, more precisely _after_ function [c.runBackup](https://github.com/vmware-tanzu/velero/blob/74476db9d791fa91bba0147eac8ec189820adb3d/pkg/controller/backup_controller.go#L274).
-
-The Velero restore controller package will be modified for `PreRestoreAction` and `PostRestoreAction`.
-
-The PreRestoreAction plugin API will resemble the RestoreItemAction plugin design, but with the fundamental difference that it will receive only as input the Velero `Restore` object created.
-It will not receive any resource list items because the restore has not yet been running at that stage.
-In addition, the `PreRestoreAction` interface will only have an `Execute()` method since the plugin will be executed only once per Restore creation, not per item.
-
-The Velero restore controller will be modified so that if there are any PreRestoreAction plugins registered, they will be executed after the restore object is created and validated and before the backup object is fetched, more precisely in function `runValidatedRestore` _after_ function [info.backupStore.GetBackupVolumeSnapshots](https://github.com/vmware-tanzu/velero/blob/7c75cd6cf854064c9a454e53ba22cc5881d3f1f0/pkg/controller/restore_controller.go#L460). If the PreRestoreActions return an err, the restore object is not processed and the Restore phase will be set a `FailedPreRestoreActions`.
-
-The PostRestoreAction plugin API will resemble the RestoreItemAction plugin design, but with the fundamental difference that it will receive only as input the Velero `Restore` object without any resource list items.
-At this stage, the restore has already been executed.
-The `PostRestoreAction` interface will only have an `Execute()` method since the plugin will be executed only once per Restore, not per item.
-
-If any PostRestoreAction plugins are registered, they will be executed after the restore finishes processing all items and volumes snapshots are restored and logs persisted, more precisely in function `processRestore` _after_ setting [`restore.Status.CompletionTimestamp`](https://github.com/vmware-tanzu/velero/blob/7c75cd6cf854064c9a454e53ba22cc5881d3f1f0/pkg/controller/restore_controller.go#L273).
-
-## Detailed Design
-
-### New Status struct
-
-To keep the status of the plugins, we propose the following struct:
-
-```go
-type ActionStatus struct {
-    // PluginName is the name of the registered plugin
-    // retrieved by the PluginManager as id.Name
-    // +optional
-    // +nullable
-    PluginName string `json:"pluginName,omitempty"`
-
-    // StartTimestamp records the time the plugin started.
-    // +optional
-    // +nullable
-    StartTimestamp *metav1.Time `json:"startTimestamp,omitempty"`
-
-    // CompletionTimestamp records the time the plugin was completed.
-    // +optional
-    // +nullable
-    CompletionTimestamp *metav1.Time `json:"completionTimestamp,omitempty"`
-
-    // Phase is the current state of the Action.
-    // +optional
-    // +nullable
-    Phase ActionPhase `json:"phase,omitempty"`
-}
-
-// ActionPhase is a string representation of the lifecycle phase of an action being executed by a plugin
-// of a Velero backup.
-// +kubebuilder:validation:Enum=InProgress;Completed;Failed
-type ActionPhase string
-
-const (
-    // ActionPhaseInProgress means the action has being executed
-    ActionPhaseInProgress ActionPhase = "InProgress"
-
-    // ActionPhaseCompleted means the action finished successfully
-    ActionPhaseCompleted ActionPhase = "Completed"
-
-    // ActionPhaseFailed means the action failed
-    ActionPhaseFailed ActionPhase = "Failed"
-)
-
-```
-
-### Backup Status of the Plugins
-
-The `Backup` Status section will have the follow:
-
-```go
-type BackupStatus struct {
-    (...)
-    // PreBackupActionsStatuses contains information about the pre backup plugins's execution.
-    // Note that this information is will be only populated if there are prebackup plugins actions
-    // registered
-    // +optional
-    // +nullable
-    PreBackupActionsStatuses *[]ActionStatus `json:"preBackupActionsStatuses,omitempty"`
-
-    // PostBackupActionsStatuses contains information about the post backup plugins's execution.
-    // Note that this information is will be only populated if there are postbackup plugins actions
-    // registered
-    // +optional
-    // +nullable
-    PostBackupActionsStatuses *[]ActionStatus `json:"postBackupActionsStatuses,omitempty"`
-
-}
-```
-
-### Restore Status of the Plugins
-
-The `Restore` Status section will have the follow:
-
-```go
-type RestoreStatus struct {
-    (...)
-    // PreRestoreActionsStatuses contains information about the pre Restore plugins's execution.
-    // Note that this information is will be only populated if there are preRestore plugins actions
-    // registered
-    // +optional
-    // +nullable
-    PreRestoreActionsStatuses *[]ActionStatus `json:"preRestoreActionsStatuses,omitempty"`
-
-    // PostRestoreActionsStatuses contains information about the post restore plugins's execution.
-    // Note that this information is will be only populated if there are postrestore plugins actions
-    // registered
-    // +optional
-    // +nullable
-    PostRestoreActionsStatuses *[]ActionStatus `json:"postRestoreActionsStatuses,omitempty"`
-
-}
-```
-
-### New Backup and Restore Phases
-
-#### New Backup Phase: FailedPreBackupActions
-
-In case the PreBackupActionsStatuses has at least one `ActionPhase` = `Failed`, it means al least one of the plugins returned an error and consequently, the backup will not move forward. The final status of the Backup object will be set as `FailedPreBackupActions`:
-
-```go
-
-// BackupPhase is a string representation of the lifecycle phase
-// of a Velero backup.
-// +kubebuilder:validation:Enum=New;FailedValidation;FailedPreBackupActions;InProgress;Uploading;UploadingPartialFailure;Completed;PartiallyFailed;Failed;Deleting
-type BackupPhase string
-
-const (
-
-    (...)
-
-    // BackupPhaseFailedPreBackupActions means one or more the Pre Backup Actions has failed
-    // and therefore backup will not run.
-    BackupPhaseFailedPreBackupActions BackupPhase = "FailedPreBackupActions"
-
-    (...)
-)
-
-```
-
-#### New Restore Phase FailedPreRestoreActions
-
-In case the PreRestoreActionsStatuses has at least one `ActionPhase` = `Failed`, it means al least one of the plugins returned an error and consequently, the restore will not move forward. The final status of the Restore object will be set as `FailedPreRestoreActions`:
-
-```go
-
-// RestorePhase is a string representation of the lifecycle phase
-// of a Velero restore
-// +kubebuilder:validation:Enum=New;FailedValidation;FailedPreRestoreActions;InProgress;Completed;PartiallyFailed;Failed
-type RestorePhase string
-
-const (
-
-    (...)
-
-    // RestorePhaseFailedPreRestoreActions means one or more the Pre Restore Actions has failed
-    // and therefore restore will not run.
-    RestorePhaseFailedPreRestoreActions BackupPhase = "FailedPreRestoreActions"
-
-    (...)
-)
-
-```
-
-### New Interface types
-
-#### PreBackupAction
-
-The `PreBackupAction` interface is as follows:
-
-```go
-// PreBackupAction provides a hook into the backup process before it begins.
-type PreBackupAction interface {
-    // Execute the PreBackupAction plugin providing it access to the Backup that
-    // is being executed
-    Execute(backup *api.Backup) error
-}
-```
-
-`PreBackupAction` will be defined in `pkg/plugin/velero/pre_backup_action.go`.
-
-#### PostBackupAction
-
-The `PostBackupAction` interface is as follows:
-
-```go
-// PostBackupAction provides a hook into the backup process after it completes.
-type PostBackupAction interface {
-    // Execute the PostBackupAction plugin providing it access to the Backup that
-    // has been completed
-    Execute(backup *api.Backup) error
-}
-```
-
-`PostBackupAction` will be defined in `pkg/plugin/velero/post_backup_action.go`.
-
-#### PreRestoreAction
-
-The `PreRestoreAction` interface is as follows:
-
-```go
-// PreRestoreAction provides a hook into the restore process before it begins.
-type PreRestoreAction interface {
-    // Execute the PreRestoreAction plugin providing it access to the Restore that
-    // is being executed
-    Execute(restore *api.Restore) error
-}
-```
-
-`PreRestoreAction` will be defined in `pkg/plugin/velero/pre_restore_action.go`.
-
-#### PostRestoreAction
-
-The `PostRestoreAction` interface is as follows:
-
-```go
-// PostRestoreAction provides a hook into the restore process after it completes.
-type PostRestoreAction interface {
-    // Execute the PostRestoreAction plugin providing it access to the Restore that
-    // has been completed
-    Execute(restore *api.Restore) error
-}
-```
-
-`PostRestoreAction` will be defined in `pkg/plugin/velero/post_restore_action.go`.
-
-### New BackupStore Interface Methods
-
-For the persistence of the logs originated from the PostBackup and PostRestore plugins, create two additional methods on `BackupStore` interface:
-
-```go
-type BackupStore interface {
-    (...)
-    PutPostBackuplog(backup string, log io.Reader) error
-    PutPostRestoreLog(backup, restore string, log io.Reader) error
-    (...)
-```
-
-The implementation of these new two methods will go hand-in-hand with the changes of uploading phases rebase.
-
-
-### Generate Protobuf Definitions and Client/Servers
-
-In `pkg/plugin/proto`, add the following:
-
-1. Protobuf definitions will be necessary for PreBackupAction in `pkg/plugin/proto/PreBackupAction.proto`.
-
-```protobuf
-message PreBackupActionExecuteRequest {
-    ...
-}
-
-service PreBackupAction {
-    rpc Execute(PreBackupActionExecuteRequest) returns (Empty)
-}
-```
-
-Once these are written, then a client and server implementation can be written in `pkg/plugin/framework/pre_backup_action_client.go` and `pkg/plugin/framework/pre_backup_action_server.go`, respectively.
-
-2. Protobuf definitions will be necessary for PostBackupAction in `pkg/plugin/proto/PostBackupAction.proto`.
-
-```protobuf
-message PostBackupActionExecuteRequest {
-    ...
-}
-
-service PostBackupAction {
-    rpc Execute(PostBackupActionExecuteRequest) returns (Empty)
-}
-```
-
-Once these are written, then a client and server implementation can be written in `pkg/plugin/framework/post_backup_action_client.go` and `pkg/plugin/framework/post_backup_action_server.go`, respectively.
-
-3. Protobuf definitions will be necessary for PreRestoreAction in `pkg/plugin/proto/PreRestoreAction.proto`.
-
-```protobuf
-message PreRestoreActionExecuteRequest {
-    ...
-}
-
-service PreRestoreAction {
-    rpc Execute(PreRestoreActionExecuteRequest) returns (Empty)
-}
-```
-
-Once these are written, then a client and server implementation can be written in `pkg/plugin/framework/pre_restore_action_client.go` and `pkg/plugin/framework/pre_restore_action_server.go`, respectively.
-
-4. Protobuf definitions will be necessary for PostRestoreAction in `pkg/plugin/proto/PostRestoreAction.proto`.
-
-```protobuf
-message PostRestoreActionExecuteRequest {
-    ...
-}
-
-service PostRestoreAction {
-    rpc Execute(PostRestoreActionExecuteRequest) returns (Empty)
-}
-```
-
-Once these are written, then a client and server implementation can be written in `pkg/plugin/framework/post_restore_action_client.go` and `pkg/plugin/framework/post_restore_action_server.go`, respectively.
-
-### Restartable Delete Plugins
-
-Similar to the `RestoreItemAction` and `BackupItemAction` plugins, restartable processes will need to be implemented (with the difference that there is no `AppliedTo()` method).
-
-In `pkg/plugin/clientmgmt/`, add
-
-1. `restartable_pre_backup_action.go`, creating the following unexported type:
-
-```go
-type restartablePreBackupAction struct {
-    key                 kindAndName
-    sharedPluginProcess RestartableProcess
-}
-
-func newRestartablePreBackupAction(name string, sharedPluginProcess RestartableProcess) *restartablePreBackupAction {
-    // ...
-}
-
-func (r *restartablePreBackupAction) getPreBackupAction() (velero.PreBackupAction, error) {
-    // ...
-}
-
-func (r *restartablePreBackupAction) getDelegate() (velero.PreBackupAction, error) {
-    // ...
-}
-
-// Execute restarts the plugin's process if needed, then delegates the call.
-func (r *restartablePreBackupAction) Execute(input *velero.PreBackupActionInput) (error) {
-    // ...
-}
-```
-
-2. `restartable_post_backup_action.go`, creating the following unexported type:
-
-```go
-type restartablePostBackupAction struct {
-    key                 kindAndName
-    sharedPluginProcess RestartableProcess
-}
-
-func newRestartablePostBackupAction(name string, sharedPluginProcess RestartableProcess) *restartablePostBackupAction {
-    // ...
-}
-
-func (r *restartablePostBackupAction) getPostBackupAction() (velero.PostBackupAction, error) {
-    // ...
-}
-
-func (r *restartablePostBackupAction) getDelegate() (velero.PostBackupAction, error) {
-    // ...
-}
-
-// Execute restarts the plugin's process if needed, then delegates the call.
-func (r *restartablePostBackupAction) Execute(input *velero.PostBackupActionInput) (error) {
-    // ...
-}
-```
-
-3. `restartable_pre_restore_action.go`, creating the following unexported type:
-
-```go
-type restartablePreRestoreAction struct {
-    key                 kindAndName
-    sharedPluginProcess RestartableProcess
-}
-
-func newRestartablePreRestoreAction(name string, sharedPluginProcess RestartableProcess) *restartablePreRestoreAction {
-    // ...
-}
-
-func (r *restartablePreRestoreAction) getPreRestoreAction() (velero.PreRestoreAction, error) {
-    // ...
-}
-
-func (r *restartablePreRestoreAction) getDelegate() (velero.PreRestoreAction, error) {
-    // ...
-}
-
-// Execute restarts the plugin's process if needed, then delegates the call.
-func (r *restartablePreRestoreAction) Execute(input *velero.PreRestoreActionInput) (error) {
-    // ...
-}
-```
-
-4. `restartable_post_restore_action.go`, creating the following unexported type:
-
-```go
-type restartablePostRestoreAction struct {
-    key                 kindAndName
-    sharedPluginProcess RestartableProcess
-}
-
-func newRestartablePostRestoreAction(name string, sharedPluginProcess RestartableProcess) *restartablePostRestoreAction {
-    // ...
-}
-
-func (r *restartablePostRestoreAction) getPostRestoreAction() (velero.PostRestoreAction, error) {
-    // ...
-}
-
-func (r *restartablePostRestoreAction) getDelegate() (velero.PostRestoreAction, error) {
-    // ...
-}
-
-// Execute restarts the plugin's process if needed, then delegates the call.
-func (r *restartablePostRestoreAction) Execute(input *velero.PostRestoreActionInput) (error) {
-    // ...
-}
-```
-
-### Plugin Manager Changes
-
-Add the following methods to the `Manager` interface in `pkg/plugin/clientmgmt/manager.go`:
-
-```go
-type Manager interface {
-    ...
-    // Get PreBackupAction returns a PreBackupAction plugin for name.
-    GetPreBackupAction(name string) (PreBackupAction, error)
-
-    // Get PreBackupActions returns the all PreBackupAction plugins.
-    GetPreBackupActions() ([]PreBackupAction, error)
-
-    // Get PostBackupAction returns a PostBackupAction plugin for name.
-    GetPostBackupAction(name string) (PostBackupAction, error)
-
-    // GetPostBackupActions returns the all PostBackupAction plugins.
-    GetPostBackupActions() ([]PostBackupAction, error)
-
-    // Get PreRestoreAction returns a PreRestoreAction plugin for name.
-    GetPreRestoreAction(name string) (PreRestoreAction, error)
-
-    // Get PreRestoreActions returns the all PreRestoreAction plugins.
-    GetPreRestoreActions() ([]PreRestoreAction, error)
-
-    // Get PostRestoreAction returns a PostRestoreAction plugin for name.
-    GetPostRestoreAction(name string) (PostRestoreAction, error)
-
-    // GetPostRestoreActions returns the all PostRestoreAction plugins.
-    GetPostRestoreActions() ([]PostRestoreAction, error)
-
-}
-```
-
-`GetPreBackupAction` and `GetPreBackupActions` will invoke the `restartablePreBackupAction` implementations.
-`GetPostBackupAction` and `GetPostBackupActions` will invoke the `restartablePostBackupAction` implementations.
-`GetPreRestoreAction` and `GetPreRestoreActions` will invoke the `restartablePreRestoreAction` implementations.
-`GetPostRestoreAction` and `GetPostRestoreActions` will invoke the `restartablePostRestoreAction` implementations.
-
-### How to invoke the Plugins
-
-#### Getting Pre/Post Backup Actions
-
-Getting Actions on `backup_controller.go` in `runBackup`:
-
-```go
-
-    backupLog.Info("Getting PreBackup actions")
-    preBackupActions, err := pluginManager.GetPreBackupActions()
-    if err != nil {
-        return err
-    }
-
-    backupLog.Info("Getting PostBackup actions")
-    postBackupActions, err := pluginManager.GetPostBackupActions()
-    if err != nil {
-        return err
-    }
-```
-
-#### Pre Backup Actions Plugins
-
-Calling the Pre Backup actions:
-
-```go
-    for _, preBackupAction := range preBackupActions {
-        err := preBackupAction.Execute(backup.Backup)
-        if err != nil {
-            backup.Backup.Status.Phase = velerov1api.BackupPhaseFailedPreBackupActions
-            return err
-        }
-    }
-```
-
-#### Post Backup Actions Plugins
-
-Calling the Post Backup actions:
-
-```go
-    for _, postBackupAction := range postBackupActions {
-        err := postBackupAction.Execute(backup.Backup)
-        if err != nil {
-            postBackupLog.Error(err)
-        }
-    }
-```
-
-#### Getting Pre/Post Restore Actions
-
-Getting Actions on `restore_controller.go` in `runValidatedRestore`:
-
-```go
-
-    restoreLog.Info("Getting PreRestore actions")
-    preRestoreActions, err := pluginManager.GetPreRestoreActions()
-    if err != nil {
-        return errors.Wrap(err, "error getting pre-restore actions")
-    }
-
-    restoreLog.Info("Getting PostRestore actions")
-    postRestoreActions, err := pluginManager.GetPostRestoreActions()
-    if err != nil {
-        return errors.Wrap(err, "error getting post-restore actions")
-    }
-```
-
-#### Pre Restore Actions Plugins
-
-Calling the Pre Restore actions:
-
-```go
-    for _, preRestoreAction := range preRestoreActions {
-        err := preRestoreAction.Execute(restoreReq.Restore)
-        if err != nil {
-            restoreReq.Restore.Status.Phase = velerov1api.RestorePhaseFailedPreRestoreActions
-            return errors.Wrap(err, "error executing pre-restore action")
-        }
-    }
-```
-
-#### Post Restore Actions Plugins
-
-Calling the Post Restore actions:
-
-```go
-    for _, postRestoreAction := range postRestoreActions {
-        err := postRestoreAction.Execute(restoreReq.Restore)
-        if err != nil {
-            postRestoreLog.Error(err.Error())
-        }
-    }
-```
-
-### Giving the User the Option to Skip the Execution of the Plugins
-
-Velero plugins are loaded as init containers. If plugins are unloaded, they trigger a restart of the Velero controller.
-Not mentioning if one plugin does get loaded for any reason (i.e., docker hub image pace limit), Velero does not start.
-In other words, the constant load/unload of plugins can disrupt the Velero controller, and they cannot be the only method to run the actions from these plugins selectively.
-As part of this proposal, we want to give the velero user the ability to skip the execution of the plugins via annotations on the Velero CR backup and restore objects.
-If one of these exists, the given plugin, referenced below as `plugin-name`, will be skipped.
-
-Backup Object Annotations:
-
-```
-   <plugin-name>/prebackup=skip
-   <plugin-name>/postbackup=skip
-```
-
-Restore Object Annotations:
-
-```
-   <plugin-name>/prerestore=skip
-   <plugin-name>/postrestore=skip
-```
-
-## Alternatives Considered
-
-An alternative to these plugin hooks is to implement all the pre/post backup/restore logic _outside_ Velero.
-In this case, one would need to write an external controller that works similar to what [Konveyor Crane](https://github.com/konveyor/mig-controller/blob/master/pkg/controller/migmigration/quiesce.go) does today when quiescing applications.
-We find this a viable way, but we think that Velero users can benefit from Velero having greater embedded capabilities, which will allow users to write or load plugins extensions without relying on an external components.
-
-## Security Considerations
-
-The plugins will only be invoked if loaded per a user's discretion.
-It is recommended to check security vulnerabilities before execution.
-
-## Compatibility
-
-In terms of backward compatibility, this design should stay compatible with most Velero installations that are upgrading.
-If plugins are not present, then the backup/restore process should proceed the same way it worked before their inclusion.
-
-## Implementation
-
-The implementation dependencies are roughly in the order as they are described in the [Detailed Design](#detailed-design) section.
-
-## Open Issues

design/plugin-versioning.md

@@ -1,289 +0,0 @@
-# Plugin Versioning
-
-## Abstract
-This proposal outlines an approach to support versioning of Velero's plugin APIs to enable changes to those APIs.
-It will allow for backwards compatible changes to be made, such as the addition of new plugin methods, but also backwards incompatible changes such as method removal or method signature changes.
-
-
-## Background
-When changes are made to Velero’s plugin APIs, there is no mechanism for the Velero server to communicate the version of the API that is supported, or for plugins to communicate what version they implement.
-This means that any modification to a plugin API is a backwards incompatible change as it requires all plugins which implement the API to update and implement the new method.
-
-There are several components involved to use plugins within Velero.
-From the perspective of the core Velero codebase, all plugin kinds (e.g. `ObjectStore`, `BackupItemAction`) are defined by a single API interface and all interactions with plugins are managed by a plugin manager which provides an implementation of the plugin API interface for Velero to use.
-
-Velero communicates with plugins via gRPC.
-The core Velero project provides a framework (using the [go-plugin project](https://github.com/hashicorp/go-plugin)) for plugin authors to use to implement their plugins which manages the creation of gRPC servers and clients.
-Velero plugins import the Velero plugin library in order to use this framework.
-When a change is made to a plugin API, it needs to be made to the Go interface used by the Velero codebase, and also to the rpc service definition which is compiled to form part of the framework.
-As each plugin kind is defined by a single interface, when a plugin imports the latest version of the Velero framework, it will need to implement the new APIs in order to build and run successfully.
-If a plugin does not use the latest version of the framework, and is used with a newer version of Velero that expects the plugin to implement those methods, this will result in a runtime error as the plugin is incompatible.
-
-With this proposal, we aim to break this coupling and introduce plugin API versions.
-
-## Scenarios to Support
-The following describes interactions between Velero and its plugins that will be supported with the implementation of this proposal.
-For the purposes of this list, we will refer to existing Velero and plugin versions as `v1` and all following versions as version `n`.
-
-Velero client communicating with plugins or plugin client calling other plugins:
-
-- Version `n` client will be able to communicate with Version `n` plugin
-- Version `n` client will be able to communicate with all previous versions of the plugin (Version `n-1` back to `v1`)
-
-Velero plugins importing Velero framework:
-- `v1` plugin built against Version `n` Velero framework
-    - A plugin may choose to only implement a `v1` API, but it must be able to be built using Version `n` of the Velero framework
-
-
-## Goals
-
-- Allow plugin APIs to change without requiring all plugins to implement the latest changes (even if they upgrade the version of Velero that is imported)
-- Allow plugins to choose which plugin versions they support and enable them to support multiple versions
-- Support breaking changes in the plugin APIs such as method removal or method signature changes
-- Establish a design process for modifying plugin APIs such as method addition and removal and signature changes
-- Establish a process for newer Velero clients to use older versions of a plugin API through adaptation
-
-## Non Goals
-
-- Change how plugins are managed or added
-- Allow older plugin clients to communicate with new versions of plugins
-
-## High-Level Design
-
-With each change to a plugin API, a new version of the plugin interface and the proto service definition will be created which describes the new plugin API.
-The plugin framework will be adapted to allow these new plugin versions to be registered.
-Plugins can opt to implement any or all versions of an API, however Velero will always attempt to use the latest version, and the plugin management will be modified to adapt earlier versions of a plugin to be compatible with the latest API where possible.
-Under the existing plugin framework, any new plugin version will be treated as a new plugin with a new kind.
-The plugin manager (which provides implementations of a plugin to Velero) will include an adapter layer which will manage the different versions and provide the adaptation for versions which do not implement the latest version of the plugin API.
-Providing an adaptation layer enables Velero and other plugin clients to use an older version of a plugin if it can be safely adapted.
-As the plugins will be able to introduce backwards incompatible changes, it will _not_ be possible for older version of Velero to use plugins which only support the latest versions of the plugin APIs.
-
-Although adding new rpc methods to a service is considered a backwards compatible change within gRPC, due to the way the proto definitions are compiled and included in the framework used by plugins, this will require every plugin to implement the new methods.
-Instead, we are opting to treat the addition of a method to an API as one requiring versioning.
-
-The addition of optional fields to existing structs which are used as parameters to or return values of API methods will not be considered as a change requiring versioning.
-These kinds of changes do not modify method signatures and have been safely made in the past with no impact on existing plugins.
-
-## Detailed Design
-
-The following areas will need to be adapted to support plugin versioning.
-
-### Plugin Interface Definitions
-
-To provide versioned plugins, any change to a plugin interface (method addition, removal, or signature change) will require a new versioned interface to be created.
-Currently, all plugin interface definitions reside in `pkg/plugin/velero` in a file corresponding to their plugin kind.
-These files will be rearranged to be grouped by kind and then versioned: `pkg/plugin/velero/<plugin_kind>/<version>/`.
-
-The following are examples of how each change may be treated:
-
-#### Complete Interface Change
-If the entire `ObjectStore` interface is being changed such that no previous methods are being included, a file would be added to `pkg/plugin/velero/objectstore/v2/` and would contain the new interface definition:
-
-```
-type ObjectStore interface {
-	// Only include new methods that the new API version will support
-	
-	NewMethod()
-	// ...
-}
-```
-
-#### Method Addition
-If a method is being added to the `ObjectStore` API, a file would be added to `pkg/plugin/velero/objectstore/v2/` and may contain a new API definition as follows:
-
-```
-import "github.com/vmware-tanzu/velero/pkg/plugin/velero/objectstore/v1"
-
-type ObjectStore interface {
-    // Import all the methods from the previous version of the API if they are to be included as is
-    v1.ObjectStore
-
-    // Provide definitions of any new methods
-    NewMethod()
-```
-
-#### Method Removal
-If a method is being removed from the `ObjectStore` API, a file would be added to `pkg/plugin/velero/objectstore/v2/` and may contain a new API definition as follows:
-
-```
-type ObjectStore interface {
-	// Methods which are required from the previous API version must be included, for example
-	Init(config)
-	PutObject(bucket, key, body)
-    // ...
-
-    // Methods which are to be removed are not included
-```
-
-#### Method Signature modification
-If a method signature in the `ObjectStore` API is being modified, a file would be added to `pkg/plugin/velero/objectstore/v2/` and may contain a new API definition as follows:
-
-```
-type ObjectStore interface {
-	// Methods which are required from the previous API version must be included, for example
-	Init(config)
-	PutObject(bucket, key, body)
-    // ...	
-
-    // Provide new definitions for methods which are being modified
-	List(bucket, prefix, newParameter)
-	
-}
-```
-
-### Proto Service Definitions
-
-The proto service definitions of the plugins will also be versioned and arranged by their plugin kind.
-Currently, all the proto definitions reside under `pkg/plugin/proto` in a file corresponding to their plugin kind.
-These files will be rearranged to be grouped by kind and then versioned: `pkg/plugin/proto/<plugin_kind>/<version>`.
-The scripts to compile the proto service definitions will need to be updated to place the generated Go code under a matching directory structure.
-
-It is not possible to import an existing proto service into a new one, so any methods will need to be duplicated across versions if they are required by the new version.
-The message definitions can be shared however, so these could be extracted from the service definition files and placed in a file that can be shared across all versions of the service.
-
-### Plugin Framework
-
-To allow plugins to register which versions of the API they implement, the plugin framework will need to be adapted to accept new versions.
-Currently, the plugin manager stores a [`map[string]RestartableProcess`](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/manager.go#L69), where the string key is the binary name for the plugin process (e.g. "velero-plugin-for-aws").
-Each `RestartableProcess` contains a [`map[kindAndName]interface{}`](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/restartable_process.go#L60) which represents each of the unique plugin implementations provided by that binary.
-[`kindAndName`](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/registry.go#L42) is a struct which combines the plugin kind (`ObjectStore`, `VolumeSnapshotter`) and the plugin name ("velero.io/aws", "velero.io/azure").
-
-Each plugin version registration must be unique (to allow for multiple versions to be implemented within the same plugin binary).
-This will be achieved by adding a specific registration method for each version to the Server interface in the plugin framework.
-For example, if adding a V2 `RestoreItemAction` plugin, the Server interface would be modified to add the `RegisterRestoreItemActionV2` method.
-This would require [adding a new plugin Kind const](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/framework/plugin_kinds.go#L28-L46) to represent the new plugin version, e.g. `PluginKindRestoreItemActionV2`.
-It also requires the creation of a new implementation of the go-plugin interface ([example](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/framework/object_store.go)) to support that version and use the generated gRPC code from the proto definition (including a client and server implementation).
-The Server will also need to be adapted to recognize this new plugin Kind and to serve the new implementation.
-
-Existing plugin Kind consts and registration methods will be left unchanged and will correspond to the current version of the plugin APIs (assumed to be v1).
-
-### Plugin Manager
-
-The plugin manager is responsible for managing the lifecycle of plugins.
-It provides an interface which is used by Velero to retrieve an instance of a plugin kind with a specific name (e.g. `ObjectStore` with the name "velero.io/aws").
-The manager contains a registry of all available plugins which is populated during the main Velero server startup.
-When the plugin manager is requested to provide a particular plugin, it checks the registry for that plugin kind and name.
-If it is available in the registry, the manager retrieves a `RestartableProcess` for the plugin binary, creating it if it does not already exist.
-That `RestartableProcess` is then used by individual restartable implementations of a plugin kind (e.g. `restartableObjectStore`, `restartableVolumeSnapshotter`).
-
-As new plugin versions are added, the plugin manager will be modified to always retrieve the latest version of a plugin kind.
-This is to allow the remainder of the Velero codebase to assume that it will always interact with the latest version of a plugin.
-If the latest version of a plugin is not available, it will attempt to fall back to previous versions and use an implementation adapted to the latest version if available.
-It will be up to the author of new plugin versions to determine whether a previous version of a plugin can be adapted to work with the interface of the new version.
-
-For each plugin kind, a new `Restartable<PluginKind>` struct will be introduced which will contain the plugin Kind and a function, `Get`, which will instantiate a restartable instance of that plugin kind and perform any adaptation required to make it compatible with the latest version.
-For example, `RestartableObjectStore` or `RestartableVolumeSnapshotter`.
-For each restartable plugin kind, a new function will be introduced which will return a slice of `Restartable<PluginKind>` objects, sorted by version in descending order.
-
-The manager will iterate through the list of `Restartable<PluginKind>`s and will check the registry for the given plugin kind and name.
-If the requested version is not found, it will skip and continue to iterate, attempting to fetch previous versions of the plugin kind.
-Once the requested version is found, the `Get` function will be called, returning the restartable implementation of the latest version of that plugin Kind.
-
-```
-type RestartableObjectStore struct {
-	kind framework.PluginKind
-	
-	// Get returns a restartable ObjectStore for the given name and process, wrapping if necessary
-	Get func(name string, restartableProcess RestartableProcess) v2.ObjectStore
-}
-
-func (m *manager) restartableObjectStores() []RestartableObjectStore {
-	return []RestartableObjectStore{
-		{
-			kind: framework.PluginKindObjectStoreV2,
-			Get: newRestartableObjectStoreV2,
-		},
-		{
-			kind: framework.PluginKindObjectStore,
-			Get: func(name string, restartableProcess RestartableProcess) v2.ObjectStore {
-				// Adapt the existing restartable v1 plugin to be compatible with the v2 interface
-				return newAdaptedV1ObjectStore(newRestartableObjectStore(name, restartableProcess))
-			},
-		},
-	}
-}
-
-// GetObjectStore returns a restartableObjectStore for name.
-func (m *manager) GetObjectStore(name string) (v2.ObjectStore, error) {
-	name = sanitizeName(name)
-
-	for _, restartableObjStore := range m.restartableObjectStores() {
-		restartableProcess, err := m.getRestartableProcess(restartableObjStore.kind, name)
-		if err != nil {
-			// Check if plugin was not found
-			if errors.Is(err, &pluginNotFoundError{}) {
-				continue
-			}
-			return nil, err
-		}
-		return restartableObjStore.Get(name, restartableProcess), nil
-	}
-
-	return nil, fmt.Errorf("unable to get valid ObjectStore for %q", name)
-}
-```
-
-If the previous version is not available, or can not be adapted to the latest version, it should not be included in the `restartableObjectStores` slice.
-This will result in an error being returned as is currently the case when a plugin implementation for a particular kind and provider can not be found.
-
-There are situations where it may be beneficial to check at the point where a plugin API call is made whether it implements a specific version of the API.
-This is something that can be addressed with future amendments to this design, however it does not seem to be necessary at this time.
-
-#### Plugin Adaptation
-
-When a new plugin API version is being proposed, it will be up to the author and the maintainer team to determine whether older versions of an API can be safely adapted to the latest version.
-An adaptation will implement the latest version of the plugin API interface but will use the methods from the version that is being adapted.
-In cases where the methods signatures remain the same, the adaptation layer will call through to the same method in the version being adapted.
-
-Examples where an adaptation may be safe:
-- A method signature is being changed to add a new parameter but the parameter could be optional (for example, adding a context parameter). The adaptation could call through to the method provided in the previous version but omit the parameter.
-- A method signature is being changed to remove a parameter, but it is safe to pass a default value to the previous version. The adaptation could call through to the method provided in the previous version but use a default value for the parameter.
-- A new method is being added but does not impact any existing behaviour of Velero (for example, a new method which will allow Velero to [wait for additional items to be ready](https://github.com/vmware-tanzu/velero/blob/main/design/wait-for-additional-items.md)). The adaptation would return a value which allows the existing behaviour to be performed.
-- A method is being deleted as it is no longer used. The adaptation would call through to any methods which are still included but would omit the deleted method in the adaptation.
-
-Examples where an adaptation may not be safe:
-- A new method is added which is used to provide new critical functionality in Velero. If this functionality can not be replicated using existing plugin methods in previous API versions, this should not be adapted and instead the plugin manager should return an error indicating that the plugin implementation can not be found.
-
-### Restartable Plugin Process
-
-As new versions of plugins are added, new restartable implementations of plugins will also need to be created.
-These are currently located within "pkg/plugin/clientmgmt" but will be rearranged to be grouped by kind and version like other plugin files.
-
-## Versioning Considerations
-
-It should be noted that if changes are being made to a plugin's API, it will only be necessary to bump the API version once within a release cycle, regardless of how many changes are made within that cycle.
-This is because the changes will only be available to consumers when they upgrade to the next minor version of the Velero library.
-New plugin API versions will not be introduced or backported to patch releases.
-
-Once a new minor or major version of Velero has been released however, any further changes will need to follow the process above and use a new API version.
-
-## Alternatives Considered
-
-### Relying on gRPC’s backwards compatibility when adding new methods
-
-One approach for adapting the plugin APIs would have been to rely on the fact that adding methods to gRPC services is a backwards compatible change.
-This approach would allow older clients to communicate with newer plugins as the existing interface would still be provided.
-This was considered but ruled out as our current framework would require any plugin that recompiles using the latest version of the framework to adapt to the new version.
-Also, without specific versioned interfaces, it would require checking plugin implementations at runtime for the specific methods that are supported.
-
-## Compatibility
-
-This design doc aims to allow plugin API changes to be made in a manner that may provide some backwards compatibility.
-Older versions of Velero will not be able to make use of new plugin versions however may continue to use previous versions of a plugin API if supported by the plugin.
-
-All compatibility concerns are addressed earlier in the document.
-
-## Implementation
-
-This design document primarily outlines an approach to allow future plugin API changes to be made.
-However, there are changes to the existing code base that will be made to allow plugin authors to more easily propose and introduce changes to these APIs.
-
-* Plugin interface definitions (currently in `pkg/plugin/velero`) will be rearranged to be grouped by kind and then versioned: `pkg/plugin/velero/<plugin_kind>/<version>/`.
-* Proto definitions (currently in `pkg/plugin/proto`) will be rearranged to be grouped by kind and then versioned: `pkg/plugin/proto/<plugin_kind>/<version>`.
-  * This will also require changes to the `make update` build task to correctly find the new proto location and output to the versioned directories.
-
-It is anticipated that changes to the plugin APIs will be made as part of the 1.9 release cycle.
-To assist with this work, an additional follow-up task to the ones listed above would be to prepare a V2 version of each of the existing plugins.
-These new versions will not yet provide any new API methods but will provide a layout for new additions to be made
-
-## Open Issues

design/restore-with-EnableAPIGroupVersions-feature.md

@@ -1,6 +1,6 @@
 # Restore API Group Version by Priority Level When EnableAPIGroupVersions Feature is Set
 
-Status: Accepted
+Status: Draft
 
 ## Abstract
 

go.mod

@@ -1,131 +1,47 @@
 module github.com/vmware-tanzu/velero
 
-go 1.18
+go 1.16
 
 require (
-	cloud.google.com/go/storage v1.10.0
-	github.com/Azure/azure-pipeline-go v0.2.3
-	github.com/Azure/azure-sdk-for-go v61.4.0+incompatible
-	github.com/Azure/azure-storage-blob-go v0.14.0
+	github.com/Azure/azure-sdk-for-go v42.0.0+incompatible
 	github.com/Azure/go-autorest/autorest v0.11.21
 	github.com/Azure/go-autorest/autorest/azure/auth v0.5.8
 	github.com/Azure/go-autorest/autorest/to v0.3.0
-	github.com/apex/log v1.9.0
+	github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
 	github.com/aws/aws-sdk-go v1.28.2
-	github.com/bombsimon/logrusr/v3 v3.0.0
-	github.com/evanphx/json-patch v5.6.0+incompatible
+	github.com/evanphx/json-patch v4.11.0+incompatible
 	github.com/fatih/color v1.13.0
 	github.com/gobwas/glob v0.2.3
 	github.com/gofrs/uuid v3.2.0+incompatible
 	github.com/golang/protobuf v1.5.2
-	github.com/google/go-cmp v0.5.8
-	github.com/google/uuid v1.3.0
-	github.com/hashicorp/go-hclog v0.14.1
-	github.com/hashicorp/go-plugin v1.4.3
+	github.com/google/uuid v1.1.2
+	github.com/hashicorp/go-hclog v0.12.0
+	github.com/hashicorp/go-plugin v0.0.0-20190610192547-a1bc61569a26
 	github.com/joho/godotenv v1.3.0
-	github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
-	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.18.1
+	github.com/kubernetes-csi/external-snapshotter/client/v4 v4.0.0
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.16.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.12.2
+	github.com/prometheus/client_golang v1.11.0
 	github.com/robfig/cron v1.1.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/afero v1.6.0
-	github.com/spf13/cobra v1.4.0
+	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.7.1
+	github.com/stretchr/testify v1.7.0
 	github.com/vmware-tanzu/crash-diagnostics v0.3.7
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
-	golang.org/x/net v0.4.0
-	golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	google.golang.org/api v0.56.0
+	golang.org/x/mod v0.4.2
+	golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
 	google.golang.org/grpc v1.40.0
-	k8s.io/api v0.24.2
-	k8s.io/apiextensions-apiserver v0.24.2
-	k8s.io/apimachinery v0.24.2
-	k8s.io/cli-runtime v0.24.0
-	k8s.io/client-go v0.24.2
+	k8s.io/api v0.22.2
+	k8s.io/apiextensions-apiserver v0.22.2
+	k8s.io/apimachinery v0.22.2
+	k8s.io/cli-runtime v0.22.2
+	k8s.io/client-go v0.22.2
 	k8s.io/klog v1.0.0
 	k8s.io/kube-aggregator v0.19.12
-	sigs.k8s.io/controller-runtime v0.12.2
-	sigs.k8s.io/yaml v1.3.0
+	sigs.k8s.io/cluster-api v1.0.0
+	sigs.k8s.io/controller-runtime v0.10.2
 )
 
-require (
-	cloud.google.com/go v0.93.3 // indirect
-	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.9.14 // indirect
-	github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 // indirect
-	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
-	github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
-	github.com/Azure/go-autorest/logger v0.2.1 // indirect
-	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dimchansky/utfbom v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.8.0 // indirect
-	github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
-	github.com/fsnotify/fsnotify v1.5.4 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-logr/zapr v1.2.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/swag v0.21.1 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/google/gnostic v0.6.9 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.1.0 // indirect
-	github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.9 // indirect
-	github.com/mattn/go-ieproxy v0.0.1 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/go-testing-interface v1.0.0 // indirect
-	github.com/moby/spdystream v0.2.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/oklog/run v1.0.0 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.34.0 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/stretchr/objx v0.2.0 // indirect
-	github.com/vladimirvivien/gexe v0.1.1 // indirect
-	go.opencensus.io v0.23.0 // indirect
-	go.starlark.net v0.0.0-20201006213952-227f4aabceb5 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.19.1 // indirect
-	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
-	golang.org/x/sys v0.3.0 // indirect
-	golang.org/x/term v0.3.0 // indirect
-	golang.org/x/text v0.5.0 // indirect
-	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/component-base v0.24.2 // indirect
-	k8s.io/klog/v2 v2.60.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20220614142933-1062c7ade5f8 // indirect
-	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
-	sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
-)
+replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2

golangci.yaml

@@ -25,8 +25,8 @@ run:
   # from this option's value (see skip-dirs-use-default).
   # "/" will be replaced by current OS file path separator to properly work
   # on Windows.
-  skip-dirs:
-    - test/e2e/*
+  #skip-dirs:
+  #  - src/external_libs
   #  - autogenerated_by_my_lib
 
   # default is true. Enables skipping of directories:
@@ -39,8 +39,8 @@ run:
   # autogenerated files. If it's not please let us know.
   # "/" will be replaced by current OS file path separator to properly work
   # on Windows.
-  skip-files:
-    - ".*_test.go$"
+  # skip-files:
+  #  - ".*\\.my\\.go$"
   #  - lib/bad.go
 
   # by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
@@ -117,7 +117,7 @@ linters-settings:
     # minimal length of string constant, 3 by default
     min-len: 3
     # minimal occurrences count to trigger, 3 by default
-    min-occurrences: 5
+    min-occurrences: 3
   gocritic:
     # Which checks should be enabled; can't be combined with 'disabled-checks';
     # See https://go-critic.github.io/overview#checks-overview
@@ -320,7 +320,7 @@ linters:
   fast: false
 
 
-issues:
+#issues:
 #  # List of regexps of issue texts to exclude, empty list by default.
 #  # But independently from this option we use default exclude patterns,
 #  # it can be disabled by `exclude-use-default: false`. To list all
@@ -359,7 +359,7 @@ issues:
   # it can be disabled by this option. To list all
   # excluded by default patterns execute `golangci-lint run --help`.
   # Default value for this option is true.
-  exclude-use-default: true
+  exclude-use-default: false
 
   # The default value is false. If set to true exclude and exclude-rules
   # regular expressions become case sensitive.

hack/build-image/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.18.10
+FROM golang:1.16
 
 ARG GOPROXY
 
@@ -24,23 +24,21 @@ ENV GOPROXY=${GOPROXY}
 RUN mkdir -p /go/src/k8s.io
 WORKDIR /go/src/k8s.io
 RUN git config --global advice.detachedHead false
-RUN git clone -b v0.22.2 https://github.com/kubernetes/code-generator
+RUN git clone -b v0.18.4 https://github.com/kubernetes/code-generator
 
-# kubebuilder test bundle is separated from kubebuilder. Need to setup it for CI test.
-RUN curl -sSLo envtest-bins.tar.gz https://go.kubebuilder.io/test-tools/1.22.1/linux/amd64 && \
-    mkdir /usr/local/kubebuilder && \
-    tar -C /usr/local/kubebuilder --strip-components=1 -zvxf envtest-bins.tar.gz
-
-RUN wget --quiet https://github.com/kubernetes-sigs/kubebuilder/releases/download/v3.2.0/kubebuilder_linux_amd64 && \
-    mv kubebuilder_linux_amd64 /usr/local/kubebuilder/bin/kubebuilder && \
-    chmod +x /usr/local/kubebuilder/bin/kubebuilder
+RUN wget --quiet https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.1/kubebuilder_2.3.1_linux_amd64.tar.gz && \
+    tar -zxvf kubebuilder_2.3.1_linux_amd64.tar.gz && \
+    mv kubebuilder_2.3.1_linux_amd64 /usr/local/kubebuilder && \
+    chmod +x /usr/local/kubebuilder && \
+    export PATH=$PATH:/usr/local/kubebuilder/bin && \
+    rm kubebuilder_2.3.1_linux_amd64.tar.gz
 
 # get controller-tools
-RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0
+RUN go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0
 
 # get goimports (the revision is pinned so we don't indiscriminately update, but the particular commit
 # is not important)
-RUN go install golang.org/x/tools/cmd/goimports@11e9d9cc0042e6bd10337d4d2c3e5d9295508e7d
+RUN go get golang.org/x/tools/cmd/goimports@11e9d9cc0042e6bd10337d4d2c3e5d9295508e7d
 
 # get protoc compiler and golang plugin
 WORKDIR /root
@@ -49,7 +47,7 @@ RUN wget --quiet https://github.com/protocolbuffers/protobuf/releases/download/v
     unzip protoc-3.9.1-linux-x86_64.zip && \
     mv bin/protoc /usr/bin/protoc && \
     chmod +x /usr/bin/protoc
-RUN go install github.com/golang/protobuf/protoc-gen-go@v1.0.0
+RUN go get github.com/golang/protobuf/protoc-gen-go@v1.0.0
 
 # get goreleaser
 RUN wget --quiet https://github.com/goreleaser/goreleaser/releases/download/v0.120.8/goreleaser_Linux_x86_64.tar.gz && \
@@ -58,7 +56,7 @@ RUN wget --quiet https://github.com/goreleaser/goreleaser/releases/download/v0.1
     chmod +x /usr/bin/goreleaser
 
 # get golangci-lint
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.0
+RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.27.0
 
 # install kubectl
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl

hack/crd-gen/v1beta1/main.go

@@ -0,0 +1,136 @@
+/*
+Copyright the Velero contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This code embeds the CRD manifests in config/crd/v1beta1/bases in
+// config/crd/v1beta1/crds/crds.go.
+
+package main
+
+import (
+	"bytes"
+	"compress/gzip"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"os"
+	"text/template"
+)
+
+// This is relative to config/crd/crds
+const goHeaderFile = "../../../../hack/boilerplate.go.txt"
+
+const tpl = `{{.GoHeader}}
+// Code generated by crds_generate.go; DO NOT EDIT.
+
+package crds
+
+import (
+	"bytes"
+	"compress/gzip"
+	"io/ioutil"
+
+	apiextinstall "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install"
+	apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	"k8s.io/client-go/kubernetes/scheme"
+)
+
+var rawCRDs = [][]byte{
+{{- range .RawCRDs }}
+	[]byte({{ . }}),
+{{- end }}
+}
+
+var CRDs = crds()
+
+func crds() []*apiextv1beta1.CustomResourceDefinition {
+	apiextinstall.Install(scheme.Scheme)
+	decode := scheme.Codecs.UniversalDeserializer().Decode
+	var objs []*apiextv1beta1.CustomResourceDefinition
+	for _, crd := range rawCRDs {
+		gzr, err := gzip.NewReader(bytes.NewReader(crd))
+		if err != nil {
+			panic(err)
+		}
+		bytes, err := ioutil.ReadAll(gzr)
+		if err != nil {
+			panic(err)
+		}
+		gzr.Close()
+
+		obj, _, err := decode(bytes, nil, nil)
+		if err != nil {
+			panic(err)
+		}
+		objs = append(objs, obj.(*apiextv1beta1.CustomResourceDefinition))
+	}
+	return objs
+}
+`
+
+type templateData struct {
+	GoHeader string
+	RawCRDs  []string
+}
+
+func main() {
+	headerBytes, err := ioutil.ReadFile(goHeaderFile)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	data := templateData{
+		GoHeader: string(headerBytes),
+	}
+
+	// This is relative to config/crd/crds
+	manifests, err := ioutil.ReadDir("../bases")
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	for _, crd := range manifests {
+		file, err := os.Open("../bases/" + crd.Name())
+		if err != nil {
+			log.Fatalln(err)
+		}
+
+		// gzip compress manifest
+		var buf bytes.Buffer
+		gzw := gzip.NewWriter(&buf)
+		if _, err := io.Copy(gzw, file); err != nil {
+			log.Fatalln(err)
+		}
+		file.Close()
+		gzw.Close()
+
+		data.RawCRDs = append(data.RawCRDs, fmt.Sprintf("%q", buf.Bytes()))
+	}
+
+	t, err := template.New("crd").Parse(tpl)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	out, err := os.Create("crds.go")
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	if err := t.Execute(out, data); err != nil {
+		log.Fatalln(err)
+	}
+}

hack/docker-push.sh

@@ -56,36 +56,26 @@ elif [[ "$triggeredBy" == "tags" ]]; then
     TAG=$(echo $GITHUB_REF | cut -d / -f 3)
 fi
 
-# if both BRANCH and TAG are empty, then it's triggered by PR. Use target branch instead.
-# BRANCH is needed in docker buildx command to set as image tag.
-# When action is triggered by PR, just build container without pushing, so set type to local.
-# When action is triggered by PUSH, need to push container, so set type to registry.
-if [[ -z $BRANCH && -z $TAG ]]; then
-    echo "Test Velero container build without pushing, when Dockerfile is changed by PR."
-    BRANCH="${GITHUB_BASE_REF}-container"
-    OUTPUT_TYPE="local,dest=."
-else
-    OUTPUT_TYPE="registry"
-fi
-
-TAG_LATEST=false
-if [[ ! -z "$TAG" ]]; then
-    echo "We're building tag $TAG"
-    VERSION="$TAG"
+if [[ "$BRANCH" == "main" ]]; then
+    VERSION="$BRANCH"
+elif [[ ! -z "$TAG" ]]; then
     # Explicitly checkout tags when building from a git tag.
     # This is not needed when building from main
     git fetch --tags
     # Calculate the latest release if there's a tag.
     highest_release
-    if [[ "$TAG" == "$HIGHEST" ]]; then
-      TAG_LATEST=true
-    fi
+    VERSION="$TAG"
 else
-    echo "We're on branch $BRANCH"
-    VERSION="$BRANCH"
-    if [[ "$VERSION" == release-* ]]; then
-      VERSION=${VERSION}-dev
-    fi
+    echo "We're not on main and we're not building a tag, exit early."
+    exit 0
+fi
+
+# Assume we're not tagging `latest` by default, and never on main.
+TAG_LATEST=false
+if [[ "$BRANCH" == "main" ]]; then
+    echo "Building main, not tagging latest."
+elif [[ "$TAG" == "$HIGHEST" ]]; then
+    TAG_LATEST=true
 fi
 
 if [[ -z "$BUILDX_PLATFORMS" ]]; then
@@ -97,14 +87,15 @@ echo "Highest tag found: $HIGHEST"
 echo "BRANCH: $BRANCH"
 echo "TAG: $TAG"
 echo "TAG_LATEST: $TAG_LATEST"
-echo "VERSION: $VERSION"
 echo "BUILDX_PLATFORMS: $BUILDX_PLATFORMS"
 
 echo "Building and pushing container images."
 
+# The use of "registry" as the buildx output type below instructs
+# Docker to push the image
 
 VERSION="$VERSION" \
 TAG_LATEST="$TAG_LATEST" \
 BUILDX_PLATFORMS="$BUILDX_PLATFORMS" \
-BUILDX_OUTPUT_TYPE=$OUTPUT_TYPE \
+BUILDX_OUTPUT_TYPE="registry" \
 make all-containers

hack/download-restic.sh

@@ -22,7 +22,6 @@ set -o pipefail
 # is the path expected by the Velero Dockerfile.
 output_dir=${OUTPUT_DIR:-/output/usr/bin}
 restic_bin=${output_dir}/restic
-build_path=$(dirname "$PWD")
 
 if [[ -z "${BIN}" ]]; then
     echo "BIN must be set"
@@ -47,11 +46,8 @@ if [[ -z "${RESTIC_VERSION}" ]]; then
     exit 1
 fi
 
-mkdir ${build_path}/restic
-git clone -b v${RESTIC_VERSION} https://github.com/restic/restic.git ${build_path}/restic
-pushd ${build_path}/restic
-git apply /go/src/github.com/vmware-tanzu/velero/hack/modify_acces_denied_code.txt
-git apply /go/src/github.com/vmware-tanzu/velero/hack/fix_restic_cve.txt
-go run build.go --goos "${GOOS}" --goarch "${GOARCH}" --goarm "${GOARM}" -o ${restic_bin}
+curl -s -L https://github.com/restic/restic/releases/download/v${RESTIC_VERSION}/restic_${RESTIC_VERSION}_${GOOS}_${GOARCH}.bz2 -O
+bunzip2 restic_${RESTIC_VERSION}_${GOOS}_${GOARCH}.bz2
+mv restic_${RESTIC_VERSION}_${GOOS}_${GOARCH} ${restic_bin}
+
 chmod +x ${restic_bin}
-popd

hack/fix_restic_cve.txt

@@ -1,97 +0,0 @@
-diff --git a/go.mod b/go.mod
-index d819a6be7..41125958a 100644
---- a/go.mod
-+++ b/go.mod
-@@ -35,12 +35,12 @@ require (
- 	github.com/spf13/cobra v1.5.0
- 	github.com/spf13/pflag v1.0.5
- 	golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8
--	golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c
-+	golang.org/x/net v0.4.0
- 	golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2
- 	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
--	golang.org/x/sys v0.0.0-20220818161305-2296e01440c6
--	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035
--	golang.org/x/text v0.3.7
-+	golang.org/x/sys v0.3.0
-+	golang.org/x/term v0.3.0
-+	golang.org/x/text v0.5.0
- 	google.golang.org/api v0.93.0
- 	google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
- 	gopkg.in/ini.v1 v1.67.0 // indirect
-diff --git a/go.sum b/go.sum
-index 959651048..b7a4358d5 100644
---- a/go.sum
-+++ b/go.sum
-@@ -319,6 +319,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
- github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
- github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
- github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
- go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
- go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
- go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-@@ -373,6 +374,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
- golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
- golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
- golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
- golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
- golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
- golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-@@ -418,8 +420,8 @@ golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug
- golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
- golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
- golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
--golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c h1:JVAXQ10yGGVbSyoer5VILysz6YKjdNT2bsvlayjqhes=
--golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-+golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
-+golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
- golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
- golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
- golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-@@ -454,6 +456,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
- golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
- golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
- golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-@@ -522,13 +525,12 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc
- golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
--golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
--golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 h1:Sx/u41w+OwrInGdEckYmEuU5gHoGSL4QbDz3S9s6j4U=
--golang.org/x/sys v0.0.0-20220818161305-2296e01440c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
-+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
- golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
- golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
--golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
--golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-+golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
-+golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
- golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
- golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
- golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-@@ -537,8 +539,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
- golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
- golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
- golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
--golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
- golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-+golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
-+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
- golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
- golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
- golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-@@ -593,6 +596,7 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
- golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
- golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
- golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
- golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
- golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
- golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

hack/modify_acces_denied_code.txt

@@ -1,13 +0,0 @@
-diff --git a/internal/backend/s3/s3.go b/internal/backend/s3/s3.go
-index 0b3816c06..eec10f9c7 100644
---- a/internal/backend/s3/s3.go
-+++ b/internal/backend/s3/s3.go
-@@ -164,7 +164,7 @@ func isAccessDenied(err error) bool {
- 	debug.Log("isAccessDenied(%T, %#v)", err, err)
- 
- 	var e minio.ErrorResponse
--	return errors.As(err, &e) && e.Code == "Access Denied"
-+	return errors.As(err, &e) && e.Code == "AccessDenied"
- }
- 
- // IsNotExist returns true if the error is caused by a not existing file.

hack/release-tools/tag-release.sh

@@ -38,9 +38,6 @@
 # This script is meant to be a combination of documentation and executable.
 # If you have questions at any point, please stop and ask!
 
-# Fail on any error.
-set -eo pipefail
-
 # Directory in which the script itself resides, so we can use it for calling programs that are in the same directory.
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
@@ -95,7 +92,7 @@ eval $(go run $DIR/chk_version.go)
 printf "To clarify, you've provided a version string of $VELERO_VERSION.\n"
 printf "Based on this, the following assumptions have been made: \n"
 
-# $VELERO_PATCH gets populated by the chk_version.go script that parses and verifies the given version format
+# $VELERO_PATCH gets populated by the chk_version.go scrip that parses and verifies the given version format
 # If we've got a patch release, we assume the tag is on release branch.
 if [[ "$VELERO_PATCH" != 0 ]]; then
     printf "*\t This is a patch release.\n"
@@ -138,8 +135,8 @@ if [[ -n $release_branch_name ]]; then
     remote_release_branch_name="$remote/$release_branch_name"
 
     # Determine whether the local and remote release branches already exist
-    local_branch=$(git branch | { grep "$release_branch_name" || true; })
-    remote_branch=$(git branch -r | { grep "$remote_release_branch_name" || true;})
+    local_branch=$(git branch | grep "$release_branch_name")
+    remote_branch=$(git branch -r | grep "$remote_release_branch_name")
     if [[ -z $remote_branch ]]; then
         echo "The branch $remote_release_branch_name must be created before you tag the release."
         exit 1

hack/test.sh

@@ -43,5 +43,5 @@ fi
 # but the user and group don't exist inside the container, when the code(https://github.com/kubernetes-sigs/controller-runtime/blob/v0.10.2/pkg/internal/testing/addr/manager.go#L44)
 # tries to get the cache directory, it gets the directory "/" and then get the permission error when trying to create directory under "/".
 # Specifying the cache directory by environment variable "XDG_CACHE_HOME" to workaround it
-XDG_CACHE_HOME=/tmp/ go test -installsuffix "static" -short -timeout 60s -coverprofile=coverage.out "${TARGETS[@]}"
+XDG_CACHE_HOME=/tmp/ go test -installsuffix "static" -short -timeout 60s "${TARGETS[@]}"
 echo "Success!"

hack/update-generated-crd-code.sh

@@ -44,24 +44,24 @@ ${GOPATH}/src/k8s.io/code-generator/generate-groups.sh \
   --output-base ../../.. \
   $@
 
-# Generate apiextensions.k8s.io/v1
-# Generate manifests e.g. CRD, RBAC etc.
-controller-gen \
-  crd:crdVersions=v1\
-  paths=./pkg/apis/velero/v1/... \
-  rbac:roleName=velero-perms \
-  paths=./pkg/controller/... \
-  output:crd:artifacts:config=config/crd/v1/bases \
-  object \
-  paths=./pkg/apis/velero/v1/...
+# Generate both apiextensions.k8s.io/v1beta1 and apiextensions.k8s.io/v1
+for version in v1beta1 v1
+do
+  # Generate manifests e.g. CRD, RBAC etc.
+  controller-gen \
+    crd:crdVersions=$version,preserveUnknownFields=false,trivialVersions=true \
+    paths=./pkg/apis/velero/v1/... \
+    paths=./pkg/controller/... \
+    output:crd:artifacts:config=config/crd/$version/bases
 
-# this is a super hacky workaround for https://github.com/kubernetes/kubernetes/issues/91395
-# which a result of fixing the validation on CRD objects. The validation ensures the fields that are list map keys, are either marked
-# as required or have default values to ensure merging of list map items work as expected.
-# With "containerPort" and "protocol" being considered as x-kubernetes-list-map-keys in the container ports, and "protocol" was not
-# a required field, the CRD would fail validation with errors similar to the one reported in https://github.com/kubernetes/kubernetes/issues/91395.
-# once controller-gen (above) is able to generate CRDs with `protocol` as a required field, this hack can be removed.
-kubectl patch -f config/crd/v1/bases/velero.io_restores.yaml -p "$(cat hack/restore-crd-patch-v1.json)" --type=json --local=true -o yaml > /tmp/velero.io_restores-yaml.patched
-mv /tmp/velero.io_restores-yaml.patched config/crd/v1/bases/velero.io_restores.yaml
+  # this is a super hacky workaround for https://github.com/kubernetes/kubernetes/issues/91395
+  # which a result of fixing the validation on CRD objects. The validation ensures the fields that are list map keys, are either marked
+  # as required or have default values to ensure merging of list map items work as expected.
+  # With "containerPort" and "protocol" being considered as x-kubernetes-list-map-keys in the container ports, and "protocol" was not
+  # a required field, the CRD would fail validation with errors similar to the one reported in https://github.com/kubernetes/kubernetes/issues/91395.
+  # once controller-gen (above) is able to generate CRDs with `protocol` as a required field, this hack can be removed.
+  kubectl patch -f config/crd/$version/bases/velero.io_restores.yaml -p "$(cat hack/restore-crd-patch-$version.json)" --type=json --local=true -o yaml > /tmp/velero.io_restores-yaml.patched
+  mv /tmp/velero.io_restores-yaml.patched config/crd/$version/bases/velero.io_restores.yaml
 
-go generate ./config/crd/v1/crds
+  go generate ./config/crd/$version/crds
+done

hack/verify-generated-crd-code.sh

@@ -16,14 +16,17 @@
 
 HACK_DIR=$(dirname "${BASH_SOURCE}")
 
-${HACK_DIR}/update-generated-crd-code.sh
+${HACK_DIR}/update-generated-crd-code.sh --verify-only
 
 # ensure no changes to generated CRDs
-if ! git diff --exit-code config/crd/v1/crds/crds.go >/dev/null; then
-  # revert changes to state before running CRD generation to stay consistent
-  # with code-generator `--verify-only` option which discards generated changes
-  git checkout config/crd
+for version in v1beta1 v1
+do
+  if ! git diff --exit-code config/crd/$version/crds/crds.go >/dev/null; then
+    # revert changes to state before running CRD generation to stay consistent
+    # with code-generator `--verify-only` option which discards generated changes
+    git checkout config/crd
 
-  echo "CRD verification - failed! Generated CRDs are out-of-date, please run 'make update' and 'git add' the generated file(s)."
-  exit 1
-fi
+    echo "CRD verification - failed! Generated CRDs are out-of-date, please run 'make update' and 'git add' the generated file(s)."
+    exit 1
+  fi
+done

internal/delete/delete_item_action_handler.go

@@ -19,8 +19,6 @@ package delete
 import (
 	"io"
 
-	"github.com/vmware-tanzu/velero/pkg/plugin/framework"
-
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/labels"
@@ -31,6 +29,8 @@ import (
 	"github.com/vmware-tanzu/velero/pkg/archive"
 	"github.com/vmware-tanzu/velero/pkg/discovery"
 	"github.com/vmware-tanzu/velero/pkg/plugin/velero"
+	deleteactionitemv2 "github.com/vmware-tanzu/velero/pkg/plugin/velero/deleteitemaction/v2"
+	"github.com/vmware-tanzu/velero/pkg/util/collections"
 	"github.com/vmware-tanzu/velero/pkg/util/filesystem"
 )
 
@@ -38,17 +38,18 @@ import (
 type Context struct {
 	Backup          *velerov1api.Backup
 	BackupReader    io.Reader
-	Actions         []velero.DeleteItemAction
+	Actions         []deleteactionitemv2.DeleteItemAction
 	Filesystem      filesystem.Interface
 	Log             logrus.FieldLogger
 	DiscoveryHelper discovery.Helper
-	resolvedActions []framework.DeleteItemResolvedAction
+
+	resolvedActions []resolvedAction
 }
 
 func InvokeDeleteActions(ctx *Context) error {
 	var err error
-	resolver := framework.NewDeleteItemActionResolver(ctx.Actions)
-	ctx.resolvedActions, err = resolver.ResolveActions(ctx.DiscoveryHelper)
+	ctx.resolvedActions, err = resolveActions(ctx.Actions, ctx.DiscoveryHelper)
+
 	// No actions installed and no error means we don't have to continue;
 	// just do the backup deletion without worrying about plugins.
 	if len(ctx.resolvedActions) == 0 && err == nil {
@@ -62,21 +63,27 @@ func InvokeDeleteActions(ctx *Context) error {
 	dir, err := archive.NewExtractor(ctx.Log, ctx.Filesystem).UnzipAndExtractBackup(ctx.BackupReader)
 	if err != nil {
 		return errors.Wrapf(err, "error extracting backup")
+
 	}
 	defer ctx.Filesystem.RemoveAll(dir)
 	ctx.Log.Debugf("Downloaded and extracted the backup file to: %s", dir)
 
 	backupResources, err := archive.NewParser(ctx.Log, ctx.Filesystem).Parse(dir)
-	if existErr := errors.Is(err, archive.ErrNotExist); existErr {
-		ctx.Log.Debug("ignore invoking delete item actions: ", err)
-		return nil
-	} else if err != nil {
+	if err != nil {
 		return errors.Wrapf(err, "error parsing backup %q", dir)
 	}
+
 	processdResources := sets.NewString()
 
+	ctx.Log.Debugf("Trying to reconcile resource names with Kube API server.")
+	// Transform resource names based on what's canonical in the API server.
 	for resource := range backupResources {
-		groupResource := schema.ParseGroupResource(resource)
+		gvr, _, err := ctx.DiscoveryHelper.ResourceFor(schema.ParseGroupResource(resource).WithVersion(""))
+		if err != nil {
+			return errors.Wrapf(err, "failed to resolve resource into complete group/version/resource: %v", resource)
+		}
+
+		groupResource := gvr.GroupResource()
 
 		// We've already seen this group/resource, so don't process it again.
 		if processdResources.Has(groupResource.String()) {
@@ -86,6 +93,8 @@ func InvokeDeleteActions(ctx *Context) error {
 		// Get a list of all items that exist for this resource
 		resourceList := backupResources[groupResource.String()]
 		if resourceList == nil {
+			// After canonicalization from the API server, the resources may not exist in the tarball
+			// Skip them if that's the case.
 			continue
 		}
 
@@ -111,10 +120,10 @@ func InvokeDeleteActions(ctx *Context) error {
 				itemLog.Infof("invoking DeleteItemAction plugins")
 
 				for _, action := range actions {
-					if !action.Selector.Matches(labels.Set(obj.GetLabels())) {
+					if !action.selector.Matches(labels.Set(obj.GetLabels())) {
 						continue
 					}
-					err = action.DeleteItemAction.Execute(&velero.DeleteItemActionExecuteInput{
+					err = action.Execute(&velero.DeleteItemActionExecuteInput{
 						Item:   obj,
 						Backup: ctx.Backup,
 					})
@@ -131,12 +140,65 @@ func InvokeDeleteActions(ctx *Context) error {
 }
 
 // getApplicableActions takes resolved DeleteItemActions and filters them for a given group/resource and namespace.
-func (ctx *Context) getApplicableActions(groupResource schema.GroupResource, namespace string) []framework.DeleteItemResolvedAction {
-	var actions []framework.DeleteItemResolvedAction
+func (ctx *Context) getApplicableActions(groupResource schema.GroupResource, namespace string) []resolvedAction {
+	var actions []resolvedAction
+
 	for _, action := range ctx.resolvedActions {
-		if action.ShouldUse(groupResource, namespace, nil, ctx.Log) {
-			actions = append(actions, action)
+		if !action.resourceIncludesExcludes.ShouldInclude(groupResource.String()) {
+			continue
 		}
+
+		if namespace != "" && !action.namespaceIncludesExcludes.ShouldInclude(namespace) {
+			continue
+		}
+
+		if namespace == "" && !action.namespaceIncludesExcludes.IncludeEverything() {
+			continue
+		}
+
+		actions = append(actions, action)
 	}
+
 	return actions
 }
+
+// resolvedActions are DeleteItemActions decorated with resource/namespace include/exclude collections, as well as label selectors for easy comparison.
+type resolvedAction struct {
+	deleteactionitemv2.DeleteItemAction
+
+	resourceIncludesExcludes  *collections.IncludesExcludes
+	namespaceIncludesExcludes *collections.IncludesExcludes
+	selector                  labels.Selector
+}
+
+// resolveActions resolves the AppliesTo ResourceSelectors of DeleteItemActions plugins against the Kubernetes discovery API for fully-qualified names.
+func resolveActions(actions []deleteactionitemv2.DeleteItemAction, helper discovery.Helper) ([]resolvedAction, error) {
+	var resolved []resolvedAction
+
+	for _, action := range actions {
+		resourceSelector, err := action.AppliesTo()
+		if err != nil {
+			return nil, err
+		}
+
+		resources := collections.GetResourceIncludesExcludes(helper, resourceSelector.IncludedResources, resourceSelector.ExcludedResources)
+		namespaces := collections.NewIncludesExcludes().Includes(resourceSelector.IncludedNamespaces...).Excludes(resourceSelector.ExcludedNamespaces...)
+
+		selector := labels.Everything()
+		if resourceSelector.LabelSelector != "" {
+			if selector, err = labels.Parse(resourceSelector.LabelSelector); err != nil {
+				return nil, err
+			}
+		}
+
+		res := resolvedAction{
+			DeleteItemAction:          action,
+			resourceIncludesExcludes:  resources,
+			namespaceIncludesExcludes: namespaces,
+			selector:                  selector,
+		}
+		resolved = append(resolved, res)
+	}
+
+	return resolved, nil
+}

internal/delete/delete_item_action_handler_test.go

@@ -138,17 +138,6 @@ func TestInvokeDeleteItemActionsRunForCorrectItems(t *testing.T) {
 				new(recordResourcesAction).ForLabelSelector("app=app1"): {"ns-1/pod-1", "ns-2/pvc-2"},
 			},
 		},
-		{
-			name:   "success if resources dir does not exist",
-			backup: builder.ForBackup("velero", "velero").Result(),
-			tarball: test.NewTarWriter(t).
-				Done(),
-			apiResources: []*test.APIResource{test.Pods(), test.PVCs()},
-			actions: map[*recordResourcesAction][]string{
-				new(recordResourcesAction).ForNamespace("ns-1").ForResource("persistentvolumeclaims"): nil,
-				new(recordResourcesAction).ForNamespace("ns-2").ForResource("pods"):                   nil,
-			},
-		},
 	}
 
 	for _, tc := range tests {
@@ -160,7 +149,7 @@ func TestInvokeDeleteItemActionsRunForCorrectItems(t *testing.T) {
 			}
 
 			// Get the plugins out of the map in order to use them.
-			var actions []velero.DeleteItemAction
+			actions := []velero.DeleteItemAction{}
 			for action := range tc.actions {
 				actions = append(actions, action)
 			}

internal/hook/item_hook_handler.go

@@ -104,7 +104,6 @@ func (i *InitContainerRestoreHookHandler) HandleRestoreHooks(
 	groupResource schema.GroupResource,
 	obj runtime.Unstructured,
 	resourceRestoreHooks []ResourceRestoreHook,
-	namespaceMapping map[string]string,
 ) (runtime.Unstructured, error) {
 	// We only support hooks on pods right now
 	if groupResource != kuberesource.Pods {
@@ -142,13 +141,6 @@ func (i *InitContainerRestoreHookHandler) HandleRestoreHooks(
 		namespace := metadata.GetNamespace()
 		labels := labels.Set(metadata.GetLabels())
 
-		// Apply the hook according to the target namespace in which the pod will be restored
-		// more details see https://github.com/vmware-tanzu/velero/issues/4720
-		if namespaceMapping != nil {
-			if n, ok := namespaceMapping[namespace]; ok {
-				namespace = n
-			}
-		}
 		for _, rh := range resourceRestoreHooks {
 			if !rh.Selector.applicableTo(groupResource, namespace, labels) {
 				continue

internal/hook/item_hook_handler_test.go

@@ -1395,12 +1395,11 @@ func TestGetRestoreHooksFromSpec(t *testing.T) {
 
 func TestHandleRestoreHooks(t *testing.T) {
 	testCases := []struct {
-		name             string
-		podInput         corev1api.Pod
-		restoreHooks     []ResourceRestoreHook
-		namespaceMapping map[string]string
-		expectedPod      *corev1api.Pod
-		expectedError    error
+		name          string
+		podInput      corev1api.Pod
+		restoreHooks  []ResourceRestoreHook
+		expectedPod   *corev1api.Pod
+		expectedError error
 	}{
 		{
 			name: "should handle hook from annotation no hooks in spec on pod with no init containers",
@@ -1841,87 +1840,6 @@ func TestHandleRestoreHooks(t *testing.T) {
 			},
 			restoreHooks: []ResourceRestoreHook{},
 		},
-		{
-			name: "should not apply init container when the namespace mapping is provided and the hook points to the original namespace",
-			podInput: corev1api.Pod{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "app1",
-					Namespace: "default",
-				},
-				Spec: corev1api.PodSpec{},
-			},
-			expectedError: nil,
-			expectedPod: &corev1api.Pod{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "app1",
-					Namespace: "default",
-				},
-				Spec: corev1api.PodSpec{},
-			},
-			restoreHooks: []ResourceRestoreHook{
-				{
-					Name: "hook1",
-					Selector: ResourceHookSelector{
-						Namespaces: collections.NewIncludesExcludes().Includes("default"),
-						Resources:  collections.NewIncludesExcludes().Includes(kuberesource.Pods.Resource),
-					},
-					RestoreHooks: []velerov1api.RestoreResourceHook{
-						{
-							Init: &velerov1api.InitRestoreHook{
-								InitContainers: []corev1api.Container{
-									*builder.ForContainer("restore-init-container-1", "nginx").
-										Command([]string{"a", "b", "c"}).Result(),
-								},
-							},
-						},
-					},
-				},
-			},
-			namespaceMapping: map[string]string{"default": "new"},
-		},
-		{
-			name: "should apply init container when the namespace mapping is provided and the hook points to the new namespace",
-			podInput: corev1api.Pod{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "app1",
-					Namespace: "default",
-				},
-				Spec: corev1api.PodSpec{},
-			},
-			expectedError: nil,
-			expectedPod: &corev1api.Pod{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "app1",
-					Namespace: "default",
-				},
-				Spec: corev1api.PodSpec{
-					InitContainers: []corev1api.Container{
-						*builder.ForContainer("restore-init-container-1", "nginx").
-							Command([]string{"a", "b", "c"}).Result(),
-					},
-				},
-			},
-			restoreHooks: []ResourceRestoreHook{
-				{
-					Name: "hook1",
-					Selector: ResourceHookSelector{
-						Namespaces: collections.NewIncludesExcludes().Includes("new"),
-						Resources:  collections.NewIncludesExcludes().Includes(kuberesource.Pods.Resource),
-					},
-					RestoreHooks: []velerov1api.RestoreResourceHook{
-						{
-							Init: &velerov1api.InitRestoreHook{
-								InitContainers: []corev1api.Container{
-									*builder.ForContainer("restore-init-container-1", "nginx").
-										Command([]string{"a", "b", "c"}).Result(),
-								},
-							},
-						},
-					},
-				},
-			},
-			namespaceMapping: map[string]string{"default": "new"},
-		},
 	}
 
 	for _, tc := range testCases {
@@ -1929,7 +1847,7 @@ func TestHandleRestoreHooks(t *testing.T) {
 			handler := InitContainerRestoreHookHandler{}
 			podMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(&tc.podInput)
 			assert.NoError(t, err)
-			actual, err := handler.HandleRestoreHooks(velerotest.NewLogger(), kuberesource.Pods, &unstructured.Unstructured{Object: podMap}, tc.restoreHooks, tc.namespaceMapping)
+			actual, err := handler.HandleRestoreHooks(velerotest.NewLogger(), kuberesource.Pods, &unstructured.Unstructured{Object: podMap}, tc.restoreHooks)
 			assert.Equal(t, tc.expectedError, err)
 			actualPod := new(corev1api.Pod)
 			err = runtime.DefaultUnstructuredConverter.FromUnstructured(actual.UnstructuredContent(), actualPod)

pkg/apis/velero/v1/backup.go

@@ -59,15 +59,6 @@ type BackupSpec struct {
 	// +nullable
 	LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty"`
 
-	// OrLabelSelectors is list of metav1.LabelSelector to filter with
-	// when adding individual objects to the backup. If multiple provided
-	// they will be joined by the OR operator. LabelSelector as well as
-	// OrLabelSelectors cannot co-exist in backup request, only one of them
-	// can be used.
-	// +optional
-	// +nullable
-	OrLabelSelectors []*metav1.LabelSelector `json:"orLabelSelectors,omitempty"`
-
 	// SnapshotVolumes specifies whether to take cloud snapshots
 	// of any PV's referenced in the set of objects included
 	// in the Backup.
@@ -110,12 +101,6 @@ type BackupSpec struct {
 	// +optional
 	// +nullable
 	OrderedResources map[string]string `json:"orderedResources,omitempty"`
-
-	// CSISnapshotTimeout specifies the time used to wait for CSI VolumeSnapshot status turns to
-	// ReadyToUse during creation, before returning error as timeout.
-	// The default value is 10 minute.
-	// +optional
-	CSISnapshotTimeout metav1.Duration `json:"csiSnapshotTimeout,omitempty"`
 }
 
 // BackupHooks contains custom behaviors that should be executed at different phases of the backup.
@@ -307,10 +292,6 @@ type BackupStatus struct {
 	// +optional
 	VolumeSnapshotsCompleted int `json:"volumeSnapshotsCompleted,omitempty"`
 
-	// FailureReason is an error that caused the entire backup to fail.
-	// +optional
-	FailureReason string `json:"failureReason,omitempty"`
-
 	// Warnings is a count of all warning messages that were generated during
 	// execution of the backup. The actual warnings are in the backup's log
 	// file in object storage.
@@ -329,16 +310,6 @@ type BackupStatus struct {
 	// +optional
 	// +nullable
 	Progress *BackupProgress `json:"progress,omitempty"`
-
-	// CSIVolumeSnapshotsAttempted is the total number of attempted
-	// CSI VolumeSnapshots for this backup.
-	// +optional
-	CSIVolumeSnapshotsAttempted int `json:"csiVolumeSnapshotsAttempted,omitempty"`
-
-	// CSIVolumeSnapshotsCompleted is the total number of successfully
-	// completed CSI VolumeSnapshots for this backup.
-	// +optional
-	CSIVolumeSnapshotsCompleted int `json:"csiVolumeSnapshotsCompleted,omitempty"`
 }
 
 // BackupProgress stores information about the progress of a Backup's execution.

pkg/apis/velero/v1/backupstoragelocation_types.go

@@ -74,10 +74,6 @@ type BackupStorageLocationStatus struct {
 	// +nullable
 	LastValidationTime *metav1.Time `json:"lastValidationTime,omitempty"`
 
-	// Message is a message about the backup storage location's status.
-	// +optional
-	Message string `json:"message,omitempty"`
-
 	// LastSyncedRevision is the value of the `metadata/revision` file in the backup
 	// storage location the last time the BSL's contents were synced into the cluster.
 	//
@@ -102,6 +98,7 @@ type BackupStorageLocationStatus struct {
 // +kubebuilder:resource:shortName=bsl
 // +kubebuilder:object:generate=true
 // +kubebuilder:storageversion
+// +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="Backup Storage Location status such as Available/Unavailable"
 // +kubebuilder:printcolumn:name="Last Validated",type="date",JSONPath=".status.lastValidationTime",description="LastValidationTime is the last time the backup store location was validated"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"

pkg/apis/velero/v1/constants.go

@@ -46,8 +46,4 @@ const (
 
 	// APIGroupVersionsFeatureFlag is the feature flag string that defines whether or not to handle multiple API Group Versions
 	APIGroupVersionsFeatureFlag = "EnableAPIGroupVersions"
-
-	// UploadProgressFeatureFlag is the feature flag string that defines whether or not upload progress monitoring is enabled
-	// and whether or not ItemSnapshotters should be invoked
-	UploadProgressFeatureFlag = "EnableUploadProgress"
 )

pkg/apis/velero/v1/delete_backup_request.go

@@ -50,14 +50,8 @@ type DeleteBackupRequestStatus struct {
 	Errors []string `json:"errors,omitempty"`
 }
 
-// TODO(2.0) After converting all resources to use the runtime-controller client, the genclient and k8s:deepcopy markers will no longer be needed and should be removed.
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:root=true
-// +kubebuilder:object:generate=true
-// +kubebuilder:storageversion
-// +kubebuilder:printcolumn:name="BackupName",type="string",JSONPath=".spec.backupName",description="The name of the backup to be deleted"
-// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase",description="The status of the deletion request"
 
 // DeleteBackupRequest is a request to delete one or more backups.
 type DeleteBackupRequest struct {
@@ -74,7 +68,6 @@ type DeleteBackupRequest struct {
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:root=true
 
 // DeleteBackupRequestList is a list of DeleteBackupRequests.
 type DeleteBackupRequestList struct {

pkg/apis/velero/v1/download_request_types.go

@@ -1,5 +1,5 @@
 /*
-Copyright The Velero Contributors.
+Copyright the Velero contributors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,19 +25,16 @@ type DownloadRequestSpec struct {
 }
 
 // DownloadTargetKind represents what type of file to download.
-// +kubebuilder:validation:Enum=BackupLog;BackupContents;BackupVolumeSnapshots;BackupItemSnapshots;BackupResourceList;RestoreLog;RestoreResults;CSIBackupVolumeSnapshots;CSIBackupVolumeSnapshotContents
+// +kubebuilder:validation:Enum=BackupLog;BackupContents;BackupVolumeSnapshots;BackupResourceList;RestoreLog;RestoreResults
 type DownloadTargetKind string
 
 const (
-	DownloadTargetKindBackupLog                       DownloadTargetKind = "BackupLog"
-	DownloadTargetKindBackupContents                  DownloadTargetKind = "BackupContents"
-	DownloadTargetKindBackupVolumeSnapshots           DownloadTargetKind = "BackupVolumeSnapshots"
-	DownloadTargetKindBackupItemSnapshots             DownloadTargetKind = "BackupItemSnapshots"
-	DownloadTargetKindBackupResourceList              DownloadTargetKind = "BackupResourceList"
-	DownloadTargetKindRestoreLog                      DownloadTargetKind = "RestoreLog"
-	DownloadTargetKindRestoreResults                  DownloadTargetKind = "RestoreResults"
-	DownloadTargetKindCSIBackupVolumeSnapshots        DownloadTargetKind = "CSIBackupVolumeSnapshots"
-	DownloadTargetKindCSIBackupVolumeSnapshotContents DownloadTargetKind = "CSIBackupVolumeSnapshotContents"
+	DownloadTargetKindBackupLog             DownloadTargetKind = "BackupLog"
+	DownloadTargetKindBackupContents        DownloadTargetKind = "BackupContents"
+	DownloadTargetKindBackupVolumeSnapshots DownloadTargetKind = "BackupVolumeSnapshots"
+	DownloadTargetKindBackupResourceList    DownloadTargetKind = "BackupResourceList"
+	DownloadTargetKindRestoreLog            DownloadTargetKind = "RestoreLog"
+	DownloadTargetKindRestoreResults        DownloadTargetKind = "RestoreResults"
 )
 
 // DownloadTarget is the specification for what kind of file to download, and the name of the
@@ -87,6 +84,7 @@ type DownloadRequestStatus struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:object:generate=true
 // +kubebuilder:storageversion
+// +kubebuilder:subresource:status
 
 // DownloadRequest is a request to download an artifact from backup object storage, such as a backup
 // log file.

pkg/apis/velero/v1/pod_volume_backup.go

@@ -1,5 +1,5 @@
 /*
-Copyright The Velero Contributors.
+Copyright 2018 the Velero contributors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -98,20 +98,8 @@ type PodVolumeBackupStatus struct {
 	Progress PodVolumeOperationProgress `json:"progress,omitempty"`
 }
 
-// TODO(2.0) After converting all resources to use the runttime-controller client,
-// the genclient and k8s:deepcopy markers will no longer be needed and should be removed.
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase",description="Pod Volume Backup status such as New/InProgress"
-// +kubebuilder:printcolumn:name="Created",type="date",JSONPath=".status.startTimestamp",description="Time when this backup was started"
-// +kubebuilder:printcolumn:name="Namespace",type="string",JSONPath=".spec.pod.namespace",description="Namespace of the pod containing the volume to be backed up"
-// +kubebuilder:printcolumn:name="Pod",type="string",JSONPath=".spec.pod.name",description="Name of the pod containing the volume to be backed up"
-// +kubebuilder:printcolumn:name="Volume",type="string",JSONPath=".spec.volume",description="Name of the volume to be backed up"
-// +kubebuilder:printcolumn:name="Restic Repo",type="string",JSONPath=".spec.repoIdentifier",description="Restic repository identifier for this backup"
-// +kubebuilder:printcolumn:name="Storage Location",type="string",JSONPath=".spec.backupStorageLocation",description="Name of the Backup Storage Location where this backup should be stored"
-// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
-// +kubebuilder:object:root=true
-// +kubebuilder:object:generate=true
 
 type PodVolumeBackup struct {
 	metav1.TypeMeta `json:",inline"`
@@ -126,12 +114,7 @@ type PodVolumeBackup struct {
 	Status PodVolumeBackupStatus `json:"status,omitempty"`
 }
 
-// TODO(2.0) After converting all resources to use the runtime-controller client,
-// the k8s:deepcopy marker will no longer be needed and should be removed.
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:root=true
-// +kubebuilder:rbac:groups=velero.io,resources=podvolumebackups,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=velero.io,resources=podvolumebackups/status,verbs=get;update;patch
 
 // PodVolumeBackupList is a list of PodVolumeBackups.
 type PodVolumeBackupList struct {

pkg/apis/velero/v1/pod_volume_operation_progress.go

@@ -1,5 +1,5 @@
 /*
-Copyright The Velero Contributors.
+Copyright 2019 the Velero contributors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

pkg/apis/velero/v1/pod_volume_restore.go

@@ -81,19 +81,8 @@ type PodVolumeRestoreStatus struct {
 	Progress PodVolumeOperationProgress `json:"progress,omitempty"`
 }
 
-// TODO(2.0) After converting all resources to use the runtime-controller client, the genclient and k8s:deepcopy markers will no longer be needed and should be removed.
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:generate=true
-// +kubebuilder:object:root=true
-// +kubebuilder:storageversion
-// +kubebuilder:printcolumn:name="Namespace",type="string",JSONPath=".spec.pod.namespace",description="Namespace of the pod containing the volume to be restored"
-// +kubebuilder:printcolumn:name="Pod",type="string",JSONPath=".spec.pod.name",description="Name of the pod containing the volume to be restored"
-// +kubebuilder:printcolumn:name="Volume",type="string",JSONPath=".spec.volume",description="Name of the volume to be restored"
-// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase",description="Pod Volume Restore status such as New/InProgress"
-// +kubebuilder:printcolumn:name="TotalBytes",type="integer",format="int64",JSONPath=".status.progress.totalBytes",description="Pod Volume Restore status such as New/InProgress"
-// +kubebuilder:printcolumn:name="BytesDone",type="integer",format="int64",JSONPath=".status.progress.bytesDone",description="Pod Volume Restore status such as New/InProgress"
-// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 type PodVolumeRestore struct {
 	metav1.TypeMeta `json:",inline"`
@@ -109,8 +98,6 @@ type PodVolumeRestore struct {
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:generate=true
-// +kubebuilder:object:root=true
 
 // PodVolumeRestoreList is a list of PodVolumeRestores.
 type PodVolumeRestoreList struct {

pkg/apis/velero/v1/restic_repository.go

@@ -64,14 +64,8 @@ type ResticRepositoryStatus struct {
 	LastMaintenanceTime *metav1.Time `json:"lastMaintenanceTime,omitempty"`
 }
 
-// TODO(2.0) After converting all resources to use the runtime-controller client,
-// the genclient and k8s:deepcopy markers will no longer be needed and should be removed.
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:root=true
-// +kubebuilder:object:generate=true
-// +kubebuilder:storageversion
-// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 type ResticRepository struct {
 	metav1.TypeMeta `json:",inline"`
@@ -86,12 +80,7 @@ type ResticRepository struct {
 	Status ResticRepositoryStatus `json:"status,omitempty"`
 }
 
-// TODO(2.0) After converting all resources to use the runtime-controller client,
-// the k8s:deepcopy marker will no longer be needed and should be removed.
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:root=true
-// +kubebuilder:rbac:groups=velero.io,resources=resticrepositories,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=velero.io,resources=resticrepositories/status,verbs=get;update;patch
 
 // ResticRepositoryList is a list of ResticRepositories.
 type ResticRepositoryList struct {

pkg/apis/velero/v1/restore.go

@@ -71,27 +71,12 @@ type RestoreSpec struct {
 	// +nullable
 	LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty"`
 
-	// OrLabelSelectors is list of metav1.LabelSelector to filter with
-	// when restoring individual objects from the backup. If multiple provided
-	// they will be joined by the OR operator. LabelSelector as well as
-	// OrLabelSelectors cannot co-exist in restore request, only one of them
-	// can be used
-	// +optional
-	// +nullable
-	OrLabelSelectors []*metav1.LabelSelector `json:"orLabelSelectors,omitempty"`
-
 	// RestorePVs specifies whether to restore all included
 	// PVs from snapshot (via the cloudprovider).
 	// +optional
 	// +nullable
 	RestorePVs *bool `json:"restorePVs,omitempty"`
 
-	// RestoreStatus specifies which resources we should restore the status
-	// field. If nil, no objects are included. Optional.
-	// +optional
-	// +nullable
-	RestoreStatus *RestoreStatusSpec `json:"restoreStatus,omitempty"`
-
 	// PreserveNodePorts specifies whether to restore old nodePorts from backup.
 	// +optional
 	// +nullable
@@ -107,11 +92,6 @@ type RestoreSpec struct {
 	// Hooks represent custom behaviors that should be executed during or post restore.
 	// +optional
 	Hooks RestoreHooks `json:"hooks,omitempty"`
-
-	// ExistingResourcePolicy specifies the restore behaviour for the kubernetes resource to be restored
-	// +optional
-	// +nullable
-	ExistingResourcePolicy PolicyType `json:"existingResourcePolicy,omitempty"`
 }
 
 // RestoreHooks contains custom behaviors that should be executed during or post restore.
@@ -119,19 +99,6 @@ type RestoreHooks struct {
 	Resources []RestoreResourceHookSpec `json:"resources,omitempty"`
 }
 
-type RestoreStatusSpec struct {
-	// IncludedResources specifies the resources to which will restore the status.
-	// If empty, it applies to all resources.
-	// +optional
-	// +nullable
-	IncludedResources []string `json:"includedResources,omitempty"`
-
-	// ExcludedResources specifies the resources to which will not restore the status.
-	// +optional
-	// +nullable
-	ExcludedResources []string `json:"excludedResources,omitempty"`
-}
-
 // RestoreResourceHookSpec defines one or more RestoreResrouceHooks that should be executed based on
 // the rules defined for namespaces, resources, and label selector.
 type RestoreResourceHookSpec struct {
@@ -245,14 +212,6 @@ const (
 	// RestorePhaseFailed means the restore was unable to execute.
 	// The failing error is recorded in status.FailureReason.
 	RestorePhaseFailed RestorePhase = "Failed"
-
-	// PolicyTypeNone means velero will not overwrite the resource
-	// in cluster with the one in backup whether changed/unchanged.
-	PolicyTypeNone PolicyType = "none"
-
-	// PolicyTypeUpdate means velero will try to attempt a patch on
-	// the changed resources.
-	PolicyTypeUpdate PolicyType = "update"
 )
 
 // RestoreStatus captures the current status of a Velero restore
@@ -343,6 +302,3 @@ type RestoreList struct {
 
 	Items []Restore `json:"items"`
 }
-
-// PolicyType helps specify the ExistingResourcePolicy
-type PolicyType string

pkg/apis/velero/v1/schedule.go

@@ -77,16 +77,8 @@ type ScheduleStatus struct {
 	ValidationErrors []string `json:"validationErrors,omitempty"`
 }
 
-// TODO(2.0) After converting all resources to use the runtime-controller client, the genclient and k8s:deepcopy markers will no longer be needed and should be removed.
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:generate=true
-// +kubebuilder:object:root=true
-// +kubebuilder:storageversion
-// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase",description="Status of the schedule"
-// +kubebuilder:printcolumn:name="Schedule",type="string",JSONPath=".spec.schedule",description="A Cron expression defining when to run the Backup"
-// +kubebuilder:printcolumn:name="LastBackup",type="date",JSONPath=".status.lastBackup",description="The last time a Backup was run for this schedule"
-// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // Schedule is a Velero resource that represents a pre-scheduled or
 // periodic Backup that should be run.
@@ -104,8 +96,6 @@ type Schedule struct {
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:object:generate=true
-// +kubebuilder:object:root=true
 
 // ScheduleList is a list of Schedules.
 type ScheduleList struct {

pkg/apis/velero/v1/server_status_request_types.go

@@ -28,6 +28,7 @@ import (
 // +kubebuilder:resource:shortName=ssr
 // +kubebuilder:object:generate=true
 // +kubebuilder:storageversion
+// +kubebuilder:subresource:status
 
 // ServerStatusRequest is a request to access current status information about
 // the Velero server.

pkg/apis/velero/v1/zz_generated.deepcopy.go

@@ -1,14 +1,29 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
-// Code generated by controller-gen. DO NOT EDIT.
+/*
+Copyright the Velero contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by deepcopy-gen. DO NOT EDIT.
 
 package v1
 
 import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
+	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
@@ -18,6 +33,7 @@ func (in *Backup) DeepCopyInto(out *Backup) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
 	in.Status.DeepCopyInto(&out.Status)
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Backup.
@@ -48,6 +64,7 @@ func (in *BackupHooks) DeepCopyInto(out *BackupHooks) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackupHooks.
@@ -72,6 +89,7 @@ func (in *BackupList) DeepCopyInto(out *BackupList) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackupList.
@@ -95,6 +113,7 @@ func (in *BackupList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *BackupProgress) DeepCopyInto(out *BackupProgress) {
 	*out = *in
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackupProgress.
@@ -115,6 +134,7 @@ func (in *BackupResourceHook) DeepCopyInto(out *BackupResourceHook) {
 		*out = new(ExecHook)
 		(*in).DeepCopyInto(*out)
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackupResourceHook.
@@ -169,6 +189,7 @@ func (in *BackupResourceHookSpec) DeepCopyInto(out *BackupResourceHookSpec) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackupResourceHookSpec.
@@ -210,17 +231,6 @@ func (in *BackupSpec) DeepCopyInto(out *BackupSpec) {
 		*out = new(metav1.LabelSelector)
 		(*in).DeepCopyInto(*out)
 	}
-	if in.OrLabelSelectors != nil {
-		in, out := &in.OrLabelSelectors, &out.OrLabelSelectors
-		*out = make([]*metav1.LabelSelector, len(*in))
-		for i := range *in {
-			if (*in)[i] != nil {
-				in, out := &(*in)[i], &(*out)[i]
-				*out = new(metav1.LabelSelector)
-				(*in).DeepCopyInto(*out)
-			}
-		}
-	}
 	if in.SnapshotVolumes != nil {
 		in, out := &in.SnapshotVolumes, &out.SnapshotVolumes
 		*out = new(bool)
@@ -250,7 +260,7 @@ func (in *BackupSpec) DeepCopyInto(out *BackupSpec) {
 			(*out)[key] = val
 		}
 	}
-	out.CSISnapshotTimeout = in.CSISnapshotTimeout
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackupSpec.
@@ -288,6 +298,7 @@ func (in *BackupStatus) DeepCopyInto(out *BackupStatus) {
 		*out = new(BackupProgress)
 		**out = **in
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackupStatus.
@@ -307,6 +318,7 @@ func (in *BackupStorageLocation) DeepCopyInto(out *BackupStorageLocation) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
 	in.Status.DeepCopyInto(&out.Status)
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackupStorageLocation.
@@ -339,6 +351,7 @@ func (in *BackupStorageLocationList) DeepCopyInto(out *BackupStorageLocationList
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackupStorageLocationList.
@@ -385,6 +398,7 @@ func (in *BackupStorageLocationSpec) DeepCopyInto(out *BackupStorageLocationSpec
 		*out = new(metav1.Duration)
 		**out = **in
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackupStorageLocationSpec.
@@ -408,6 +422,7 @@ func (in *BackupStorageLocationStatus) DeepCopyInto(out *BackupStorageLocationSt
 		in, out := &in.LastValidationTime, &out.LastValidationTime
 		*out = (*in).DeepCopy()
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BackupStorageLocationStatus.
@@ -427,6 +442,7 @@ func (in *DeleteBackupRequest) DeepCopyInto(out *DeleteBackupRequest) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	out.Spec = in.Spec
 	in.Status.DeepCopyInto(&out.Status)
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DeleteBackupRequest.
@@ -459,6 +475,7 @@ func (in *DeleteBackupRequestList) DeepCopyInto(out *DeleteBackupRequestList) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DeleteBackupRequestList.
@@ -482,6 +499,7 @@ func (in *DeleteBackupRequestList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DeleteBackupRequestSpec) DeepCopyInto(out *DeleteBackupRequestSpec) {
 	*out = *in
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DeleteBackupRequestSpec.
@@ -502,6 +520,7 @@ func (in *DeleteBackupRequestStatus) DeepCopyInto(out *DeleteBackupRequestStatus
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DeleteBackupRequestStatus.
@@ -521,6 +540,7 @@ func (in *DownloadRequest) DeepCopyInto(out *DownloadRequest) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	out.Spec = in.Spec
 	in.Status.DeepCopyInto(&out.Status)
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DownloadRequest.
@@ -553,6 +573,7 @@ func (in *DownloadRequestList) DeepCopyInto(out *DownloadRequestList) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DownloadRequestList.
@@ -577,6 +598,7 @@ func (in *DownloadRequestList) DeepCopyObject() runtime.Object {
 func (in *DownloadRequestSpec) DeepCopyInto(out *DownloadRequestSpec) {
 	*out = *in
 	out.Target = in.Target
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DownloadRequestSpec.
@@ -596,6 +618,7 @@ func (in *DownloadRequestStatus) DeepCopyInto(out *DownloadRequestStatus) {
 		in, out := &in.Expiration, &out.Expiration
 		*out = (*in).DeepCopy()
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DownloadRequestStatus.
@@ -611,6 +634,7 @@ func (in *DownloadRequestStatus) DeepCopy() *DownloadRequestStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DownloadTarget) DeepCopyInto(out *DownloadTarget) {
 	*out = *in
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DownloadTarget.
@@ -632,6 +656,7 @@ func (in *ExecHook) DeepCopyInto(out *ExecHook) {
 		copy(*out, *in)
 	}
 	out.Timeout = in.Timeout
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExecHook.
@@ -654,6 +679,7 @@ func (in *ExecRestoreHook) DeepCopyInto(out *ExecRestoreHook) {
 	}
 	out.ExecTimeout = in.ExecTimeout
 	out.WaitTimeout = in.WaitTimeout
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExecRestoreHook.
@@ -677,6 +703,7 @@ func (in *InitRestoreHook) DeepCopyInto(out *InitRestoreHook) {
 		}
 	}
 	out.Timeout = in.Timeout
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InitRestoreHook.
@@ -699,6 +726,7 @@ func (in *Metadata) DeepCopyInto(out *Metadata) {
 			(*out)[key] = val
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Metadata.
@@ -719,6 +747,7 @@ func (in *ObjectStorageLocation) DeepCopyInto(out *ObjectStorageLocation) {
 		*out = make([]byte, len(*in))
 		copy(*out, *in)
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ObjectStorageLocation.
@@ -734,6 +763,7 @@ func (in *ObjectStorageLocation) DeepCopy() *ObjectStorageLocation {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PluginInfo) DeepCopyInto(out *PluginInfo) {
 	*out = *in
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PluginInfo.
@@ -753,6 +783,7 @@ func (in *PodVolumeBackup) DeepCopyInto(out *PodVolumeBackup) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
 	in.Status.DeepCopyInto(&out.Status)
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodVolumeBackup.
@@ -785,6 +816,7 @@ func (in *PodVolumeBackupList) DeepCopyInto(out *PodVolumeBackupList) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodVolumeBackupList.
@@ -816,6 +848,7 @@ func (in *PodVolumeBackupSpec) DeepCopyInto(out *PodVolumeBackupSpec) {
 			(*out)[key] = val
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodVolumeBackupSpec.
@@ -840,6 +873,7 @@ func (in *PodVolumeBackupStatus) DeepCopyInto(out *PodVolumeBackupStatus) {
 		*out = (*in).DeepCopy()
 	}
 	out.Progress = in.Progress
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodVolumeBackupStatus.
@@ -855,6 +889,7 @@ func (in *PodVolumeBackupStatus) DeepCopy() *PodVolumeBackupStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *PodVolumeOperationProgress) DeepCopyInto(out *PodVolumeOperationProgress) {
 	*out = *in
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodVolumeOperationProgress.
@@ -874,6 +909,7 @@ func (in *PodVolumeRestore) DeepCopyInto(out *PodVolumeRestore) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	out.Spec = in.Spec
 	in.Status.DeepCopyInto(&out.Status)
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodVolumeRestore.
@@ -906,6 +942,7 @@ func (in *PodVolumeRestoreList) DeepCopyInto(out *PodVolumeRestoreList) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodVolumeRestoreList.
@@ -930,6 +967,7 @@ func (in *PodVolumeRestoreList) DeepCopyObject() runtime.Object {
 func (in *PodVolumeRestoreSpec) DeepCopyInto(out *PodVolumeRestoreSpec) {
 	*out = *in
 	out.Pod = in.Pod
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodVolumeRestoreSpec.
@@ -954,6 +992,7 @@ func (in *PodVolumeRestoreStatus) DeepCopyInto(out *PodVolumeRestoreStatus) {
 		*out = (*in).DeepCopy()
 	}
 	out.Progress = in.Progress
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PodVolumeRestoreStatus.
@@ -973,6 +1012,7 @@ func (in *ResticRepository) DeepCopyInto(out *ResticRepository) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	out.Spec = in.Spec
 	in.Status.DeepCopyInto(&out.Status)
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResticRepository.
@@ -1005,6 +1045,7 @@ func (in *ResticRepositoryList) DeepCopyInto(out *ResticRepositoryList) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResticRepositoryList.
@@ -1029,6 +1070,7 @@ func (in *ResticRepositoryList) DeepCopyObject() runtime.Object {
 func (in *ResticRepositorySpec) DeepCopyInto(out *ResticRepositorySpec) {
 	*out = *in
 	out.MaintenanceFrequency = in.MaintenanceFrequency
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResticRepositorySpec.
@@ -1048,6 +1090,7 @@ func (in *ResticRepositoryStatus) DeepCopyInto(out *ResticRepositoryStatus) {
 		in, out := &in.LastMaintenanceTime, &out.LastMaintenanceTime
 		*out = (*in).DeepCopy()
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResticRepositoryStatus.
@@ -1067,6 +1110,7 @@ func (in *Restore) DeepCopyInto(out *Restore) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
 	in.Status.DeepCopyInto(&out.Status)
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Restore.
@@ -1097,6 +1141,7 @@ func (in *RestoreHooks) DeepCopyInto(out *RestoreHooks) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RestoreHooks.
@@ -1121,6 +1166,7 @@ func (in *RestoreList) DeepCopyInto(out *RestoreList) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RestoreList.
@@ -1144,6 +1190,7 @@ func (in *RestoreList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RestoreProgress) DeepCopyInto(out *RestoreProgress) {
 	*out = *in
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RestoreProgress.
@@ -1169,6 +1216,7 @@ func (in *RestoreResourceHook) DeepCopyInto(out *RestoreResourceHook) {
 		*out = new(InitRestoreHook)
 		(*in).DeepCopyInto(*out)
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RestoreResourceHook.
@@ -1216,6 +1264,7 @@ func (in *RestoreResourceHookSpec) DeepCopyInto(out *RestoreResourceHookSpec) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RestoreResourceHookSpec.
@@ -1263,27 +1312,11 @@ func (in *RestoreSpec) DeepCopyInto(out *RestoreSpec) {
 		*out = new(metav1.LabelSelector)
 		(*in).DeepCopyInto(*out)
 	}
-	if in.OrLabelSelectors != nil {
-		in, out := &in.OrLabelSelectors, &out.OrLabelSelectors
-		*out = make([]*metav1.LabelSelector, len(*in))
-		for i := range *in {
-			if (*in)[i] != nil {
-				in, out := &(*in)[i], &(*out)[i]
-				*out = new(metav1.LabelSelector)
-				(*in).DeepCopyInto(*out)
-			}
-		}
-	}
 	if in.RestorePVs != nil {
 		in, out := &in.RestorePVs, &out.RestorePVs
 		*out = new(bool)
 		**out = **in
 	}
-	if in.RestoreStatus != nil {
-		in, out := &in.RestoreStatus, &out.RestoreStatus
-		*out = new(RestoreStatusSpec)
-		(*in).DeepCopyInto(*out)
-	}
 	if in.PreserveNodePorts != nil {
 		in, out := &in.PreserveNodePorts, &out.PreserveNodePorts
 		*out = new(bool)
@@ -1295,6 +1328,7 @@ func (in *RestoreSpec) DeepCopyInto(out *RestoreSpec) {
 		**out = **in
 	}
 	in.Hooks.DeepCopyInto(&out.Hooks)
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RestoreSpec.
@@ -1328,6 +1362,7 @@ func (in *RestoreStatus) DeepCopyInto(out *RestoreStatus) {
 		*out = new(RestoreProgress)
 		**out = **in
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RestoreStatus.
@@ -1340,31 +1375,6 @@ func (in *RestoreStatus) DeepCopy() *RestoreStatus {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RestoreStatusSpec) DeepCopyInto(out *RestoreStatusSpec) {
-	*out = *in
-	if in.IncludedResources != nil {
-		in, out := &in.IncludedResources, &out.IncludedResources
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.ExcludedResources != nil {
-		in, out := &in.ExcludedResources, &out.ExcludedResources
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RestoreStatusSpec.
-func (in *RestoreStatusSpec) DeepCopy() *RestoreStatusSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(RestoreStatusSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Schedule) DeepCopyInto(out *Schedule) {
 	*out = *in
@@ -1372,6 +1382,7 @@ func (in *Schedule) DeepCopyInto(out *Schedule) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
 	in.Status.DeepCopyInto(&out.Status)
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Schedule.
@@ -1404,6 +1415,7 @@ func (in *ScheduleList) DeepCopyInto(out *ScheduleList) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScheduleList.
@@ -1433,6 +1445,7 @@ func (in *ScheduleSpec) DeepCopyInto(out *ScheduleSpec) {
 		*out = new(bool)
 		**out = **in
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScheduleSpec.
@@ -1457,6 +1470,7 @@ func (in *ScheduleStatus) DeepCopyInto(out *ScheduleStatus) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScheduleStatus.
@@ -1476,6 +1490,7 @@ func (in *ServerStatusRequest) DeepCopyInto(out *ServerStatusRequest) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	out.Spec = in.Spec
 	in.Status.DeepCopyInto(&out.Status)
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServerStatusRequest.
@@ -1508,6 +1523,7 @@ func (in *ServerStatusRequestList) DeepCopyInto(out *ServerStatusRequestList) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServerStatusRequestList.
@@ -1531,6 +1547,7 @@ func (in *ServerStatusRequestList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *ServerStatusRequestSpec) DeepCopyInto(out *ServerStatusRequestSpec) {
 	*out = *in
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServerStatusRequestSpec.
@@ -1555,6 +1572,7 @@ func (in *ServerStatusRequestStatus) DeepCopyInto(out *ServerStatusRequestStatus
 		*out = make([]PluginInfo, len(*in))
 		copy(*out, *in)
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServerStatusRequestStatus.
@@ -1575,6 +1593,7 @@ func (in *StorageType) DeepCopyInto(out *StorageType) {
 		*out = new(ObjectStorageLocation)
 		(*in).DeepCopyInto(*out)
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StorageType.
@@ -1594,6 +1613,7 @@ func (in *VolumeSnapshotLocation) DeepCopyInto(out *VolumeSnapshotLocation) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
 	out.Status = in.Status
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VolumeSnapshotLocation.
@@ -1626,6 +1646,7 @@ func (in *VolumeSnapshotLocationList) DeepCopyInto(out *VolumeSnapshotLocationLi
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VolumeSnapshotLocationList.
@@ -1656,6 +1677,7 @@ func (in *VolumeSnapshotLocationSpec) DeepCopyInto(out *VolumeSnapshotLocationSp
 			(*out)[key] = val
 		}
 	}
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VolumeSnapshotLocationSpec.
@@ -1671,6 +1693,7 @@ func (in *VolumeSnapshotLocationSpec) DeepCopy() *VolumeSnapshotLocationSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *VolumeSnapshotLocationStatus) DeepCopyInto(out *VolumeSnapshotLocationStatus) {
 	*out = *in
+	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VolumeSnapshotLocationStatus.

pkg/archive/extractor.go

@@ -84,7 +84,7 @@ func (e *Extractor) readBackup(tarRdr *tar.Reader) (string, error) {
 			return "", err
 		}
 
-		target := filepath.Join(dir, header.Name) //nolint:gosec
+		target := filepath.Join(dir, header.Name)
 
 		switch header.Typeflag {
 		case tar.TypeDir:

pkg/archive/parser.go

@@ -29,8 +29,6 @@ import (
 	"github.com/vmware-tanzu/velero/pkg/util/filesystem"
 )
 
-var ErrNotExist = errors.New("does not exist")
-
 // Parser traverses an extracted archive on disk to validate
 // it and provide a helpful representation of it to consumers.
 type Parser struct {
@@ -68,9 +66,17 @@ func (p *Parser) Parse(dir string) (map[string]*ResourceItems, error) {
 	// ensure top-level "resources" directory exists, and read subdirectories
 	// of it, where each one is expected to correspond to a resource.
 	resourcesDir := filepath.Join(dir, velerov1api.ResourcesDir)
-	resourceDirs, err := p.checkAndReadDir(resourcesDir)
+	exists, err := p.fs.DirExists(resourcesDir)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrapf(err, "error checking for existence of directory %q", strings.TrimPrefix(resourcesDir, dir+"/"))
+	}
+	if !exists {
+		return nil, errors.Errorf("directory %q does not exist", strings.TrimPrefix(resourcesDir, dir+"/"))
+	}
+
+	resourceDirs, err := p.fs.ReadDir(resourcesDir)
+	if err != nil {
+		return nil, errors.Wrapf(err, "error reading contents of directory %q", strings.TrimPrefix(resourcesDir, dir+"/"))
 	}
 
 	// loop through each subdirectory (one per resource) and assemble
@@ -167,15 +173,15 @@ func (p *Parser) getResourceItemsForScope(dir, archiveRootDir string) ([]string,
 func (p *Parser) checkAndReadDir(dir string) ([]os.FileInfo, error) {
 	exists, err := p.fs.DirExists(dir)
 	if err != nil {
-		return nil, errors.Wrapf(err, "error checking for existence of directory %q", filepath.ToSlash(dir))
+		return []os.FileInfo{}, errors.Wrapf(err, "finding %q", dir)
 	}
 	if !exists {
-		return nil, errors.Wrapf(ErrNotExist, "directory %q", filepath.ToSlash(dir))
+		return []os.FileInfo{}, errors.Errorf("%q not found", dir)
 	}
 
 	contents, err := p.fs.ReadDir(dir)
 	if err != nil {
-		return nil, errors.Wrapf(err, "reading contents of %q", filepath.ToSlash(dir))
+		return []os.FileInfo{}, errors.Wrapf(err, "reading contents of %q", dir)
 	}
 
 	return contents, nil

pkg/archive/parser_test.go

@@ -32,13 +32,13 @@ func TestParse(t *testing.T) {
 		name       string
 		files      []string
 		dir        string
-		wantErrMsg error
+		wantErrMsg string
 		want       map[string]*ResourceItems
 	}{
 		{
 			name:       "when there is no top-level resources directory, an error is returned",
 			dir:        "root-dir",
-			wantErrMsg: ErrNotExist,
+			wantErrMsg: "directory \"resources\" does not exist",
 		},
 		{
 			name:  "when there are no directories under the resources directory, an empty map is returned",
@@ -109,8 +109,8 @@ func TestParse(t *testing.T) {
 			}
 
 			res, err := p.Parse(tc.dir)
-			if tc.wantErrMsg != nil {
-				assert.ErrorIs(t, err, tc.wantErrMsg, "Error should be: %v, got: %v", tc.wantErrMsg, err)
+			if tc.wantErrMsg != "" {
+				assert.EqualError(t, err, tc.wantErrMsg)
 			} else {
 				assert.Nil(t, err)
 				assert.Equal(t, tc.want, res)
@@ -124,13 +124,13 @@ func TestParseGroupVersions(t *testing.T) {
 		name       string
 		files      []string
 		backupDir  string
-		wantErrMsg error
+		wantErrMsg string
 		want       map[string]metav1.APIGroup
 	}{
 		{
 			name:       "when there is no top-level resources directory, an error is returned",
 			backupDir:  "/var/folders",
-			wantErrMsg: ErrNotExist,
+			wantErrMsg: "\"/var/folders/resources\" not found",
 		},
 		{
 			name:      "when there are no directories under the resources directory, an empty map is returned",
@@ -223,8 +223,8 @@ func TestParseGroupVersions(t *testing.T) {
 			}
 
 			res, err := p.ParseGroupVersions(tc.backupDir)
-			if tc.wantErrMsg != nil {
-				assert.ErrorIs(t, err, tc.wantErrMsg, "Error should be: %v, got: %v", tc.wantErrMsg, err)
+			if tc.wantErrMsg != "" {
+				assert.EqualError(t, err, tc.wantErrMsg)
 			} else {
 				assert.Nil(t, err)
 				assert.Equal(t, tc.want, res)