Merge pull request #4030 from zubron/cherry-pick-apiservice-action-1-6-3

Cherry-pick and update changelog for v1.6.3

.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

@@ -1,40 +0,0 @@
----
-# This assigns a PR to its author
-addAssignees: author
-
-reviewers:
-  # The default reviewers
-  defaults:
-    - maintainers
-
-  groups:
-    maintainers:
-      - dsu-igeek
-      - sseago
-      - reasonerjt
-      - ywk253100
-      - blackpiglet
-      - qiuming-best
-      - shubham-pampattiwar
-
-    tech-writer:
-      - a-mccarthy
-
-files:
-  'site/**':
-    - tech-writer
-  '**/*.md':
-    - tech-writer
-  # Technical design requests are ".md" files but should
-  # be reviewed by maintainers
-  '/design/**':
-    - maintainers
-
-options:
-  ignore_draft: true
-  ignored_keywords:
-    - WIP
-    - wip
-    - DO NOT MERGE
-  enable_group_assignment: true
-  number_of_reviewers: 2

.github/auto_assign.yml

@@ -0,0 +1,14 @@
+addReviewers: true
+addAssignees: author
+
+# Only require 2, random reviewers.
+# TODO expand this to support using reviewGroups
+numberOfReviewers: 2
+
+reviewers:
+  - nrb
+  - ashish-amarnath
+  - carlisia
+  - zubron
+  - dsu-igeek
+  - jenting

.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

@@ -1,44 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 14
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - Epic
-  - Area/CLI
-  - Area/Cloud/AWS
-  - Area/Cloud/Azure
-  - Area/Cloud/GCP
-  - Area/Cloud/vSphere
-  - Area/CSI
-  - 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
-  - P3 - Wouldn't it be nice if...
-  - Product Requirements
-  - Restic - GA
-  - Restic
-  - release-blocker
-  - Security
-# Label to use when marking an issue as stale
-staleLabel: staled
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: >
-  Closing the stale issue.

.github/workflows/auto_assign_prs.yml

@@ -1,8 +1,6 @@
----
-name: "Auto Assign Author"
-
-# pull_request_target means that this will run on pull requests, but in
-# the context of the base repo. This should mean PRs from forks are supported.
+name: "Auto Assign PR Reviewers"
+# pull_request_target means that this will run on pull requests, but in the context of the base repo.
+# This should mean PRs from forks are supported.
 on:
   pull_request_target:
     types: [opened, reopened, ready_for_review]
@@ -12,8 +10,7 @@ jobs:
   add-reviews:
     runs-on: ubuntu-latest
     steps:
-      - name: Set the author of a PR as the assignee
-        uses: kentaro-m/auto-assign-action@v1.1.1
+      - uses: kentaro-m/auto-assign-action@v1.1.1
         with:
-          configuration-path: ".github/auto-assignees.yml"
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          configuration-path: ".github/auto_assign.yml"
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/auto_request_review.yml

@@ -1,17 +0,0 @@
----
-name: "Auto Request Review"
-
-on:
-  pull_request_target:
-    types: [opened, ready_for_review, reopened]
-
-jobs:
-  auto-request-review:
-    name: Auto Request Review
-    runs-on: ubuntu-latest
-    steps:
-      - name: Request a PR review based on files types/paths, and/or groups the author belongs to
-        uses: necojackarc/auto-request-review@v0.7.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          config: .github/auto-assignees.yml

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

@@ -11,11 +11,6 @@ jobs:
   build-cli:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.16
-        id: go
       # Look for a CLI that's made for this PR
       - name: Fetch built CLI
         id: cache
@@ -57,6 +52,7 @@ 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

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

@@ -11,11 +11,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.17
-        id: go
       # Look for a CLI that's made for this PR
       - name: Fetch built CLI
         id: cli-cache
@@ -64,20 +59,13 @@ jobs:
           #- 1.15.12
           - 1.16.15
           - 1.17.17
-          - 1.18.20
-          - 1.19.16
-          - 1.20.15
-          - 1.21.12
-          - 1.22.9
-          - 1.23.6
-          - 1.24.0
+          - 1.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.17
-        id: go
       - name: Check out the code
         uses: actions/checkout@v2
       - name: Install MinIO
@@ -85,7 +73,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
@@ -122,12 +110,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

@@ -5,13 +5,9 @@ jobs:
     name: Run CI
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.17
-        id: go
       - name: Check out the code
         uses: actions/checkout@v2
+
       - name: Fetch cached go modules
         uses: actions/cache@v2
         with:
@@ -19,11 +15,6 @@ jobs:
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ 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/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.17
+        go-version: 1.15
       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

.gitignore

@@ -24,6 +24,8 @@ _testmain.go
 *.test
 *.prof
 
+debug
+
 /velero
 .idea/
 
@@ -47,4 +49,4 @@ tilt-resources/tilt-settings.json
 tilt-resources/velero_v1_backupstoragelocation.yaml
 tilt-resources/deployment.yaml
 tilt-resources/restic.yaml
-tilt-resources/cloud
+tilt-resources/cloud

.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

@@ -13,8 +13,7 @@ If you're using Velero and want to add your organization to this list,
 <a href="https://banzaicloud.com/" border="0" target="_blank"><img alt="banzaicloud.com" src="site/static/img/adopters/banzaicloud.svg" height="50"></a>&nbsp; &nbsp; &nbsp;
 <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
@@ -54,13 +53,7 @@ MayaData is a large user of Velero as well as a contributor. MayaData offers a D
 
 **[Okteto][93]**  
 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>
-
+​
 ## 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].
@@ -109,10 +102,3 @@ If you would like to add your logo to a future `Adopters of Velero` section on [
 [93]: https://okteto.com
 [94]: https://cloud.okteto.com
 [95]: https://okteto.com/enterprise/
-
-[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,10 +1,7 @@
 ## Current release:
-  * [CHANGELOG-1.9.md][19]
+  * [CHANGELOG-1.6.md][16]
 
 ## 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]
   * [CHANGELOG-1.3.md][13]
@@ -22,9 +19,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
 [14]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.4.md

Dockerfile

@@ -11,7 +11,7 @@
 # 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.
-FROM --platform=$BUILDPLATFORM golang:1.17.13 as builder-env
+FROM --platform=$BUILDPLATFORM golang:1.15 as builder-env
 
 ARG GOPROXY
 ARG PKG
@@ -50,11 +50,13 @@ RUN mkdir -p /output/usr/bin && \
     go build -o /output/${BIN} \
     -ldflags "${LDFLAGS}" ${PKG}/cmd/${BIN}
 
-FROM gcr.io/distroless/base-debian11@sha256:49d2923f35d66b8402487a7c01bc62a66d8279cd42e89c11b64cdce8d5826c03
+FROM ubuntu:focal
 
 LABEL maintainer="Nolan Brubaker <brubakern@vmware.com>"
 
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y ca-certificates tzdata && rm -rf /var/lib/apt/lists/*
+
 COPY --from=builder /output /
 
-USER nonroot:nonroot
+USER nobody:nogroup
 

MAINTAINERS.md

@@ -6,32 +6,24 @@
 
 | Maintainer | GitHub ID | Affiliation |
 | --------------- | --------- | ----------- |
-| Dave Smith-Uchida | [dsu-igeek](https://github.com/dsu-igeek) | [Kasten](https://github.com/kastenhq/) |
-| 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)
+| Carlisia Thompson | [carlisia](https://github.com/carlisia) | [VMware](https://www.github.com/vmware/) |
+| Nolan Brubaker | [nrb](https://github.com/nrb) | [VMware](https://www.github.com/vmware/) |
+| Ashish Amarnath | [ashish-amarnath](https://github.com/ashish-amarnath) | [VMware](https://www.github.com/vmware/) |
+| 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/) 
 
 ## Emeritus Maintainers
 * Adnan Abdulhussein ([prydonius](https://github.com/prydonius))
 * Andy Goldstein ([ncdc](https://github.com/ncdc))
 * Steve Kriss ([skriss](https://github.com/skriss))
-* Carlos Panato ([cpanato](https://github.com/cpanato))
-* 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
 
 | Feature Area | Lead |
 | ----------------------------- | :---------------------: |
-| Architect | Dave Smith-Uchida (dsu-igeek) |
-| Technical Lead | Daniel Jiang (reasonerjt) |
-| Kubernetes CSI Liaison |  |
-| Deployment |  |
-| Community Management | Orlin Vasilev (OrlinVasilev) |
-| Product Management | Eleanor Millman (eleanor-millman) |
+| Technical Lead | Nolan Brubaker (nrb) |
+| Kubernetes CSI Liaison | Nolan Brubaker (nrb), Ashish Amarnath (ashish-amarnath) |
+| Deployment | Carlisia Thompson (carlisia), Carlos Tadeu Panato Junior (cpanato), JenTing Hsiao (jenting) | 
+| Community Management | Jonas Rosland (jonasrosland) |
+| Product Management | Michael Michael (michmike) |

Makefile

@@ -81,10 +81,10 @@ buildx not enabled, refusing to run this recipe
 see: https://velero.io/docs/main/build-from-source/#making-images-and-updating-velero for more info
 endef
 
-# The version of restic binary to be downloaded
-RESTIC_VERSION ?= 0.13.1
+# The version of restic binary to be downloaded for power architecture
+RESTIC_VERSION ?= 0.12.0
 
-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
 
@@ -125,7 +125,6 @@ all-containers: container-builder-env
 	@$(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) \
@@ -291,12 +290,12 @@ push-build-image:
 	@# this target will push the build-image it assumes you already have docker
 	@# credentials needed to accomplish this.
 	@# Pushing will be skipped if a custom Dockerfile was used to build the image.
-ifneq "$(origin BUILDER_IMAGE_DOCKERFILE)" "file"
-	@echo "Dockerfile for builder image has been overridden"
-	@echo "Skipping push of custom image"
-else
-	docker push $(BUILDER_IMAGE)
-endif
+	ifneq "$(origin BUILDER_IMAGE_DOCKERFILE)" "file"
+		@echo "Dockerfile for builder image has been overridden"
+		@echo "Skipping push of custom image"
+	else
+		docker push $(BUILDER_IMAGE)
+	endif
 
 build-image-hugo:
 	cd site && docker build --pull -t $(HUGO_IMAGE) .
@@ -339,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
@@ -360,11 +359,11 @@ 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
 
 .PHONY: test-e2e
 test-e2e: local
-	$(MAKE) -e VERSION=$(VERSION) -C test/e2e run
+	$(MAKE) -C test/e2e run

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,69 @@
-# 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: March 2021`
+
+#### 1.7.0 Roadmap
+The release roadmap is split into Core items that are required for the release, desired items that may be removed from the
+release and opportunistic items that will be added to the release if possible.
+
+##### Core items
+
+|Issue|Description|
+|---|---|
+|[3493](https://github.com/vmware-tanzu/velero/issues/3493)|[Carvel](https://github.com/vmware-tanzu/velero/issues/3493) based installation (in addition to the existing *velero install* CLI).|
+|[3531](https://github.com/vmware-tanzu/velero/issues/3531)|Test plan for Velero|
+|[675](https://github.com/vmware-tanzu/velero/issues/675)|Velero command to generate debugging information.  Will integrate with [Crashd - Crash Diagnostics](https://github.com/vmware-tanzu/velero/issues/675)|
+|[2066](https://github.com/vmware-tanzu/velero/issues/2066)|CSI Snapshots GA|
+|[3285](https://github.com/vmware-tanzu/velero/issues/3285)|Support Velero plugin versioning|
+|[1975](https://github.com/vmware-tanzu/velero/issues/1975)|IPV6 support|
+
+
+
+##### Desired items
+|Issue|Description|
+|---|---|
+|[3533](https://github.com/vmware-tanzu/velero/issues/3533)|Upload Progress Monitoring|
+|[2922](https://github.com/vmware-tanzu/velero/issues/2922)|Plugin timeouts|
+|[3500](https://github.com/vmware-tanzu/velero/issues/3500)|Use distroless containers as a base|
+|[3535](https://github.com/vmware-tanzu/velero/issues/3535)|Design doc for multiple cluster support|
+|[3536](https://github.com/vmware-tanzu/velero/issues/3536)|Manifest for backup/restore|
+
+##### Opportunistic items
+|Issue|Description|
+|---|---|
+|Issues TBD|Controller migrations|
+
+#### Long term roadmap items
+|Theme|Description|Timeline|
+|---|---|---|
+|Restic Improvements|Introduce improvements in annotating resources for Restic backup|TBD|
+|Extensibility|Add restore hooks for enhanced recovery scenarios|TBD|
+|CSI|Continue improving the CSI snapshot capabilities and participate in the upstream K8s CSI community|1.7.0 + Long running (dependent on CSI working group)|
+|Backup/Restore|Improvements to long-running copy operations from a performance and reliability standpoint|1.7.0|
+|Quality/Reliability| Enable automated end-to-end testing |1.6.0|
+|UX|Improvements to install and configuration user experience|Dec 2020|
+|Restic Improvements|Improve the use of Restic in Velero and offer stable support|TBD|
+|Perf & Scale|Introduce a scalable model by using a worker pod for each backup/restore operation and improve operations|1.8.0|
+|Backup/Restore|Better backup and restore semantics for certain Kubernetes resources like stateful sets, operators|2.0|
+|Security|Enable the use of custom credential providers|1.6.0|
+|Self-Service & Multitenancy|Reduce friction by enabling developers to backup their namespaces via self-service. Introduce a Velero multi-tenancy model, enabling owners of namespaces to backup and restore within their access scope|TBD|
+|Backup/Restore|Cross availability zone or region backup and restore|TBD|
+|Application Consistency|Offer blueprints for backing up and restoring popular applications|TBD|
+|Backup/Restore|Data only backup and restore|TBD|
+|Backup/Restore|Introduce the ability to overwrite existing objects during a restore|TBD|
+|Backup/Restore|What-if dry run for backup and restore|1.7.0|

Tiltfile

@@ -16,7 +16,7 @@ k8s_yaml([
 
 # default values
 settings = {
-    "default_registry": "docker.io/velero",
+    "default_registry": "",
     "enable_restic": False,
     "enable_debug": False,
     "debug_continue_on_start": True,  # Continue the velero process by default when in debug mode
@@ -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.17 as tilt-helper
+FROM golang:1.15.3 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  && \
@@ -90,20 +90,20 @@ def get_debug_flag():
 # Set up a local_resource build of the Velero binary. The binary is written to _tiltbuild/velero.
 local_resource(
     "velero_server_binary",
-    cmd = 'cd ' + '.' + ';mkdir -p _tiltbuild;PKG=. BIN=velero GOOS=linux GOARCH=amd64 GIT_SHA=' + git_sha + ' VERSION=main GIT_TREE_STATE=dirty OUTPUT_DIR=_tiltbuild ' + get_debug_flag() + ' REGISTRY=' + settings.get("default_registry") + ' ./hack/build.sh',
+    cmd = 'cd ' + '.' + ';mkdir -p _tiltbuild;PKG=. BIN=velero GOOS=linux GOARCH=amd64 GIT_SHA=' + git_sha + ' VERSION=main GIT_TREE_STATE=dirty OUTPUT_DIR=_tiltbuild ' + get_debug_flag() + ' ./hack/build.sh',
     deps = ["cmd", "internal", "pkg"],
     ignore = ["pkg/cmd"],
 )
 
 local_resource(
     "velero_local_binary",
-    cmd = 'cd ' + '.' + ';mkdir -p _tiltbuild/local;PKG=. BIN=velero GOOS=' + local_goos + ' GOARCH=amd64 GIT_SHA=' + git_sha + ' VERSION=main GIT_TREE_STATE=dirty OUTPUT_DIR=_tiltbuild/local ' + get_debug_flag() + ' REGISTRY=' + settings.get("default_registry") + ' ./hack/build.sh',
+    cmd = 'cd ' + '.' + ';mkdir -p _tiltbuild/local;PKG=. BIN=velero GOOS=' + local_goos + ' GOARCH=amd64 GIT_SHA=' + git_sha + ' VERSION=main GIT_TREE_STATE=dirty OUTPUT_DIR=_tiltbuild/local ' + get_debug_flag() + ' ./hack/build.sh',
     deps = ["internal", "pkg/cmd"],
 )
 
 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

assets/README.md

@@ -1,11 +0,0 @@
-# Velero Assets
-
-This folder contains logo images for Velero in gray (for light backgrounds) and white (for dark backgrounds like black tshirts or dark mode!) – horizontal and stacked… in .eps and .svg.
-
-## Some general guidelines for usage
-
-• Don’t alter the logos/graphics: resize, reformat, recolor. Keep them intact.
-
-• Don’t separate the word mark (Velero) from the icon) – we are still building a strong name and identity – and the logo by itself doesn’t have any strong recognition or association with as yet: so best practice keep the two together. Nike kept its name with the swoosh for quite some time before the swoosh became iconic.
-
-• Don’t append the name to another brand – let it stand alone!

assets/one-line/199150-vmw-os-lgo-velero-final_gry.svg

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_5" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 431.3 150" style="enable-background:new 0 0 431.3 150;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:none;}
-	.st2{fill:#009BDB;}
-	.st3{fill:#717074;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st3" d="M196.6,55.8l-18.2,41.2h-5.1l-18.2-41.2h5.1l15.7,35.5l15.6-35.5H196.6z"/>
-			<path class="st3" d="M206.6,60.3v13.6h22.4v4.4h-22.4v14.3h24.8v4.4h-29.6V55.8h29.6v4.4H206.6z"/>
-			<path class="st3" d="M265.7,92.6v4.4h-27.2V55.8h4.7v36.8H265.7z"/>
-			<path class="st3" d="M275.7,60.3v13.6h22.4v4.4h-22.4v14.3h24.8v4.4H271V55.8h29.6v4.4H275.7z"/>
-			<path class="st3" d="M338,75.3c-1.1,1.9-2.6,3.4-4.6,4.6c-2,1.2-4.2,1.9-6.6,2.2l10.5,14.9H332l-10.4-14.8h-9.1v14.8h-4.7V55.8
-				h16.7c2.8,0,5.4,0.6,7.7,1.7c2.3,1.1,4.1,2.7,5.5,4.7c1.3,2,2,4.3,2,6.8C339.6,71.3,339.1,73.4,338,75.3z M312.4,77.8h11.2
-				c3.4,0,6.1-0.8,8.2-2.3c2.1-1.6,3.1-3.7,3.1-6.4c0-2.7-1-4.9-3.1-6.4c-2.1-1.6-4.8-2.3-8.2-2.3h-11.2V77.8z"/>
-			<path class="st3" d="M354.4,94.9c-3.3-1.9-5.8-4.5-7.8-7.8c-1.9-3.3-2.9-6.8-2.9-10.6c0-3.8,1-7.3,2.9-10.6
-				c1.9-3.3,4.5-5.9,7.8-7.8c3.3-1.9,6.8-2.9,10.5-2.9c3.8,0,7.2,1,10.5,2.9c3.2,1.9,5.8,4.5,7.7,7.8c1.9,3.3,2.9,6.8,2.9,10.6
-				c0,3.8-1,7.3-2.9,10.6c-1.9,3.3-4.5,5.9-7.7,7.8c-3.2,1.9-6.7,2.9-10.5,2.9C361.2,97.8,357.7,96.8,354.4,94.9z M373,91.1
-				c2.5-1.6,4.5-3.6,6-6.2c1.5-2.6,2.2-5.4,2.2-8.5c0-3-0.7-5.8-2.2-8.4c-1.5-2.6-3.5-4.7-6-6.2c-2.5-1.5-5.2-2.3-8.1-2.3
-				c-2.9,0-5.6,0.8-8.1,2.3c-2.5,1.5-4.5,3.6-6,6.2c-1.5,2.6-2.2,5.4-2.2,8.4c0,3,0.8,5.9,2.2,8.5c1.5,2.6,3.5,4.7,6,6.2
-				s5.2,2.3,8.1,2.3C367.8,93.5,370.5,92.7,373,91.1z"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<path class="st1" d="M132.2,77.1c0-0.7,0.1-1.4,0.1-2s0-1.4-0.1-2V77.1z"/>
-			<path class="st2" d="M117,109.3c-3.3,0-4.9,1.2-6.7,2.7c-2,1.6-4.2,3.4-8.6,3.4c-4.3,0-6.6-1.8-8.6-3.4c-1.8-1.4-3.4-2.7-6.7-2.7
-				c-3.3,0-4.9,1.2-6.7,2.7c-2,1.6-4.2,3.4-8.6,3.4c-4.3,0-6.6-1.8-8.6-3.4c-1.8-1.4-3.4-2.7-6.7-2.7c-3.3,0-4.9,1.2-6.7,2.7
-				c-1.3,1-2.7,2.2-4.8,2.8c8.3,7.3,18.9,12,30.5,13c0.3,0,0.6,0.1,1,0.1c1.1,0.1,2.3,0.1,3.4,0.1c1.2,0,2.3-0.1,3.4-0.1
-				c0.3,0,0.6,0,1-0.1c14.2-1.2,26.8-8,35.6-18.2C118.7,109.4,117.9,109.3,117,109.3z"/>
-			<path class="st2" d="M40.8,69.8c3.6,0,5.3-1.4,7.2-2.9c2-1.6,4-3.2,8-3.2s6.1,1.6,8,3.2c1.9,1.5,3.6,2.9,7.2,2.9
-				c3.6,0,5.3-1.4,7.2-2.9c2-1.6,4-3.2,8-3.2c4,0,6.1,1.6,8,3.2c1.9,1.5,3.6,2.9,7.2,2.9c3.6,0,5.3-1.4,7.2-2.9c2-1.6,4-3.2,8-3.2
-				c4,0,6.1,1.6,8,3.2c1.8,1.5,3.6,2.8,7,2.9c-0.5-4.8-1.6-9.5-3.3-13.8c-1.8-0.6-3.1-1.6-4.4-2.6c-1.9-1.5-3.7-2.9-7.4-2.9
-				c-3.7,0-5.5,1.4-7.4,2.9c-1.9,1.5-3.9,3.1-7.9,3.1c-4,0-5.9-1.6-7.9-3.1c-1.9-1.5-3.7-2.9-7.4-2.9c-3.7,0-5.5,1.4-7.4,2.9
-				c-1.9,1.5-3.9,3.1-7.9,3.1c-4,0-5.9-1.6-7.9-3.1c-1.9-1.5-3.7-2.9-7.4-2.9c-3.7,0-5.5,1.4-7.4,2.9c-1.9,1.5-3.9,3.1-7.9,3.1
-				c-4,0-5.9-1.6-7.9-3.1c-0.4-0.3-0.9-0.7-1.3-1c-1.7,3.6-3.1,7.5-3.9,11.6c2.7,0.5,4.3,1.7,5.9,3C35.5,68.4,37.2,69.8,40.8,69.8z"
-				/>
-			<path class="st2" d="M40.8,55.7c3.7,0,5.5-1.4,7.4-2.9c1.9-1.5,3.9-3.1,7.9-3.1c4,0,5.9,1.6,7.9,3.1c1.9,1.5,3.7,2.9,7.4,2.9
-				c3.7,0,5.5-1.4,7.4-2.9c1.9-1.5,3.9-3.1,7.9-3.1c4,0,5.9,1.6,7.9,3.1c1.9,1.5,3.7,2.9,7.4,2.9c3.7,0,5.5-1.4,7.4-2.9
-				c1.9-1.5,3.9-3.1,7.9-3.1c4,0,5.9,1.6,7.9,3.1c1.1,0.8,2.1,1.7,3.4,2.2c-7.9-19.2-26.9-32.8-48.9-32.8c-20.8,0-38.7,12-47.4,29.5
-				c0.5,0.4,1,0.7,1.4,1.1C35.3,54.2,37.1,55.7,40.8,55.7z"/>
-			<path class="st2" d="M117,94.6c-3.4,0-5,1.3-6.8,2.8c-1.9,1.5-4.1,3.3-8.4,3.3c-4.2,0-6.4-1.7-8.4-3.3c-1.9-1.5-3.5-2.8-6.8-2.8
-				c-3.4,0-5,1.3-6.8,2.8c-1.9,1.5-4.1,3.3-8.4,3.3c-4.2,0-6.4-1.7-8.4-3.3c-1.9-1.5-3.5-2.8-6.8-2.8c-3.4,0-5,1.3-6.8,2.8
-				c-1.9,1.5-4.1,3.3-8.4,3.3c-4.2,0-6.4-1.7-8.4-3.3c-0.5-0.4-1-0.8-1.5-1.1c2.6,6,6.3,11.4,10.9,16c2.6-0.2,4-1.4,5.6-2.6
-				c2-1.6,4.2-3.4,8.6-3.4s6.6,1.8,8.6,3.4c1.8,1.4,3.4,2.7,6.7,2.7c3.3,0,4.9-1.2,6.7-2.7c2-1.6,4.2-3.4,8.6-3.4
-				c4.3,0,6.6,1.8,8.6,3.4c1.8,1.4,3.4,2.7,6.7,2.7c3.3,0,4.9-1.2,6.7-2.7c2-1.6,4.2-3.4,8.6-3.4c1.8,0,3.3,0.3,4.5,0.8
-				c1.9-2.5,3.5-5.1,5-7.9c-1-0.6-1.8-1.2-2.6-1.8C122,95.8,120.3,94.6,117,94.6z"/>
-			<path class="st2" d="M132.1,71.2c-4,0-6-1.6-8-3.2c-1.9-1.5-3.6-2.9-7.2-2.9c-3.6,0-5.3,1.4-7.2,2.9c-2,1.6-4,3.2-8,3.2
-				c-4,0-6.1-1.6-8-3.2c-1.9-1.5-3.6-2.9-7.2-2.9c-3.6,0-5.3,1.4-7.2,2.9c-2,1.6-4,3.2-8,3.2c-4,0-6.1-1.6-8-3.2
-				c-1.9-1.5-3.6-2.9-7.2-2.9c-3.6,0-5.3,1.4-7.2,2.9c-2,1.6-4,3.2-8,3.2c-4,0-6.1-1.6-8-3.2c-1.5-1.2-3-2.3-5.3-2.7
-				c-0.5,2.5-0.8,5.1-0.9,7.7c0,0.7-0.1,1.4-0.1,2c0,0.7,0,1.4,0.1,2c0,0.3,0,0.6,0,0.9c3.5,0.3,5.4,1.8,7.2,3.2
-				c1.8,1.4,3.5,2.8,7,2.8c3.5,0,5.2-1.4,7-2.8c1.9-1.5,4.1-3.2,8.2-3.2s6.3,1.7,8.2,3.2c1.8,1.4,3.5,2.8,7,2.8c3.5,0,5.2-1.4,7-2.8
-				c1.9-1.5,4.1-3.2,8.2-3.2c4.1,0,6.3,1.7,8.2,3.2c1.8,1.4,3.5,2.8,7,2.8c3.5,0,5.2-1.4,7-2.8c1.9-1.5,4.1-3.2,8.2-3.2
-				c4.1,0,6.3,1.7,8.2,3.2c1.7,1.3,3.3,2.6,6.3,2.8c0.3-1.6,0.5-3.2,0.6-4.9c0-0.6,0.1-1.3,0.1-1.9V73
-				C132.2,72.4,132.1,71.2,132.1,71.2z"/>
-			<path class="st2" d="M117,79.9c-3.5,0-5.2,1.4-7,2.8c-1.9,1.5-4.1,3.2-8.2,3.2c-4.1,0-6.3-1.7-8.2-3.2c-1.8-1.4-3.5-2.8-7-2.8
-				c-3.5,0-5.2,1.4-7,2.8c-1.9,1.5-4.1,3.2-8.2,3.2c-4.1,0-6.3-1.7-8.2-3.2c-1.8-1.4-3.5-2.8-7-2.8c-3.5,0-5.2,1.4-7,2.8
-				c-1.9,1.5-4.1,3.2-8.2,3.2c-4.1,0-6.3-1.7-8.2-3.2c-1.6-1.3-3.1-2.5-5.8-2.8c0.4,4.5,1.4,8.7,2.8,12.8c1.9,0.6,3.2,1.7,4.4,2.7
-				c1.9,1.5,3.5,2.8,6.8,2.8c3.4,0,5-1.3,6.8-2.8c1.9-1.5,4.1-3.3,8.4-3.3c4.2,0,6.4,1.7,8.4,3.3c1.9,1.5,3.5,2.8,6.8,2.8
-				c3.4,0,5-1.3,6.8-2.8c1.9-1.5,4.1-3.3,8.4-3.3c4.2,0,6.4,1.7,8.4,3.3c1.9,1.5,3.5,2.8,6.8,2.8c3.4,0,5-1.3,6.8-2.8
-				c1.9-1.5,4.1-3.3,8.4-3.3c4.2,0,6.4,1.7,8.4,3.3c0.7,0.6,1.4,1.1,2.2,1.6c1.6-3.5,2.8-7.2,3.6-11.1c-3.5-0.3-5.4-1.8-7.2-3.2
-				C122.2,81.2,120.4,79.9,117,79.9z"/>
-			<path class="st0" d="M108.4,109.6c-1.8,1.4-3.4,2.7-6.7,2.7c-3.3,0-4.9-1.2-6.7-2.7c-2-1.6-4.2-3.4-8.6-3.4
-				c-4.3,0-6.6,1.8-8.6,3.4c-1.8,1.4-3.4,2.7-6.7,2.7c-3.3,0-4.9-1.2-6.7-2.7c-2-1.6-4.2-3.4-8.6-3.4s-6.6,1.8-8.6,3.4
-				c-1.6,1.3-3,2.4-5.6,2.6c0.9,0.9,1.8,1.7,2.7,2.5c2.1-0.6,3.5-1.8,4.8-2.8c1.8-1.4,3.4-2.7,6.7-2.7c3.3,0,4.9,1.2,6.7,2.7
-				c2,1.6,4.2,3.4,8.6,3.4c4.3,0,6.6-1.8,8.6-3.4c1.8-1.4,3.4-2.7,6.7-2.7c3.3,0,4.9,1.2,6.7,2.7c2,1.6,4.2,3.4,8.6,3.4
-				c4.3,0,6.6-1.8,8.6-3.4c1.8-1.4,3.4-2.7,6.7-2.7c0.9,0,1.7,0.1,2.4,0.3c0.7-0.8,1.4-1.7,2-2.5c-1.2-0.5-2.7-0.8-4.5-0.8
-				C112.6,106.2,110.4,108,108.4,109.6z"/>
-			<path class="st0" d="M117,92.1c-4.2,0-6.4,1.7-8.4,3.3c-1.9,1.5-3.5,2.8-6.8,2.8c-3.4,0-5-1.3-6.8-2.8c-1.9-1.5-4.1-3.3-8.4-3.3
-				c-4.2,0-6.4,1.7-8.4,3.3c-1.9,1.5-3.5,2.8-6.8,2.8c-3.4,0-5-1.3-6.8-2.8c-1.9-1.5-4.1-3.3-8.4-3.3c-4.2,0-6.4,1.7-8.4,3.3
-				c-1.9,1.5-3.5,2.8-6.8,2.8c-3.4,0-5-1.3-6.8-2.8c-1.2-1-2.5-2-4.4-2.7c0.4,1.2,0.9,2.3,1.4,3.5c0.5,0.3,1,0.7,1.5,1.1
-				c1.9,1.5,4.1,3.3,8.4,3.3c4.2,0,6.4-1.7,8.4-3.3c1.9-1.5,3.5-2.8,6.8-2.8c3.4,0,5,1.3,6.8,2.8c1.9,1.5,4.1,3.3,8.4,3.3
-				c4.2,0,6.4-1.7,8.4-3.3c1.9-1.5,3.5-2.8,6.8-2.8c3.4,0,5,1.3,6.8,2.8c1.9,1.5,4.1,3.3,8.4,3.3c4.2,0,6.4-1.7,8.4-3.3
-				c1.9-1.5,3.5-2.8,6.8-2.8c3.4,0,5,1.3,6.8,2.8c0.8,0.6,1.6,1.3,2.6,1.8c0.4-0.7,0.7-1.5,1.1-2.2c-0.8-0.4-1.4-1-2.2-1.6
-				C123.4,93.8,121.2,92.1,117,92.1z"/>
-			<path class="st0" d="M117,77.9c-4.1,0-6.3,1.7-8.2,3.2c-1.8,1.4-3.5,2.8-7,2.8c-3.5,0-5.2-1.4-7-2.8c-1.9-1.5-4.1-3.2-8.2-3.2
-				c-4.1,0-6.3,1.7-8.2,3.2c-1.8,1.4-3.5,2.8-7,2.8c-3.5,0-5.2-1.4-7-2.8c-1.9-1.5-4.1-3.2-8.2-3.2c-4.1,0-6.3,1.7-8.2,3.2
-				c-1.8,1.4-3.5,2.8-7,2.8c-3.5,0-5.2-1.4-7-2.8c-1.7-1.4-3.7-2.9-7.2-3.2c0,0.6,0.1,1.3,0.1,1.9c2.7,0.3,4.2,1.5,5.8,2.8
-				c1.9,1.5,4.1,3.2,8.2,3.2c4.1,0,6.3-1.7,8.2-3.2c1.8-1.4,3.5-2.8,7-2.8c3.5,0,5.2,1.4,7,2.8c1.9,1.5,4.1,3.2,8.2,3.2
-				c4.1,0,6.3-1.7,8.2-3.2c1.8-1.4,3.5-2.8,7-2.8c3.5,0,5.2,1.4,7,2.8c1.9,1.5,4.1,3.2,8.2,3.2c4.1,0,6.3-1.7,8.2-3.2
-				c1.8-1.4,3.5-2.8,7-2.8c3.5,0,5.2,1.4,7,2.8c1.7,1.4,3.7,2.9,7.2,3.2c0.1-0.6,0.2-1.3,0.3-1.9c-3-0.2-4.6-1.4-6.3-2.8
-				C123.3,79.6,121.1,77.9,117,77.9z"/>
-			<path class="st0" d="M40.8,71.2c4,0,6.1-1.6,8-3.2c1.9-1.5,3.6-2.9,7.2-2.9c3.6,0,5.3,1.4,7.2,2.9c2,1.6,4,3.2,8,3.2
-				c4,0,6.1-1.6,8-3.2c1.9-1.5,3.6-2.9,7.2-2.9c3.6,0,5.3,1.4,7.2,2.9c2,1.6,4,3.2,8,3.2c4,0,6.1-1.6,8-3.2c1.9-1.5,3.6-2.9,7.2-2.9
-				c3.6,0,5.3,1.4,7.2,2.9c1.9,1.5,4,3.1,8,3.2l0-0.1c0-0.4-0.1-0.8-0.1-1.3c-3.4-0.1-5.2-1.4-7-2.9c-2-1.6-4-3.2-8-3.2
-				c-4,0-6.1,1.6-8,3.2c-1.9,1.5-3.6,2.9-7.2,2.9c-3.6,0-5.3-1.4-7.2-2.9c-2-1.6-4-3.2-8-3.2c-4,0-6.1,1.6-8,3.2
-				c-1.9,1.5-3.6,2.9-7.2,2.9c-3.6,0-5.3-1.4-7.2-2.9c-2-1.6-4-3.2-8-3.2s-6.1,1.6-8,3.2c-1.9,1.5-3.6,2.9-7.2,2.9
-				c-3.6,0-5.3-1.4-7.2-2.9c-1.6-1.3-3.2-2.5-5.9-3c-0.1,0.4-0.2,0.9-0.3,1.3c2.4,0.4,3.8,1.5,5.3,2.7
-				C34.7,69.6,36.7,71.2,40.8,71.2z"/>
-			<path class="st0" d="M40.8,56.5c4,0,5.9-1.6,7.9-3.1c1.9-1.5,3.7-2.9,7.4-2.9c3.7,0,5.5,1.4,7.4,2.9c1.9,1.5,3.9,3.1,7.9,3.1
-				c4,0,5.9-1.6,7.9-3.1c1.9-1.5,3.7-2.9,7.4-2.9c3.7,0,5.5,1.4,7.4,2.9c1.9,1.5,3.9,3.1,7.9,3.1c4,0,5.9-1.6,7.9-3.1
-				c1.9-1.5,3.7-2.9,7.4-2.9c3.7,0,5.5,1.4,7.4,2.9c1.3,1,2.5,2,4.4,2.6c-0.1-0.3-0.3-0.7-0.4-1c-1.3-0.6-2.4-1.4-3.4-2.2
-				c-1.9-1.5-3.9-3.1-7.9-3.1c-4,0-5.9,1.6-7.9,3.1c-1.9,1.5-3.7,2.9-7.4,2.9c-3.7,0-5.5-1.4-7.4-2.9c-1.9-1.5-3.9-3.1-7.9-3.1
-				c-4,0-5.9,1.6-7.9,3.1c-1.9,1.5-3.7,2.9-7.4,2.9c-3.7,0-5.5-1.4-7.4-2.9C62,51.2,60,49.6,56,49.6c-4,0-5.9,1.6-7.9,3.1
-				c-1.9,1.5-3.7,2.9-7.4,2.9c-3.7,0-5.5-1.4-7.4-2.9C33,52.4,32.5,52,32,51.6c-0.1,0.2-0.3,0.5-0.4,0.8c0.4,0.3,0.9,0.6,1.3,1
-				C34.8,54.9,36.8,56.5,40.8,56.5z"/>
-		</g>
-	</g>
-</g>
-</svg>

assets/one-line/199150-vmw-os-lgo-velero-final_wht.svg

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_5" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 431.3 150" style="enable-background:new 0 0 431.3 150;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:none;}
-	.st2{fill:#009BDB;}
-	.st3{fill:#717074;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M196.6,55.8l-18.2,41.2h-5.1l-18.2-41.2h5.1l15.7,35.5l15.6-35.5H196.6z"/>
-			<path class="st0" d="M206.6,60.3v13.6h22.4v4.4h-22.4v14.3h24.8v4.4h-29.6V55.8h29.6v4.4H206.6z"/>
-			<path class="st0" d="M265.7,92.6v4.4h-27.2V55.8h4.7v36.8H265.7z"/>
-			<path class="st0" d="M275.7,60.3v13.6h22.4v4.4h-22.4v14.3h24.8v4.4H271V55.8h29.6v4.4H275.7z"/>
-			<path class="st0" d="M338,75.3c-1.1,1.9-2.6,3.4-4.6,4.6c-2,1.2-4.2,1.9-6.6,2.2l10.5,14.9H332l-10.4-14.8h-9.1v14.8h-4.7V55.8
-				h16.7c2.8,0,5.4,0.6,7.7,1.7c2.3,1.1,4.1,2.7,5.5,4.7c1.3,2,2,4.3,2,6.8C339.6,71.3,339.1,73.4,338,75.3z M312.4,77.8h11.2
-				c3.4,0,6.1-0.8,8.2-2.3c2.1-1.6,3.1-3.7,3.1-6.4c0-2.7-1-4.9-3.1-6.4c-2.1-1.6-4.8-2.3-8.2-2.3h-11.2V77.8z"/>
-			<path class="st0" d="M354.4,94.9c-3.3-1.9-5.8-4.5-7.8-7.8c-1.9-3.3-2.9-6.8-2.9-10.6c0-3.8,1-7.3,2.9-10.6
-				c1.9-3.3,4.5-5.9,7.8-7.8c3.3-1.9,6.8-2.9,10.5-2.9c3.8,0,7.2,1,10.5,2.9c3.2,1.9,5.8,4.5,7.7,7.8c1.9,3.3,2.9,6.8,2.9,10.6
-				c0,3.8-1,7.3-2.9,10.6c-1.9,3.3-4.5,5.9-7.7,7.8c-3.2,1.9-6.7,2.9-10.5,2.9C361.2,97.8,357.7,96.8,354.4,94.9z M373,91.1
-				c2.5-1.6,4.5-3.6,6-6.2c1.5-2.6,2.2-5.4,2.2-8.5c0-3-0.7-5.8-2.2-8.4c-1.5-2.6-3.5-4.7-6-6.2c-2.5-1.5-5.2-2.3-8.1-2.3
-				c-2.9,0-5.6,0.8-8.1,2.3c-2.5,1.5-4.5,3.6-6,6.2c-1.5,2.6-2.2,5.4-2.2,8.4c0,3,0.8,5.9,2.2,8.5c1.5,2.6,3.5,4.7,6,6.2
-				s5.2,2.3,8.1,2.3C367.8,93.5,370.5,92.7,373,91.1z"/>
-		</g>
-	</g>
-	<g>
-		<g>
-			<path class="st1" d="M132.2,77.1c0-0.7,0.1-1.4,0.1-2s0-1.4-0.1-2V77.1z"/>
-			<path class="st2" d="M117,109.3c-3.3,0-4.9,1.2-6.7,2.7c-2,1.6-4.2,3.4-8.6,3.4c-4.3,0-6.6-1.8-8.6-3.4c-1.8-1.4-3.4-2.7-6.7-2.7
-				c-3.3,0-4.9,1.2-6.7,2.7c-2,1.6-4.2,3.4-8.6,3.4c-4.3,0-6.6-1.8-8.6-3.4c-1.8-1.4-3.4-2.7-6.7-2.7c-3.3,0-4.9,1.2-6.7,2.7
-				c-1.3,1-2.7,2.2-4.8,2.8c8.3,7.3,18.9,12,30.5,13c0.3,0,0.6,0.1,1,0.1c1.1,0.1,2.3,0.1,3.4,0.1c1.2,0,2.3-0.1,3.4-0.1
-				c0.3,0,0.6,0,1-0.1c14.2-1.2,26.8-8,35.6-18.2C118.7,109.4,117.9,109.3,117,109.3z"/>
-			<path class="st2" d="M40.8,69.8c3.6,0,5.3-1.4,7.2-2.9c2-1.6,4-3.2,8-3.2s6.1,1.6,8,3.2c1.9,1.5,3.6,2.9,7.2,2.9
-				c3.6,0,5.3-1.4,7.2-2.9c2-1.6,4-3.2,8-3.2c4,0,6.1,1.6,8,3.2c1.9,1.5,3.6,2.9,7.2,2.9c3.6,0,5.3-1.4,7.2-2.9c2-1.6,4-3.2,8-3.2
-				c4,0,6.1,1.6,8,3.2c1.8,1.5,3.6,2.8,7,2.9c-0.5-4.8-1.6-9.5-3.3-13.8c-1.8-0.6-3.1-1.6-4.4-2.6c-1.9-1.5-3.7-2.9-7.4-2.9
-				c-3.7,0-5.5,1.4-7.4,2.9c-1.9,1.5-3.9,3.1-7.9,3.1c-4,0-5.9-1.6-7.9-3.1c-1.9-1.5-3.7-2.9-7.4-2.9c-3.7,0-5.5,1.4-7.4,2.9
-				c-1.9,1.5-3.9,3.1-7.9,3.1c-4,0-5.9-1.6-7.9-3.1c-1.9-1.5-3.7-2.9-7.4-2.9c-3.7,0-5.5,1.4-7.4,2.9c-1.9,1.5-3.9,3.1-7.9,3.1
-				c-4,0-5.9-1.6-7.9-3.1c-0.4-0.3-0.9-0.7-1.3-1c-1.7,3.6-3.1,7.5-3.9,11.6c2.7,0.5,4.3,1.7,5.9,3C35.5,68.4,37.2,69.8,40.8,69.8z"
-				/>
-			<path class="st2" d="M40.8,55.7c3.7,0,5.5-1.4,7.4-2.9c1.9-1.5,3.9-3.1,7.9-3.1c4,0,5.9,1.6,7.9,3.1c1.9,1.5,3.7,2.9,7.4,2.9
-				c3.7,0,5.5-1.4,7.4-2.9c1.9-1.5,3.9-3.1,7.9-3.1c4,0,5.9,1.6,7.9,3.1c1.9,1.5,3.7,2.9,7.4,2.9c3.7,0,5.5-1.4,7.4-2.9
-				c1.9-1.5,3.9-3.1,7.9-3.1c4,0,5.9,1.6,7.9,3.1c1.1,0.8,2.1,1.7,3.4,2.2c-7.9-19.2-26.9-32.8-48.9-32.8c-20.8,0-38.7,12-47.4,29.5
-				c0.5,0.4,1,0.7,1.4,1.1C35.3,54.2,37.1,55.7,40.8,55.7z"/>
-			<path class="st2" d="M117,94.6c-3.4,0-5,1.3-6.8,2.8c-1.9,1.5-4.1,3.3-8.4,3.3c-4.2,0-6.4-1.7-8.4-3.3c-1.9-1.5-3.5-2.8-6.8-2.8
-				c-3.4,0-5,1.3-6.8,2.8c-1.9,1.5-4.1,3.3-8.4,3.3c-4.2,0-6.4-1.7-8.4-3.3c-1.9-1.5-3.5-2.8-6.8-2.8c-3.4,0-5,1.3-6.8,2.8
-				c-1.9,1.5-4.1,3.3-8.4,3.3c-4.2,0-6.4-1.7-8.4-3.3c-0.5-0.4-1-0.8-1.5-1.1c2.6,6,6.3,11.4,10.9,16c2.6-0.2,4-1.4,5.6-2.6
-				c2-1.6,4.2-3.4,8.6-3.4s6.6,1.8,8.6,3.4c1.8,1.4,3.4,2.7,6.7,2.7c3.3,0,4.9-1.2,6.7-2.7c2-1.6,4.2-3.4,8.6-3.4
-				c4.3,0,6.6,1.8,8.6,3.4c1.8,1.4,3.4,2.7,6.7,2.7c3.3,0,4.9-1.2,6.7-2.7c2-1.6,4.2-3.4,8.6-3.4c1.8,0,3.3,0.3,4.5,0.8
-				c1.9-2.5,3.5-5.1,5-7.9c-1-0.6-1.8-1.2-2.6-1.8C122,95.8,120.3,94.6,117,94.6z"/>
-			<path class="st2" d="M132.1,71.2c-4,0-6-1.6-8-3.2c-1.9-1.5-3.6-2.9-7.2-2.9c-3.6,0-5.3,1.4-7.2,2.9c-2,1.6-4,3.2-8,3.2
-				c-4,0-6.1-1.6-8-3.2c-1.9-1.5-3.6-2.9-7.2-2.9c-3.6,0-5.3,1.4-7.2,2.9c-2,1.6-4,3.2-8,3.2c-4,0-6.1-1.6-8-3.2
-				c-1.9-1.5-3.6-2.9-7.2-2.9c-3.6,0-5.3,1.4-7.2,2.9c-2,1.6-4,3.2-8,3.2c-4,0-6.1-1.6-8-3.2c-1.5-1.2-3-2.3-5.3-2.7
-				c-0.5,2.5-0.8,5.1-0.9,7.7c0,0.7-0.1,1.4-0.1,2c0,0.7,0,1.4,0.1,2c0,0.3,0,0.6,0,0.9c3.5,0.3,5.4,1.8,7.2,3.2
-				c1.8,1.4,3.5,2.8,7,2.8c3.5,0,5.2-1.4,7-2.8c1.9-1.5,4.1-3.2,8.2-3.2s6.3,1.7,8.2,3.2c1.8,1.4,3.5,2.8,7,2.8c3.5,0,5.2-1.4,7-2.8
-				c1.9-1.5,4.1-3.2,8.2-3.2c4.1,0,6.3,1.7,8.2,3.2c1.8,1.4,3.5,2.8,7,2.8c3.5,0,5.2-1.4,7-2.8c1.9-1.5,4.1-3.2,8.2-3.2
-				c4.1,0,6.3,1.7,8.2,3.2c1.7,1.3,3.3,2.6,6.3,2.8c0.3-1.6,0.5-3.2,0.6-4.9c0-0.6,0.1-1.3,0.1-1.9V73
-				C132.2,72.4,132.1,71.2,132.1,71.2z"/>
-			<path class="st2" d="M117,79.9c-3.5,0-5.2,1.4-7,2.8c-1.9,1.5-4.1,3.2-8.2,3.2c-4.1,0-6.3-1.7-8.2-3.2c-1.8-1.4-3.5-2.8-7-2.8
-				c-3.5,0-5.2,1.4-7,2.8c-1.9,1.5-4.1,3.2-8.2,3.2c-4.1,0-6.3-1.7-8.2-3.2c-1.8-1.4-3.5-2.8-7-2.8c-3.5,0-5.2,1.4-7,2.8
-				c-1.9,1.5-4.1,3.2-8.2,3.2c-4.1,0-6.3-1.7-8.2-3.2c-1.6-1.3-3.1-2.5-5.8-2.8c0.4,4.5,1.4,8.7,2.8,12.8c1.9,0.6,3.2,1.7,4.4,2.7
-				c1.9,1.5,3.5,2.8,6.8,2.8c3.4,0,5-1.3,6.8-2.8c1.9-1.5,4.1-3.3,8.4-3.3c4.2,0,6.4,1.7,8.4,3.3c1.9,1.5,3.5,2.8,6.8,2.8
-				c3.4,0,5-1.3,6.8-2.8c1.9-1.5,4.1-3.3,8.4-3.3c4.2,0,6.4,1.7,8.4,3.3c1.9,1.5,3.5,2.8,6.8,2.8c3.4,0,5-1.3,6.8-2.8
-				c1.9-1.5,4.1-3.3,8.4-3.3c4.2,0,6.4,1.7,8.4,3.3c0.7,0.6,1.4,1.1,2.2,1.6c1.6-3.5,2.8-7.2,3.6-11.1c-3.5-0.3-5.4-1.8-7.2-3.2
-				C122.2,81.2,120.4,79.9,117,79.9z"/>
-			<path class="st0" d="M108.4,109.6c-1.8,1.4-3.4,2.7-6.7,2.7c-3.3,0-4.9-1.2-6.7-2.7c-2-1.6-4.2-3.4-8.6-3.4
-				c-4.3,0-6.6,1.8-8.6,3.4c-1.8,1.4-3.4,2.7-6.7,2.7c-3.3,0-4.9-1.2-6.7-2.7c-2-1.6-4.2-3.4-8.6-3.4s-6.6,1.8-8.6,3.4
-				c-1.6,1.3-3,2.4-5.6,2.6c0.9,0.9,1.8,1.7,2.7,2.5c2.1-0.6,3.5-1.8,4.8-2.8c1.8-1.4,3.4-2.7,6.7-2.7c3.3,0,4.9,1.2,6.7,2.7
-				c2,1.6,4.2,3.4,8.6,3.4c4.3,0,6.6-1.8,8.6-3.4c1.8-1.4,3.4-2.7,6.7-2.7c3.3,0,4.9,1.2,6.7,2.7c2,1.6,4.2,3.4,8.6,3.4
-				c4.3,0,6.6-1.8,8.6-3.4c1.8-1.4,3.4-2.7,6.7-2.7c0.9,0,1.7,0.1,2.4,0.3c0.7-0.8,1.4-1.7,2-2.5c-1.2-0.5-2.7-0.8-4.5-0.8
-				C112.6,106.2,110.4,108,108.4,109.6z"/>
-			<path class="st0" d="M117,92.1c-4.2,0-6.4,1.7-8.4,3.3c-1.9,1.5-3.5,2.8-6.8,2.8c-3.4,0-5-1.3-6.8-2.8c-1.9-1.5-4.1-3.3-8.4-3.3
-				c-4.2,0-6.4,1.7-8.4,3.3c-1.9,1.5-3.5,2.8-6.8,2.8c-3.4,0-5-1.3-6.8-2.8c-1.9-1.5-4.1-3.3-8.4-3.3c-4.2,0-6.4,1.7-8.4,3.3
-				c-1.9,1.5-3.5,2.8-6.8,2.8c-3.4,0-5-1.3-6.8-2.8c-1.2-1-2.5-2-4.4-2.7c0.4,1.2,0.9,2.3,1.4,3.5c0.5,0.3,1,0.7,1.5,1.1
-				c1.9,1.5,4.1,3.3,8.4,3.3c4.2,0,6.4-1.7,8.4-3.3c1.9-1.5,3.5-2.8,6.8-2.8c3.4,0,5,1.3,6.8,2.8c1.9,1.5,4.1,3.3,8.4,3.3
-				c4.2,0,6.4-1.7,8.4-3.3c1.9-1.5,3.5-2.8,6.8-2.8c3.4,0,5,1.3,6.8,2.8c1.9,1.5,4.1,3.3,8.4,3.3c4.2,0,6.4-1.7,8.4-3.3
-				c1.9-1.5,3.5-2.8,6.8-2.8c3.4,0,5,1.3,6.8,2.8c0.8,0.6,1.6,1.3,2.6,1.8c0.4-0.7,0.7-1.5,1.1-2.2c-0.8-0.4-1.4-1-2.2-1.6
-				C123.4,93.8,121.2,92.1,117,92.1z"/>
-			<path class="st0" d="M117,77.9c-4.1,0-6.3,1.7-8.2,3.2c-1.8,1.4-3.5,2.8-7,2.8c-3.5,0-5.2-1.4-7-2.8c-1.9-1.5-4.1-3.2-8.2-3.2
-				c-4.1,0-6.3,1.7-8.2,3.2c-1.8,1.4-3.5,2.8-7,2.8c-3.5,0-5.2-1.4-7-2.8c-1.9-1.5-4.1-3.2-8.2-3.2c-4.1,0-6.3,1.7-8.2,3.2
-				c-1.8,1.4-3.5,2.8-7,2.8c-3.5,0-5.2-1.4-7-2.8c-1.7-1.4-3.7-2.9-7.2-3.2c0,0.6,0.1,1.3,0.1,1.9c2.7,0.3,4.2,1.5,5.8,2.8
-				c1.9,1.5,4.1,3.2,8.2,3.2c4.1,0,6.3-1.7,8.2-3.2c1.8-1.4,3.5-2.8,7-2.8c3.5,0,5.2,1.4,7,2.8c1.9,1.5,4.1,3.2,8.2,3.2
-				c4.1,0,6.3-1.7,8.2-3.2c1.8-1.4,3.5-2.8,7-2.8c3.5,0,5.2,1.4,7,2.8c1.9,1.5,4.1,3.2,8.2,3.2c4.1,0,6.3-1.7,8.2-3.2
-				c1.8-1.4,3.5-2.8,7-2.8c3.5,0,5.2,1.4,7,2.8c1.7,1.4,3.7,2.9,7.2,3.2c0.1-0.6,0.2-1.3,0.3-1.9c-3-0.2-4.6-1.4-6.3-2.8
-				C123.3,79.6,121.1,77.9,117,77.9z"/>
-			<path class="st0" d="M40.8,71.2c4,0,6.1-1.6,8-3.2c1.9-1.5,3.6-2.9,7.2-2.9c3.6,0,5.3,1.4,7.2,2.9c2,1.6,4,3.2,8,3.2
-				c4,0,6.1-1.6,8-3.2c1.9-1.5,3.6-2.9,7.2-2.9c3.6,0,5.3,1.4,7.2,2.9c2,1.6,4,3.2,8,3.2c4,0,6.1-1.6,8-3.2c1.9-1.5,3.6-2.9,7.2-2.9
-				c3.6,0,5.3,1.4,7.2,2.9c1.9,1.5,4,3.1,8,3.2l0-0.1c0-0.4-0.1-0.8-0.1-1.3c-3.4-0.1-5.2-1.4-7-2.9c-2-1.6-4-3.2-8-3.2
-				c-4,0-6.1,1.6-8,3.2c-1.9,1.5-3.6,2.9-7.2,2.9c-3.6,0-5.3-1.4-7.2-2.9c-2-1.6-4-3.2-8-3.2c-4,0-6.1,1.6-8,3.2
-				c-1.9,1.5-3.6,2.9-7.2,2.9c-3.6,0-5.3-1.4-7.2-2.9c-2-1.6-4-3.2-8-3.2s-6.1,1.6-8,3.2c-1.9,1.5-3.6,2.9-7.2,2.9
-				c-3.6,0-5.3-1.4-7.2-2.9c-1.6-1.3-3.2-2.5-5.9-3c-0.1,0.4-0.2,0.9-0.3,1.3c2.4,0.4,3.8,1.5,5.3,2.7
-				C34.7,69.6,36.7,71.2,40.8,71.2z"/>
-			<path class="st0" d="M40.8,56.5c4,0,5.9-1.6,7.9-3.1c1.9-1.5,3.7-2.9,7.4-2.9c3.7,0,5.5,1.4,7.4,2.9c1.9,1.5,3.9,3.1,7.9,3.1
-				c4,0,5.9-1.6,7.9-3.1c1.9-1.5,3.7-2.9,7.4-2.9c3.7,0,5.5,1.4,7.4,2.9c1.9,1.5,3.9,3.1,7.9,3.1c4,0,5.9-1.6,7.9-3.1
-				c1.9-1.5,3.7-2.9,7.4-2.9c3.7,0,5.5,1.4,7.4,2.9c1.3,1,2.5,2,4.4,2.6c-0.1-0.3-0.3-0.7-0.4-1c-1.3-0.6-2.4-1.4-3.4-2.2
-				c-1.9-1.5-3.9-3.1-7.9-3.1c-4,0-5.9,1.6-7.9,3.1c-1.9,1.5-3.7,2.9-7.4,2.9c-3.7,0-5.5-1.4-7.4-2.9c-1.9-1.5-3.9-3.1-7.9-3.1
-				c-4,0-5.9,1.6-7.9,3.1c-1.9,1.5-3.7,2.9-7.4,2.9c-3.7,0-5.5-1.4-7.4-2.9C62,51.2,60,49.6,56,49.6c-4,0-5.9,1.6-7.9,3.1
-				c-1.9,1.5-3.7,2.9-7.4,2.9c-3.7,0-5.5-1.4-7.4-2.9C33,52.4,32.5,52,32,51.6c-0.1,0.2-0.3,0.5-0.4,0.8c0.4,0.3,0.9,0.6,1.3,1
-				C34.8,54.9,36.8,56.5,40.8,56.5z"/>
-		</g>
-	</g>
-</g>
-</svg>

assets/stacked/199150-vmw-os-lgo-velero-final_stacked-gry.svg

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_5" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 311.5 245.2" style="enable-background:new 0 0 311.5 245.2;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:none;}
-	.st2{fill:#009BDB;}
-	.st3{fill:#717074;}
-</style>
-<g>
-	<g>
-		<path class="st1" d="M211.5,83.4c0-0.7,0.1-1.4,0.1-2c0-0.7,0-1.4-0.1-2V83.4z"/>
-		<path class="st2" d="M196.3,115.5c-3.3,0-4.9,1.2-6.7,2.7c-2,1.6-4.2,3.4-8.6,3.4c-4.3,0-6.6-1.8-8.6-3.4
-			c-1.8-1.4-3.4-2.7-6.7-2.7c-3.3,0-4.9,1.2-6.7,2.7c-2,1.6-4.2,3.4-8.6,3.4c-4.3,0-6.6-1.8-8.6-3.4c-1.8-1.4-3.4-2.7-6.7-2.7
-			s-4.9,1.2-6.7,2.7c-1.3,1-2.7,2.2-4.8,2.8c8.3,7.3,18.9,12,30.5,13c0.3,0,0.6,0.1,1,0.1c1.1,0.1,2.3,0.1,3.4,0.1
-			c1.2,0,2.3-0.1,3.4-0.1c0.3,0,0.6,0,1-0.1c14.2-1.2,26.8-8,35.6-18.2C198,115.7,197.2,115.5,196.3,115.5z"/>
-		<path class="st2" d="M120.1,76.1c3.6,0,5.3-1.4,7.2-2.9c2-1.6,4-3.2,8-3.2c4,0,6.1,1.6,8,3.2c1.9,1.5,3.6,2.9,7.2,2.9
-			c3.6,0,5.3-1.4,7.2-2.9c2-1.6,4-3.2,8-3.2c4,0,6.1,1.6,8,3.2c1.9,1.5,3.6,2.9,7.2,2.9c3.6,0,5.3-1.4,7.2-2.9c2-1.6,4-3.2,8-3.2
-			c4,0,6.1,1.6,8,3.2c1.8,1.5,3.6,2.8,7,2.9c-0.5-4.8-1.6-9.5-3.3-13.8c-1.8-0.6-3.1-1.6-4.4-2.6c-1.9-1.5-3.7-2.9-7.4-2.9
-			c-3.7,0-5.5,1.4-7.4,2.9c-1.9,1.5-3.9,3.1-7.9,3.1c-4,0-5.9-1.6-7.9-3.1c-1.9-1.5-3.7-2.9-7.4-2.9c-3.7,0-5.5,1.4-7.4,2.9
-			c-1.9,1.5-3.9,3.1-7.9,3.1c-4,0-5.9-1.6-7.9-3.1c-1.9-1.5-3.7-2.9-7.4-2.9s-5.5,1.4-7.4,2.9c-1.9,1.5-3.9,3.1-7.9,3.1
-			c-4,0-5.9-1.6-7.9-3.1c-0.4-0.3-0.9-0.7-1.3-1c-1.7,3.6-3.1,7.5-3.9,11.6c2.7,0.5,4.3,1.7,5.9,3C114.8,74.7,116.5,76.1,120.1,76.1
-			z"/>
-		<path class="st2" d="M120.1,61.9c3.7,0,5.5-1.4,7.4-2.9c1.9-1.5,3.9-3.1,7.9-3.1c4,0,5.9,1.6,7.9,3.1c1.9,1.5,3.7,2.9,7.4,2.9
-			c3.7,0,5.5-1.4,7.4-2.9c1.9-1.5,3.9-3.1,7.9-3.1c4,0,5.9,1.6,7.9,3.1c1.9,1.5,3.7,2.9,7.4,2.9c3.7,0,5.5-1.4,7.4-2.9
-			c1.9-1.5,3.9-3.1,7.9-3.1c4,0,5.9,1.6,7.9,3.1c1.1,0.8,2.1,1.7,3.4,2.2c-7.9-19.2-26.9-32.8-48.9-32.8c-20.8,0-38.7,12-47.4,29.5
-			c0.5,0.4,1,0.7,1.4,1.1C114.6,60.5,116.4,61.9,120.1,61.9z"/>
-		<path class="st2" d="M196.3,100.8c-3.4,0-5,1.3-6.8,2.8c-1.9,1.5-4.1,3.3-8.4,3.3c-4.2,0-6.4-1.7-8.4-3.3
-			c-1.9-1.5-3.5-2.8-6.8-2.8c-3.4,0-5,1.3-6.8,2.8c-1.9,1.5-4.1,3.3-8.4,3.3c-4.2,0-6.4-1.7-8.4-3.3c-1.9-1.5-3.5-2.8-6.8-2.8
-			c-3.4,0-5,1.3-6.8,2.8c-1.9,1.5-4.1,3.3-8.4,3.3c-4.2,0-6.4-1.7-8.4-3.3c-0.5-0.4-1-0.8-1.5-1.1c2.6,6,6.3,11.4,10.9,16
-			c2.6-0.2,4-1.4,5.6-2.6c2-1.6,4.2-3.4,8.6-3.4c4.3,0,6.6,1.8,8.6,3.4c1.8,1.4,3.4,2.7,6.7,2.7c3.3,0,4.9-1.2,6.7-2.7
-			c2-1.6,4.2-3.4,8.6-3.4c4.3,0,6.6,1.8,8.6,3.4c1.8,1.4,3.4,2.7,6.7,2.7c3.3,0,4.9-1.2,6.7-2.7c2-1.6,4.2-3.4,8.6-3.4
-			c1.8,0,3.3,0.3,4.5,0.8c1.9-2.5,3.5-5.1,5-7.9c-1-0.6-1.8-1.2-2.6-1.8C201.3,102.1,199.6,100.8,196.3,100.8z"/>
-		<path class="st2" d="M211.4,77.5c-4,0-6-1.6-8-3.2c-1.9-1.5-3.6-2.9-7.2-2.9c-3.6,0-5.3,1.4-7.2,2.9c-2,1.6-4,3.2-8,3.2
-			c-4,0-6.1-1.6-8-3.2c-1.9-1.5-3.6-2.9-7.2-2.9c-3.6,0-5.3,1.4-7.2,2.9c-2,1.6-4,3.2-8,3.2c-4,0-6.1-1.6-8-3.2
-			c-1.9-1.5-3.6-2.9-7.2-2.9c-3.6,0-5.3,1.4-7.2,2.9c-2,1.6-4,3.2-8,3.2c-4,0-6.1-1.6-8-3.2c-1.5-1.2-3-2.3-5.3-2.7
-			c-0.5,2.5-0.8,5.1-0.9,7.7c0,0.7-0.1,1.4-0.1,2c0,0.7,0,1.4,0.1,2c0,0.3,0,0.6,0,0.9c3.5,0.3,5.4,1.8,7.2,3.2
-			c1.8,1.4,3.5,2.8,7,2.8c3.5,0,5.2-1.4,7-2.8c1.9-1.5,4.1-3.2,8.2-3.2s6.3,1.7,8.2,3.2c1.8,1.4,3.5,2.8,7,2.8c3.5,0,5.2-1.4,7-2.8
-			c1.9-1.5,4.1-3.2,8.2-3.2c4.1,0,6.3,1.7,8.2,3.2c1.8,1.4,3.5,2.8,7,2.8c3.5,0,5.2-1.4,7-2.8c1.9-1.5,4.1-3.2,8.2-3.2
-			c4.1,0,6.3,1.7,8.2,3.2c1.7,1.3,3.3,2.6,6.3,2.8c0.3-1.6,0.5-3.2,0.6-4.9c0-0.6,0.1-1.3,0.1-1.9v-4.1
-			C211.5,78.6,211.4,77.5,211.4,77.5z"/>
-		<path class="st2" d="M196.3,86.1c-3.5,0-5.2,1.4-7,2.8c-1.9,1.5-4.1,3.2-8.2,3.2c-4.1,0-6.3-1.7-8.2-3.2c-1.8-1.4-3.5-2.8-7-2.8
-			c-3.5,0-5.2,1.4-7,2.8c-1.9,1.5-4.1,3.2-8.2,3.2c-4.1,0-6.3-1.7-8.2-3.2c-1.8-1.4-3.5-2.8-7-2.8c-3.5,0-5.2,1.4-7,2.8
-			c-1.9,1.5-4.1,3.2-8.2,3.2c-4.1,0-6.3-1.7-8.2-3.2c-1.6-1.3-3.1-2.5-5.8-2.8c0.4,4.5,1.4,8.7,2.8,12.8c1.9,0.6,3.2,1.7,4.4,2.7
-			c1.9,1.5,3.5,2.8,6.8,2.8c3.4,0,5-1.3,6.8-2.8c1.9-1.5,4.1-3.3,8.4-3.3c4.2,0,6.4,1.7,8.4,3.3c1.9,1.5,3.5,2.8,6.8,2.8
-			c3.4,0,5-1.3,6.8-2.8c1.9-1.5,4.1-3.3,8.4-3.3c4.2,0,6.4,1.7,8.4,3.3c1.9,1.5,3.5,2.8,6.8,2.8c3.4,0,5-1.3,6.8-2.8
-			c1.9-1.5,4.1-3.3,8.4-3.3c4.2,0,6.4,1.7,8.4,3.3c0.7,0.6,1.4,1.1,2.2,1.6c1.6-3.5,2.8-7.2,3.6-11.1c-3.5-0.3-5.4-1.8-7.2-3.2
-			C201.5,87.5,199.7,86.1,196.3,86.1z"/>
-		<path class="st0" d="M187.7,115.9c-1.8,1.4-3.4,2.7-6.7,2.7c-3.3,0-4.9-1.2-6.7-2.7c-2-1.6-4.2-3.4-8.6-3.4
-			c-4.3,0-6.6,1.8-8.6,3.4c-1.8,1.4-3.4,2.7-6.7,2.7c-3.3,0-4.9-1.2-6.7-2.7c-2-1.6-4.2-3.4-8.6-3.4c-4.3,0-6.6,1.8-8.6,3.4
-			c-1.6,1.3-3,2.4-5.6,2.6c0.9,0.9,1.8,1.7,2.7,2.5c2.1-0.6,3.5-1.8,4.8-2.8c1.8-1.4,3.4-2.7,6.7-2.7c3.3,0,4.9,1.2,6.7,2.7
-			c2,1.6,4.2,3.4,8.6,3.4c4.3,0,6.6-1.8,8.6-3.4c1.8-1.4,3.4-2.7,6.7-2.7c3.3,0,4.9,1.2,6.7,2.7c2,1.6,4.2,3.4,8.6,3.4
-			c4.3,0,6.6-1.8,8.6-3.4c1.8-1.4,3.4-2.7,6.7-2.7c0.9,0,1.7,0.1,2.4,0.3c0.7-0.8,1.4-1.7,2-2.5c-1.2-0.5-2.7-0.8-4.5-0.8
-			C191.9,112.5,189.7,114.3,187.7,115.9z"/>
-		<path class="st0" d="M196.3,98.4c-4.2,0-6.4,1.7-8.4,3.3c-1.9,1.5-3.5,2.8-6.8,2.8c-3.4,0-5-1.3-6.8-2.8c-1.9-1.5-4.1-3.3-8.4-3.3
-			c-4.2,0-6.4,1.7-8.4,3.3c-1.9,1.5-3.5,2.8-6.8,2.8c-3.4,0-5-1.3-6.8-2.8c-1.9-1.5-4.1-3.3-8.4-3.3c-4.2,0-6.4,1.7-8.4,3.3
-			c-1.9,1.5-3.5,2.8-6.8,2.8c-3.4,0-5-1.3-6.8-2.8c-1.2-1-2.5-2-4.4-2.7c0.4,1.2,0.9,2.3,1.4,3.5c0.5,0.3,1,0.7,1.5,1.1
-			c1.9,1.5,4.1,3.3,8.4,3.3c4.2,0,6.4-1.7,8.4-3.3c1.9-1.5,3.5-2.8,6.8-2.8c3.4,0,5,1.3,6.8,2.8c1.9,1.5,4.1,3.3,8.4,3.3
-			c4.2,0,6.4-1.7,8.4-3.3c1.9-1.5,3.5-2.8,6.8-2.8c3.4,0,5,1.3,6.8,2.8c1.9,1.5,4.1,3.3,8.4,3.3c4.2,0,6.4-1.7,8.4-3.3
-			c1.9-1.5,3.5-2.8,6.8-2.8c3.4,0,5,1.3,6.8,2.8c0.8,0.6,1.6,1.3,2.6,1.8c0.4-0.7,0.7-1.5,1.1-2.2c-0.8-0.4-1.4-1-2.2-1.6
-			C202.7,100.1,200.5,98.4,196.3,98.4z"/>
-		<path class="st0" d="M196.3,84.2c-4.1,0-6.3,1.7-8.2,3.2c-1.8,1.4-3.5,2.8-7,2.8c-3.5,0-5.2-1.4-7-2.8c-1.9-1.5-4.1-3.2-8.2-3.2
-			c-4.1,0-6.3,1.7-8.2,3.2c-1.8,1.4-3.5,2.8-7,2.8c-3.5,0-5.2-1.4-7-2.8c-1.9-1.5-4.1-3.2-8.2-3.2c-4.1,0-6.3,1.7-8.2,3.2
-			c-1.8,1.4-3.5,2.8-7,2.8c-3.5,0-5.2-1.4-7-2.8c-1.7-1.4-3.7-2.9-7.2-3.2c0,0.6,0.1,1.3,0.1,1.9c2.7,0.3,4.2,1.5,5.8,2.8
-			c1.9,1.5,4.1,3.2,8.2,3.2c4.1,0,6.3-1.7,8.2-3.2c1.8-1.4,3.5-2.8,7-2.8c3.5,0,5.2,1.4,7,2.8c1.9,1.5,4.1,3.2,8.2,3.2
-			c4.1,0,6.3-1.7,8.2-3.2c1.8-1.4,3.5-2.8,7-2.8c3.5,0,5.2,1.4,7,2.8c1.9,1.5,4.1,3.2,8.2,3.2c4.1,0,6.3-1.7,8.2-3.2
-			c1.8-1.4,3.5-2.8,7-2.8c3.5,0,5.2,1.4,7,2.8c1.7,1.4,3.7,2.9,7.2,3.2c0.1-0.6,0.2-1.3,0.3-1.9c-3-0.2-4.6-1.4-6.3-2.8
-			C202.6,85.9,200.4,84.2,196.3,84.2z"/>
-		<path class="st0" d="M120.1,77.5c4,0,6.1-1.6,8-3.2c1.9-1.5,3.6-2.9,7.2-2.9c3.6,0,5.3,1.4,7.2,2.9c2,1.6,4,3.2,8,3.2
-			c4,0,6.1-1.6,8-3.2c1.9-1.5,3.6-2.9,7.2-2.9c3.6,0,5.3,1.4,7.2,2.9c2,1.6,4,3.2,8,3.2c4,0,6.1-1.6,8-3.2c1.9-1.5,3.6-2.9,7.2-2.9
-			c3.6,0,5.3,1.4,7.2,2.9c1.9,1.5,4,3.1,8,3.2l0-0.1c0-0.4-0.1-0.8-0.1-1.3c-3.4-0.1-5.2-1.4-7-2.9c-2-1.6-4-3.2-8-3.2
-			c-4,0-6.1,1.6-8,3.2c-1.9,1.5-3.6,2.9-7.2,2.9c-3.6,0-5.3-1.4-7.2-2.9c-2-1.6-4-3.2-8-3.2c-4,0-6.1,1.6-8,3.2
-			c-1.9,1.5-3.6,2.9-7.2,2.9c-3.6,0-5.3-1.4-7.2-2.9c-2-1.6-4-3.2-8-3.2c-4,0-6.1,1.6-8,3.2c-1.9,1.5-3.6,2.9-7.2,2.9
-			c-3.6,0-5.3-1.4-7.2-2.9c-1.6-1.3-3.2-2.5-5.9-3c-0.1,0.4-0.2,0.9-0.3,1.3c2.4,0.4,3.8,1.5,5.3,2.7C114,75.9,116,77.5,120.1,77.5z
-			"/>
-		<path class="st0" d="M120.1,62.8c4,0,5.9-1.6,7.9-3.1c1.9-1.5,3.7-2.9,7.4-2.9s5.5,1.4,7.4,2.9c1.9,1.5,3.9,3.1,7.9,3.1
-			c4,0,5.9-1.6,7.9-3.1c1.9-1.5,3.7-2.9,7.4-2.9c3.7,0,5.5,1.4,7.4,2.9c1.9,1.5,3.9,3.1,7.9,3.1c4,0,5.9-1.6,7.9-3.1
-			c1.9-1.5,3.7-2.9,7.4-2.9c3.7,0,5.5,1.4,7.4,2.9c1.3,1,2.5,2,4.4,2.6c-0.1-0.3-0.3-0.7-0.4-1c-1.3-0.6-2.4-1.4-3.4-2.2
-			c-1.9-1.5-3.9-3.1-7.9-3.1c-4,0-5.9,1.6-7.9,3.1c-1.9,1.5-3.7,2.9-7.4,2.9c-3.7,0-5.5-1.4-7.4-2.9c-1.9-1.5-3.9-3.1-7.9-3.1
-			c-4,0-5.9,1.6-7.9,3.1c-1.9,1.5-3.7,2.9-7.4,2.9c-3.7,0-5.5-1.4-7.4-2.9c-1.9-1.5-3.9-3.1-7.9-3.1c-4,0-5.9,1.6-7.9,3.1
-			c-1.9,1.5-3.7,2.9-7.4,2.9c-3.7,0-5.5-1.4-7.4-2.9c-0.5-0.4-0.9-0.7-1.4-1.1c-0.1,0.2-0.3,0.5-0.4,0.8c0.4,0.3,0.9,0.6,1.3,1
-			C114.1,61.2,116.1,62.8,120.1,62.8z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path class="st3" d="M81.7,161.9l-18.2,41.2h-5.1l-18.2-41.2h5.1L61,197.4l15.6-35.5H81.7z"/>
-		<path class="st3" d="M91.7,166.3v13.6h22.4v4.4H91.7v14.3h24.8v4.4H87v-41.2h29.6v4.4H91.7z"/>
-		<path class="st3" d="M150.9,198.7v4.4h-27.2v-41.2h4.7v36.8H150.9z"/>
-		<path class="st3" d="M160.9,166.3v13.6h22.4v4.4h-22.4v14.3h24.8v4.4h-29.6v-41.2h29.6v4.4H160.9z"/>
-		<path class="st3" d="M223.1,181.3c-1.1,1.9-2.6,3.4-4.6,4.6c-2,1.2-4.2,1.9-6.6,2.2l10.5,14.9h-5.3l-10.4-14.8h-9.1v14.8h-4.7
-			v-41.2h16.7c2.8,0,5.4,0.6,7.7,1.7c2.3,1.1,4.1,2.7,5.5,4.7c1.3,2,2,4.3,2,6.8C224.8,177.4,224.2,179.5,223.1,181.3z M197.5,183.9
-			h11.2c3.4,0,6.1-0.8,8.2-2.3c2.1-1.6,3.1-3.7,3.1-6.4c0-2.7-1-4.9-3.1-6.4c-2.1-1.6-4.8-2.3-8.2-2.3h-11.2V183.9z"/>
-		<path class="st3" d="M239.6,200.9c-3.3-1.9-5.8-4.5-7.8-7.8c-1.9-3.3-2.9-6.8-2.9-10.6c0-3.8,1-7.3,2.9-10.6
-			c1.9-3.3,4.5-5.9,7.8-7.8c3.3-1.9,6.8-2.9,10.5-2.9c3.8,0,7.2,1,10.5,2.9c3.2,1.9,5.8,4.5,7.7,7.8c1.9,3.3,2.9,6.8,2.9,10.6
-			c0,3.8-1,7.3-2.9,10.6c-1.9,3.3-4.5,5.9-7.7,7.8c-3.2,1.9-6.7,2.9-10.5,2.9C246.3,203.8,242.8,202.9,239.6,200.9z M258.2,197.2
-			c2.5-1.6,4.5-3.6,6-6.2c1.5-2.6,2.2-5.4,2.2-8.5c0-3-0.7-5.8-2.2-8.4c-1.5-2.6-3.5-4.7-6-6.2c-2.5-1.5-5.2-2.3-8.1-2.3
-			c-2.9,0-5.6,0.8-8.1,2.3c-2.5,1.5-4.5,3.6-6,6.2c-1.5,2.6-2.2,5.4-2.2,8.4c0,3,0.8,5.9,2.2,8.5c1.5,2.6,3.5,4.7,6,6.2
-			s5.2,2.3,8.1,2.3C253,199.5,255.7,198.7,258.2,197.2z"/>
-	</g>
-</g>
-</svg>

assets/stacked/199150-vmw-os-lgo-velero-final_stacked-wht.svg

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_5" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 311.5 245.2" style="enable-background:new 0 0 311.5 245.2;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:none;}
-	.st2{fill:#009BDB;}
-	.st3{fill:#717074;}
-</style>
-<g>
-	<g>
-		<path class="st1" d="M211.5,83.4c0-0.7,0.1-1.4,0.1-2c0-0.7,0-1.4-0.1-2V83.4z"/>
-		<path class="st2" d="M196.3,115.5c-3.3,0-4.9,1.2-6.7,2.7c-2,1.6-4.2,3.4-8.6,3.4c-4.3,0-6.6-1.8-8.6-3.4
-			c-1.8-1.4-3.4-2.7-6.7-2.7c-3.3,0-4.9,1.2-6.7,2.7c-2,1.6-4.2,3.4-8.6,3.4c-4.3,0-6.6-1.8-8.6-3.4c-1.8-1.4-3.4-2.7-6.7-2.7
-			s-4.9,1.2-6.7,2.7c-1.3,1-2.7,2.2-4.8,2.8c8.3,7.3,18.9,12,30.5,13c0.3,0,0.6,0.1,1,0.1c1.1,0.1,2.3,0.1,3.4,0.1
-			c1.2,0,2.3-0.1,3.4-0.1c0.3,0,0.6,0,1-0.1c14.2-1.2,26.8-8,35.6-18.2C198,115.7,197.2,115.5,196.3,115.5z"/>
-		<path class="st2" d="M120.1,76.1c3.6,0,5.3-1.4,7.2-2.9c2-1.6,4-3.2,8-3.2c4,0,6.1,1.6,8,3.2c1.9,1.5,3.6,2.9,7.2,2.9
-			c3.6,0,5.3-1.4,7.2-2.9c2-1.6,4-3.2,8-3.2c4,0,6.1,1.6,8,3.2c1.9,1.5,3.6,2.9,7.2,2.9c3.6,0,5.3-1.4,7.2-2.9c2-1.6,4-3.2,8-3.2
-			c4,0,6.1,1.6,8,3.2c1.8,1.5,3.6,2.8,7,2.9c-0.5-4.8-1.6-9.5-3.3-13.8c-1.8-0.6-3.1-1.6-4.4-2.6c-1.9-1.5-3.7-2.9-7.4-2.9
-			c-3.7,0-5.5,1.4-7.4,2.9c-1.9,1.5-3.9,3.1-7.9,3.1c-4,0-5.9-1.6-7.9-3.1c-1.9-1.5-3.7-2.9-7.4-2.9c-3.7,0-5.5,1.4-7.4,2.9
-			c-1.9,1.5-3.9,3.1-7.9,3.1c-4,0-5.9-1.6-7.9-3.1c-1.9-1.5-3.7-2.9-7.4-2.9s-5.5,1.4-7.4,2.9c-1.9,1.5-3.9,3.1-7.9,3.1
-			c-4,0-5.9-1.6-7.9-3.1c-0.4-0.3-0.9-0.7-1.3-1c-1.7,3.6-3.1,7.5-3.9,11.6c2.7,0.5,4.3,1.7,5.9,3C114.8,74.7,116.5,76.1,120.1,76.1
-			z"/>
-		<path class="st2" d="M120.1,61.9c3.7,0,5.5-1.4,7.4-2.9c1.9-1.5,3.9-3.1,7.9-3.1c4,0,5.9,1.6,7.9,3.1c1.9,1.5,3.7,2.9,7.4,2.9
-			c3.7,0,5.5-1.4,7.4-2.9c1.9-1.5,3.9-3.1,7.9-3.1c4,0,5.9,1.6,7.9,3.1c1.9,1.5,3.7,2.9,7.4,2.9c3.7,0,5.5-1.4,7.4-2.9
-			c1.9-1.5,3.9-3.1,7.9-3.1c4,0,5.9,1.6,7.9,3.1c1.1,0.8,2.1,1.7,3.4,2.2c-7.9-19.2-26.9-32.8-48.9-32.8c-20.8,0-38.7,12-47.4,29.5
-			c0.5,0.4,1,0.7,1.4,1.1C114.6,60.5,116.4,61.9,120.1,61.9z"/>
-		<path class="st2" d="M196.3,100.8c-3.4,0-5,1.3-6.8,2.8c-1.9,1.5-4.1,3.3-8.4,3.3c-4.2,0-6.4-1.7-8.4-3.3
-			c-1.9-1.5-3.5-2.8-6.8-2.8c-3.4,0-5,1.3-6.8,2.8c-1.9,1.5-4.1,3.3-8.4,3.3c-4.2,0-6.4-1.7-8.4-3.3c-1.9-1.5-3.5-2.8-6.8-2.8
-			c-3.4,0-5,1.3-6.8,2.8c-1.9,1.5-4.1,3.3-8.4,3.3c-4.2,0-6.4-1.7-8.4-3.3c-0.5-0.4-1-0.8-1.5-1.1c2.6,6,6.3,11.4,10.9,16
-			c2.6-0.2,4-1.4,5.6-2.6c2-1.6,4.2-3.4,8.6-3.4c4.3,0,6.6,1.8,8.6,3.4c1.8,1.4,3.4,2.7,6.7,2.7c3.3,0,4.9-1.2,6.7-2.7
-			c2-1.6,4.2-3.4,8.6-3.4c4.3,0,6.6,1.8,8.6,3.4c1.8,1.4,3.4,2.7,6.7,2.7c3.3,0,4.9-1.2,6.7-2.7c2-1.6,4.2-3.4,8.6-3.4
-			c1.8,0,3.3,0.3,4.5,0.8c1.9-2.5,3.5-5.1,5-7.9c-1-0.6-1.8-1.2-2.6-1.8C201.3,102.1,199.6,100.8,196.3,100.8z"/>
-		<path class="st2" d="M211.4,77.5c-4,0-6-1.6-8-3.2c-1.9-1.5-3.6-2.9-7.2-2.9c-3.6,0-5.3,1.4-7.2,2.9c-2,1.6-4,3.2-8,3.2
-			c-4,0-6.1-1.6-8-3.2c-1.9-1.5-3.6-2.9-7.2-2.9c-3.6,0-5.3,1.4-7.2,2.9c-2,1.6-4,3.2-8,3.2c-4,0-6.1-1.6-8-3.2
-			c-1.9-1.5-3.6-2.9-7.2-2.9c-3.6,0-5.3,1.4-7.2,2.9c-2,1.6-4,3.2-8,3.2c-4,0-6.1-1.6-8-3.2c-1.5-1.2-3-2.3-5.3-2.7
-			c-0.5,2.5-0.8,5.1-0.9,7.7c0,0.7-0.1,1.4-0.1,2c0,0.7,0,1.4,0.1,2c0,0.3,0,0.6,0,0.9c3.5,0.3,5.4,1.8,7.2,3.2
-			c1.8,1.4,3.5,2.8,7,2.8c3.5,0,5.2-1.4,7-2.8c1.9-1.5,4.1-3.2,8.2-3.2s6.3,1.7,8.2,3.2c1.8,1.4,3.5,2.8,7,2.8c3.5,0,5.2-1.4,7-2.8
-			c1.9-1.5,4.1-3.2,8.2-3.2c4.1,0,6.3,1.7,8.2,3.2c1.8,1.4,3.5,2.8,7,2.8c3.5,0,5.2-1.4,7-2.8c1.9-1.5,4.1-3.2,8.2-3.2
-			c4.1,0,6.3,1.7,8.2,3.2c1.7,1.3,3.3,2.6,6.3,2.8c0.3-1.6,0.5-3.2,0.6-4.9c0-0.6,0.1-1.3,0.1-1.9v-4.1
-			C211.5,78.6,211.4,77.5,211.4,77.5z"/>
-		<path class="st2" d="M196.3,86.1c-3.5,0-5.2,1.4-7,2.8c-1.9,1.5-4.1,3.2-8.2,3.2c-4.1,0-6.3-1.7-8.2-3.2c-1.8-1.4-3.5-2.8-7-2.8
-			c-3.5,0-5.2,1.4-7,2.8c-1.9,1.5-4.1,3.2-8.2,3.2c-4.1,0-6.3-1.7-8.2-3.2c-1.8-1.4-3.5-2.8-7-2.8c-3.5,0-5.2,1.4-7,2.8
-			c-1.9,1.5-4.1,3.2-8.2,3.2c-4.1,0-6.3-1.7-8.2-3.2c-1.6-1.3-3.1-2.5-5.8-2.8c0.4,4.5,1.4,8.7,2.8,12.8c1.9,0.6,3.2,1.7,4.4,2.7
-			c1.9,1.5,3.5,2.8,6.8,2.8c3.4,0,5-1.3,6.8-2.8c1.9-1.5,4.1-3.3,8.4-3.3c4.2,0,6.4,1.7,8.4,3.3c1.9,1.5,3.5,2.8,6.8,2.8
-			c3.4,0,5-1.3,6.8-2.8c1.9-1.5,4.1-3.3,8.4-3.3c4.2,0,6.4,1.7,8.4,3.3c1.9,1.5,3.5,2.8,6.8,2.8c3.4,0,5-1.3,6.8-2.8
-			c1.9-1.5,4.1-3.3,8.4-3.3c4.2,0,6.4,1.7,8.4,3.3c0.7,0.6,1.4,1.1,2.2,1.6c1.6-3.5,2.8-7.2,3.6-11.1c-3.5-0.3-5.4-1.8-7.2-3.2
-			C201.5,87.5,199.7,86.1,196.3,86.1z"/>
-		<path class="st0" d="M187.7,115.9c-1.8,1.4-3.4,2.7-6.7,2.7c-3.3,0-4.9-1.2-6.7-2.7c-2-1.6-4.2-3.4-8.6-3.4
-			c-4.3,0-6.6,1.8-8.6,3.4c-1.8,1.4-3.4,2.7-6.7,2.7c-3.3,0-4.9-1.2-6.7-2.7c-2-1.6-4.2-3.4-8.6-3.4c-4.3,0-6.6,1.8-8.6,3.4
-			c-1.6,1.3-3,2.4-5.6,2.6c0.9,0.9,1.8,1.7,2.7,2.5c2.1-0.6,3.5-1.8,4.8-2.8c1.8-1.4,3.4-2.7,6.7-2.7c3.3,0,4.9,1.2,6.7,2.7
-			c2,1.6,4.2,3.4,8.6,3.4c4.3,0,6.6-1.8,8.6-3.4c1.8-1.4,3.4-2.7,6.7-2.7c3.3,0,4.9,1.2,6.7,2.7c2,1.6,4.2,3.4,8.6,3.4
-			c4.3,0,6.6-1.8,8.6-3.4c1.8-1.4,3.4-2.7,6.7-2.7c0.9,0,1.7,0.1,2.4,0.3c0.7-0.8,1.4-1.7,2-2.5c-1.2-0.5-2.7-0.8-4.5-0.8
-			C191.9,112.5,189.7,114.3,187.7,115.9z"/>
-		<path class="st0" d="M196.3,98.4c-4.2,0-6.4,1.7-8.4,3.3c-1.9,1.5-3.5,2.8-6.8,2.8c-3.4,0-5-1.3-6.8-2.8c-1.9-1.5-4.1-3.3-8.4-3.3
-			c-4.2,0-6.4,1.7-8.4,3.3c-1.9,1.5-3.5,2.8-6.8,2.8c-3.4,0-5-1.3-6.8-2.8c-1.9-1.5-4.1-3.3-8.4-3.3c-4.2,0-6.4,1.7-8.4,3.3
-			c-1.9,1.5-3.5,2.8-6.8,2.8c-3.4,0-5-1.3-6.8-2.8c-1.2-1-2.5-2-4.4-2.7c0.4,1.2,0.9,2.3,1.4,3.5c0.5,0.3,1,0.7,1.5,1.1
-			c1.9,1.5,4.1,3.3,8.4,3.3c4.2,0,6.4-1.7,8.4-3.3c1.9-1.5,3.5-2.8,6.8-2.8c3.4,0,5,1.3,6.8,2.8c1.9,1.5,4.1,3.3,8.4,3.3
-			c4.2,0,6.4-1.7,8.4-3.3c1.9-1.5,3.5-2.8,6.8-2.8c3.4,0,5,1.3,6.8,2.8c1.9,1.5,4.1,3.3,8.4,3.3c4.2,0,6.4-1.7,8.4-3.3
-			c1.9-1.5,3.5-2.8,6.8-2.8c3.4,0,5,1.3,6.8,2.8c0.8,0.6,1.6,1.3,2.6,1.8c0.4-0.7,0.7-1.5,1.1-2.2c-0.8-0.4-1.4-1-2.2-1.6
-			C202.7,100.1,200.5,98.4,196.3,98.4z"/>
-		<path class="st0" d="M196.3,84.2c-4.1,0-6.3,1.7-8.2,3.2c-1.8,1.4-3.5,2.8-7,2.8c-3.5,0-5.2-1.4-7-2.8c-1.9-1.5-4.1-3.2-8.2-3.2
-			c-4.1,0-6.3,1.7-8.2,3.2c-1.8,1.4-3.5,2.8-7,2.8c-3.5,0-5.2-1.4-7-2.8c-1.9-1.5-4.1-3.2-8.2-3.2c-4.1,0-6.3,1.7-8.2,3.2
-			c-1.8,1.4-3.5,2.8-7,2.8c-3.5,0-5.2-1.4-7-2.8c-1.7-1.4-3.7-2.9-7.2-3.2c0,0.6,0.1,1.3,0.1,1.9c2.7,0.3,4.2,1.5,5.8,2.8
-			c1.9,1.5,4.1,3.2,8.2,3.2c4.1,0,6.3-1.7,8.2-3.2c1.8-1.4,3.5-2.8,7-2.8c3.5,0,5.2,1.4,7,2.8c1.9,1.5,4.1,3.2,8.2,3.2
-			c4.1,0,6.3-1.7,8.2-3.2c1.8-1.4,3.5-2.8,7-2.8c3.5,0,5.2,1.4,7,2.8c1.9,1.5,4.1,3.2,8.2,3.2c4.1,0,6.3-1.7,8.2-3.2
-			c1.8-1.4,3.5-2.8,7-2.8c3.5,0,5.2,1.4,7,2.8c1.7,1.4,3.7,2.9,7.2,3.2c0.1-0.6,0.2-1.3,0.3-1.9c-3-0.2-4.6-1.4-6.3-2.8
-			C202.6,85.9,200.4,84.2,196.3,84.2z"/>
-		<path class="st0" d="M120.1,77.5c4,0,6.1-1.6,8-3.2c1.9-1.5,3.6-2.9,7.2-2.9c3.6,0,5.3,1.4,7.2,2.9c2,1.6,4,3.2,8,3.2
-			c4,0,6.1-1.6,8-3.2c1.9-1.5,3.6-2.9,7.2-2.9c3.6,0,5.3,1.4,7.2,2.9c2,1.6,4,3.2,8,3.2c4,0,6.1-1.6,8-3.2c1.9-1.5,3.6-2.9,7.2-2.9
-			c3.6,0,5.3,1.4,7.2,2.9c1.9,1.5,4,3.1,8,3.2l0-0.1c0-0.4-0.1-0.8-0.1-1.3c-3.4-0.1-5.2-1.4-7-2.9c-2-1.6-4-3.2-8-3.2
-			c-4,0-6.1,1.6-8,3.2c-1.9,1.5-3.6,2.9-7.2,2.9c-3.6,0-5.3-1.4-7.2-2.9c-2-1.6-4-3.2-8-3.2c-4,0-6.1,1.6-8,3.2
-			c-1.9,1.5-3.6,2.9-7.2,2.9c-3.6,0-5.3-1.4-7.2-2.9c-2-1.6-4-3.2-8-3.2c-4,0-6.1,1.6-8,3.2c-1.9,1.5-3.6,2.9-7.2,2.9
-			c-3.6,0-5.3-1.4-7.2-2.9c-1.6-1.3-3.2-2.5-5.9-3c-0.1,0.4-0.2,0.9-0.3,1.3c2.4,0.4,3.8,1.5,5.3,2.7C114,75.9,116,77.5,120.1,77.5z
-			"/>
-		<path class="st0" d="M120.1,62.8c4,0,5.9-1.6,7.9-3.1c1.9-1.5,3.7-2.9,7.4-2.9s5.5,1.4,7.4,2.9c1.9,1.5,3.9,3.1,7.9,3.1
-			c4,0,5.9-1.6,7.9-3.1c1.9-1.5,3.7-2.9,7.4-2.9c3.7,0,5.5,1.4,7.4,2.9c1.9,1.5,3.9,3.1,7.9,3.1c4,0,5.9-1.6,7.9-3.1
-			c1.9-1.5,3.7-2.9,7.4-2.9c3.7,0,5.5,1.4,7.4,2.9c1.3,1,2.5,2,4.4,2.6c-0.1-0.3-0.3-0.7-0.4-1c-1.3-0.6-2.4-1.4-3.4-2.2
-			c-1.9-1.5-3.9-3.1-7.9-3.1c-4,0-5.9,1.6-7.9,3.1c-1.9,1.5-3.7,2.9-7.4,2.9c-3.7,0-5.5-1.4-7.4-2.9c-1.9-1.5-3.9-3.1-7.9-3.1
-			c-4,0-5.9,1.6-7.9,3.1c-1.9,1.5-3.7,2.9-7.4,2.9c-3.7,0-5.5-1.4-7.4-2.9c-1.9-1.5-3.9-3.1-7.9-3.1c-4,0-5.9,1.6-7.9,3.1
-			c-1.9,1.5-3.7,2.9-7.4,2.9c-3.7,0-5.5-1.4-7.4-2.9c-0.5-0.4-0.9-0.7-1.4-1.1c-0.1,0.2-0.3,0.5-0.4,0.8c0.4,0.3,0.9,0.6,1.3,1
-			C114.1,61.2,116.1,62.8,120.1,62.8z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path class="st0" d="M81.7,161.9l-18.2,41.2h-5.1l-18.2-41.2h5.1L61,197.4l15.6-35.5H81.7z"/>
-		<path class="st0" d="M91.7,166.3v13.6h22.4v4.4H91.7v14.3h24.8v4.4H87v-41.2h29.6v4.4H91.7z"/>
-		<path class="st0" d="M150.9,198.7v4.4h-27.2v-41.2h4.7v36.8H150.9z"/>
-		<path class="st0" d="M160.9,166.3v13.6h22.4v4.4h-22.4v14.3h24.8v4.4h-29.6v-41.2h29.6v4.4H160.9z"/>
-		<path class="st0" d="M223.1,181.3c-1.1,1.9-2.6,3.4-4.6,4.6c-2,1.2-4.2,1.9-6.6,2.2l10.5,14.9h-5.3l-10.4-14.8h-9.1v14.8h-4.7
-			v-41.2h16.7c2.8,0,5.4,0.6,7.7,1.7c2.3,1.1,4.1,2.7,5.5,4.7c1.3,2,2,4.3,2,6.8C224.8,177.4,224.2,179.5,223.1,181.3z M197.5,183.9
-			h11.2c3.4,0,6.1-0.8,8.2-2.3c2.1-1.6,3.1-3.7,3.1-6.4c0-2.7-1-4.9-3.1-6.4c-2.1-1.6-4.8-2.3-8.2-2.3h-11.2V183.9z"/>
-		<path class="st0" d="M239.6,200.9c-3.3-1.9-5.8-4.5-7.8-7.8c-1.9-3.3-2.9-6.8-2.9-10.6c0-3.8,1-7.3,2.9-10.6
-			c1.9-3.3,4.5-5.9,7.8-7.8c3.3-1.9,6.8-2.9,10.5-2.9c3.8,0,7.2,1,10.5,2.9c3.2,1.9,5.8,4.5,7.7,7.8c1.9,3.3,2.9,6.8,2.9,10.6
-			c0,3.8-1,7.3-2.9,10.6c-1.9,3.3-4.5,5.9-7.7,7.8c-3.2,1.9-6.7,2.9-10.5,2.9C246.3,203.8,242.8,202.9,239.6,200.9z M258.2,197.2
-			c2.5-1.6,4.5-3.6,6-6.2c1.5-2.6,2.2-5.4,2.2-8.5c0-3-0.7-5.8-2.2-8.4c-1.5-2.6-3.5-4.7-6-6.2c-2.5-1.5-5.2-2.3-8.1-2.3
-			c-2.9,0-5.6,0.8-8.1,2.3s-4.5,3.6-6,6.2s-2.2,5.4-2.2,8.4c0,3,0.8,5.9,2.2,8.5c1.5,2.6,3.5,4.7,6,6.2c2.5,1.6,5.2,2.3,8.1,2.3
-			C253,199.5,255.7,198.7,258.2,197.2z"/>
-	</g>
-</g>
-</svg>

changelogs/CHANGELOG-1.6.md

@@ -1,3 +1,80 @@
+## v1.6.3
+### 2021-07-30
+
+### Download
+https://github.com/vmware-tanzu/velero/releases/tag/v1.6.3
+
+### Container Image
+`velero/velero:v1.6.3`
+
+### Documentation
+https://velero.io/docs/v1.6/
+
+### Upgrading
+https://velero.io/docs/v1.6/upgrade-to-1.6/
+
+### Highlights
+
+This release introduces changes to provide compatibility with Kubernetes v1.22.
+
+The `apiextensions.k8s.io/v1beta1` API version of `CustomResourceDefinition` will no longer be served in Kubernetes v1.22.
+Velero will now use the cluster preferred API version for the `CustomResourceDefinition`s that it creates.
+
+If you are using Kubernetes v1.15 or earlier, the `apiextensions.k8s.io/v1beta1` API version will be used.
+If you are using Kubernetes v1.22 or later, the `apiextensions.k8s.io/v1` API version will be used.
+For clusters between these versions, the cluster preferred API version will be used.
+
+The `rbac.authorization.k8s.io/v1beta1` API version of `ClusterRoleBinding` will no longer be served in Kubernetes v1.22.
+Velero will now use the `rbac.authorization.k8s.io/v1` API version for the `ClusterRoleBinding`s that it creates.
+This API version was introduced in Kubernetes v1.8.
+
+### All Changes
+
+  * enable e2e tests to choose crd apiVersion (#3941, @sseago)
+  * Upgrade Velero ClusterRoleBinding to use v1 API (#3995, @jenting)
+  * Install Kubernetes preferred CRDs API version (v1beta1/v1). (#3999, @jenting)
+  * Use the cluster preferred CRD API version when polling for Velero CRD readiness. (#4015, @zubron)
+  * Add a RestoreItemAction plugin (`velero.io/apiservice`) which skips the restore of any `APIService` which is managed by Kubernetes. These are identified using the `kube-aggregator.kubernetes.io/automanaged` label. (#4028, @zubron)
+
+## v1.6.2
+### 2021-07-16
+
+### Download
+https://github.com/vmware-tanzu/velero/releases/tag/v1.6.2
+
+### Container Image
+`velero/velero:v1.6.2`
+
+### Documentation
+https://velero.io/docs/v1.6/
+
+### Upgrading
+https://velero.io/docs/v1.6/upgrade-to-1.6/
+
+This release contains no user facing changes but includes fixes for CVE-2021-3121 and CVE-2021-3580.
+
+## v1.6.1
+### 2021-06-21
+
+### Download
+https://github.com/vmware-tanzu/velero/releases/tag/v1.6.1
+
+### Container Image
+`velero/velero:v1.6.1`
+
+### Documentation
+https://velero.io/docs/v1.6/
+
+### Upgrading
+https://velero.io/docs/v1.6/upgrade-to-1.6/
+
+### All Changes
+
+  * Fix CR restore regression introduced in 1.6 restore progress. (#3845, @sseago)
+  * Skip the restore of volumes that originally came from a projected volume when using restic. (#3877, @zubron)
+  * skip backuping projected volume when using restic (#3866, @alaypatel07)
+  * 🐛 Fix plugin name derivation from image name (#3711, @ashish-amarnath)
+
 ## v1.6.0
 ### 2021-04-12
 

changelogs/CHANGELOG-1.7.md

@@ -1,80 +0,0 @@
-## v1.7.0
-### 2021-09-07
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.7.0
-
-### Container Image
-`velero/velero:v1.7.0`
-
-### Documentation
-https://velero.io/docs/v1.7/
-
-### Upgrading
-https://velero.io/docs/v1.7/upgrade-to-1.7/
-
-### Highlights
-
-#### Distroless images
-
-The Velero container images now use [distroless base images](https://github.com/GoogleContainerTools/distroless).
-Using distroless images as the base ensures that only the packages and programs necessary for running Velero are included.
-Unrelated libraries and OS packages, that often contain security vulnerabilities, are now excluded.
-This change reduces the size of both the server and restic restore helper image by approximately 62MB.
-
-As the [distroless](https://github.com/GoogleContainerTools/distroless) images do not contain a shell, it will no longer be possible to exec into Velero containers using these images.
-
-#### New "debug" command
-
-This release introduces the new `velero debug` command.
-This command collects information about a Velero installation, such as pod logs and resources managed by Velero, in a tarball which can be provided to the Velero maintainer team to help diagnose issues.
-
-### All changes
-
-  * Distinguish between different unnamed node ports when preserving (#4026, @sseago)
-  * Validate namespace in Velero backup create command (#4057, @codegold79)
-  * Empty the "ClusterIPs" along with "ClusterIP" when "ClusterIP" isn't "None" (#4101, @ywk253100)
-  * Add a RestoreItemAction plugin (`velero.io/apiservice`) which skips the restore of any `APIService` which is managed by Kubernetes. These are identified using the `kube-aggregator.kubernetes.io/automanaged` label. (#4028, @zubron)
-  * Change the base image to distroless (#4055, @ywk253100)
-  * Updated the version of velero/velero-plugin-for-aws version from v1.2.0 to v1.2.1 (#4064, @kahirokunn)
-  * Skip the backup and restore of DownwardAPI volumes when using restic. (#4076, @zubron)
-  * Bump up Go to 1.16 (#3990, @reasonerjt)
-  * Fix restic error when volume is emptyDir and Pod not running (#3993, @mahaupt)
-  * Select the velero deployment with both label and container name (#3996, @ywk253100)
-  * Wait for the namespace to be deleted before removing the CRDs during uninstall. This deprecates the `--wait` flag of the `uninstall` command (#4007, @ywk253100)
-  * Use the cluster preferred CRD API version when polling for Velero CRD readiness. (#4015, @zubron)
-  * Implement velero debug (#4022, @reasonerjt)
-  * Skip the restore of volumes that originally came from a projected volume when using restic. (#3877, @zubron)
-  * Run the E2E test with kind(provision various versions of k8s cluster) and MinIO on Github Action (#3912, @ywk253100)
-  * Fix -install-velero flag for e2e tests (#3919, @jaidevmane)
-  * Upgrade Velero ClusterRoleBinding to use v1 API (#3926, @jenting)
-  * enable e2e tests to choose crd apiVersion (#3941, @sseago)
-  * Fixing multipleNamespaceTest bug - Missing expect statement in test (#3983, @jaidevmane)
-  * Add --client-page-size flag to server to allow chunking Kubernetes API LIST calls across multiple requests on large clusters (#3823, @dharmab)
-  * Fix CR restore regression introduced in 1.6 restore progress. (#3845, @sseago)
-  * Use region specified in the BackupStorageLocation spec when getting restic repo identifier. Originally fixed by @jala-dx in #3617. (#3857, @zubron)
-  * skip backuping projected volume when using restic (#3866, @alaypatel07)
-  * Install Kubernetes preferred CRDs API version (v1beta1/v1). (#3614, @jenting)
-  * Add Label to BackupSpec so that labels can explicitly be provided to Schedule.Spec.Template.Metadata.Labels which will be reflected on the backups created. (#3641, @arush-sal)
-  * Add PVC UID label to PodVolumeRestore (#3792, @sseago)
-  * Support pulling plugin images by digest (#3803, @2uasimojo)
-  * Added BackupPhaseUploading and BackupPhaseUploadingPartialFailure backup phases as part of Upload Progress Monitoring. (#3805, @dsmithuchida)
-
-    Uploading (new)
-    The "Uploading" phase signifies that the main part of the backup, including 
-    snapshotting has completed successfully and uploading is continuing. In 
-    the event of an error during uploading, the phase will change to 
-    UploadingPartialFailure. On success, the phase changes to Completed. The 
-    backup cannot be restored from when it is in the Uploading state.
-
-    UploadingPartialFailure (new)
-    The "UploadingPartialFailure" phase signifies that the main part of the backup,
-    including snapshotting has completed, but there were partial failures either 
-    during the main part or during the uploading. The backup cannot be restored 
-    from when it is in the UploadingPartialFailure state.
-  * 🐛 Fix plugin name derivation from image name (#3711, @ashish-amarnath)
-  * ✨ ⚠️ Remove CSI volumesnapshot artifact deletion
-
-This change requires https://github.com/vmware-tanzu/velero-plugin-for-csi/pull/86 for Velero to continue
-deleting of CSI volumesnapshots when the corresponding backups are deleted. (#3734, @ashish-amarnath)
-  * use unstructured to marshal selective fields for service restore action (#3789, @alaypatel07)

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,156 +0,0 @@
-## 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)

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.
@@ -312,68 +307,6 @@ spec:
                       are ANDed.
                     type: object
                 type: object
-              metadata:
-                properties:
-                  labels:
-                    additionalProperties:
-                      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 +347,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 +357,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.
@@ -210,10 +205,8 @@ spec:
                                             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)".
+                                            unchanged. The $(VAR_NAME) syntax can
+                                            be escaped with a double $$, ie: $$(VAR_NAME).
                                             Escaped references will never be expanded,
                                             regardless of whether the variable exists
                                             or not. Cannot be updated. More info:
@@ -228,14 +221,12 @@ spec:
                                             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
-                                            be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+                                            input string will be unchanged. The $(VAR_NAME)
+                                            syntax can be escaped with a double $$,
+                                            ie: $$(VAR_NAME). Escaped references will
+                                            never be expanded, regardless of whether
+                                            the variable exists or not. Cannot be
+                                            updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
                                           items:
                                             type: string
                                           type: array
@@ -253,19 +244,17 @@ spec:
                                               value:
                                                 description: 'Variable references
                                                   $(VAR_NAME) are expanded using the
-                                                  previously defined environment variables
+                                                  previous defined environment variables
                                                   in the container and any service
                                                   environment variables. 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. Defaults to "".'
+                                                  The $(VAR_NAME) syntax can be escaped
+                                                  with a double $$, ie: $$(VAR_NAME).
+                                                  Escaped references will never be
+                                                  expanded, regardless of whether
+                                                  the variable exists or not. Defaults
+                                                  to "".'
                                                 type: string
                                               valueFrom:
                                                 description: Source for the environment
@@ -815,30 +804,6 @@ spec:
                                               required:
                                               - port
                                               type: object
-                                            terminationGracePeriodSeconds:
-                                              description: Optional duration in seconds
-                                                the pod needs to terminate gracefully
-                                                upon probe failure. The grace period
-                                                is the duration in seconds after the
-                                                processes running in the pod are sent
-                                                a termination signal and the time
-                                                when the processes are forcibly halted
-                                                with a kill signal. Set this value
-                                                longer than the expected cleanup time
-                                                for your process. If this value is
-                                                nil, the pod's terminationGracePeriodSeconds
-                                                will be used. Otherwise, this value
-                                                overrides the value provided by the
-                                                pod spec. Value must be non-negative
-                                                integer. The value zero indicates
-                                                stop immediately via the kill signal
-                                                (no opportunity to shut down). This
-                                                is a beta field and requires enabling
-                                                ProbeTerminationGracePeriod feature
-                                                gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                                is used if unset.
-                                              format: int64
-                                              type: integer
                                             timeoutSeconds:
                                               description: 'Number of seconds after
                                                 which the probe times out. Defaults
@@ -897,7 +862,6 @@ spec:
                                                   by services.
                                                 type: string
                                               protocol:
-                                                default: TCP
                                                 description: Protocol for port. Must
                                                   be UDP, TCP, or SCTP. Defaults to
                                                   "TCP".
@@ -1042,30 +1006,6 @@ spec:
                                               required:
                                               - port
                                               type: object
-                                            terminationGracePeriodSeconds:
-                                              description: Optional duration in seconds
-                                                the pod needs to terminate gracefully
-                                                upon probe failure. The grace period
-                                                is the duration in seconds after the
-                                                processes running in the pod are sent
-                                                a termination signal and the time
-                                                when the processes are forcibly halted
-                                                with a kill signal. Set this value
-                                                longer than the expected cleanup time
-                                                for your process. If this value is
-                                                nil, the pod's terminationGracePeriodSeconds
-                                                will be used. Otherwise, this value
-                                                overrides the value provided by the
-                                                pod spec. Value must be non-negative
-                                                integer. The value zero indicates
-                                                stop immediately via the kill signal
-                                                (no opportunity to shut down). This
-                                                is a beta field and requires enabling
-                                                ProbeTerminationGracePeriod feature
-                                                gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                                is used if unset.
-                                              format: int64
-                                              type: integer
                                             timeoutSeconds:
                                               description: 'Number of seconds after
                                                 which the probe times out. Defaults
@@ -1077,7 +1017,7 @@ spec:
                                         resources:
                                           description: 'Compute Resources required
                                             by this container. Cannot be updated.
-                                            More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                            More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                           properties:
                                             limits:
                                               additionalProperties:
@@ -1088,7 +1028,7 @@ spec:
                                                 x-kubernetes-int-or-string: true
                                               description: 'Limits describes the maximum
                                                 amount of compute resources allowed.
-                                                More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                                More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                               type: object
                                             requests:
                                               additionalProperties:
@@ -1103,14 +1043,12 @@ spec:
                                                 a container, it defaults to Limits
                                                 if that is explicitly specified, otherwise
                                                 to an implementation-defined value.
-                                                More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                                More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
                                               type: object
                                           type: object
                                         securityContext:
-                                          description: 'SecurityContext defines the
-                                            security options the container should
-                                            be run with. If set, the fields of SecurityContext
-                                            override the equivalent fields of PodSecurityContext.
+                                          description: 'Security options the pod should
+                                            run with. More info: https://kubernetes.io/docs/concepts/policy/security-context/
                                             More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
                                           properties:
                                             allowPrivilegeEscalation:
@@ -1279,25 +1217,6 @@ spec:
                                                     is the name of the GMSA credential
                                                     spec to use.
                                                   type: string
-                                                hostProcess:
-                                                  description: HostProcess determines
-                                                    if a container should be run as
-                                                    a 'Host Process' container. This
-                                                    field is alpha-level and will
-                                                    only be honored by components
-                                                    that enable the WindowsHostProcessContainers
-                                                    feature flag. Setting this field
-                                                    without the feature flag will
-                                                    result in errors when validating
-                                                    the Pod. All of a Pod's containers
-                                                    must have the same effective HostProcess
-                                                    value (it is not allowed to have
-                                                    a mix of HostProcess containers
-                                                    and non-HostProcess containers).  In
-                                                    addition, if HostProcess is true
-                                                    then HostNetwork must also be
-                                                    set to true.
-                                                  type: boolean
                                                 runAsUserName:
                                                   description: The UserName in Windows
                                                     to run the entrypoint of the container
@@ -1323,7 +1242,9 @@ spec:
                                             lifecycle, when it might take a long time
                                             to load data or warm a cache, than during
                                             steady-state operation. This cannot be
-                                            updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+                                            updated. This is a beta feature enabled
+                                            by the StartupProbe feature flag. More
+                                            info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
                                           properties:
                                             exec:
                                               description: One and only one of the
@@ -1450,30 +1371,6 @@ spec:
                                               required:
                                               - port
                                               type: object
-                                            terminationGracePeriodSeconds:
-                                              description: Optional duration in seconds
-                                                the pod needs to terminate gracefully
-                                                upon probe failure. The grace period
-                                                is the duration in seconds after the
-                                                processes running in the pod are sent
-                                                a termination signal and the time
-                                                when the processes are forcibly halted
-                                                with a kill signal. Set this value
-                                                longer than the expected cleanup time
-                                                for your process. If this value is
-                                                nil, the pod's terminationGracePeriodSeconds
-                                                will be used. Otherwise, this value
-                                                overrides the value provided by the
-                                                pod spec. Value must be non-negative
-                                                integer. The value zero indicates
-                                                stop immediately via the kill signal
-                                                (no opportunity to shut down). This
-                                                is a beta field and requires enabling
-                                                ProbeTerminationGracePeriod feature
-                                                gate. Minimum value is 1. spec.terminationGracePeriodSeconds
-                                                is used if unset.
-                                              format: int64
-                                              type: integer
                                             timeoutSeconds:
                                               description: 'Number of seconds after
                                                 which the probe times out. Defaults
@@ -1708,61 +1605,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.
@@ -1773,26 +1615,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.
@@ -341,68 +320,6 @@ spec:
                           "value". The requirements are ANDed.
                         type: object
                     type: object
-                  metadata:
-                    properties:
-                      labels:
-                        additionalProperties:
-                          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 +386,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,432 @@
+
+---
+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
+            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,394 @@
+
+---
+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
+                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/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/Implemented/velero-debug.md

@@ -1,122 +0,0 @@
-# `velero debug` command for gathering troubleshooting information
-
-## Abstract
-To simplify the communication between velero users and developers, this document proposes the `velero debug` command to generate a tarball including the logs needed for debugging.
-
-Github issue: https://github.com/vmware-tanzu/velero/issues/675
-
-## Background
-Gathering information to troubleshoot a Velero deployment is currently spread across multiple commands, and is not very efficient. Logs for the Velero server itself are accessed via a kubectl logs command, while information on specific backups or restores are accessed via a Velero subcommand. Restic logs are even more complicated to retrieve, since one must gather logs for every instance of the daemonset, and there’s currently no good mechanism to locate which node a particular restic backup ran against.  
-A dedicated subcommand can lower this effort and reduce back-and-forth between user and developer for collecting the logs.
-
-
-## Goals
-- Enable efficient log collection for Velero and associated components, like plugins and restic.
-
-## Non Goals
-- Collecting logs for components that do not belong to velero such as storage service.
-- Automated log analysis.
-
-## High-Level Design
-With the introduction of the new command `velero debug`, the command would download all of the following information:
-- velero deployment logs
-- restic DaemonSet logs
-- plugin logs 
-- All the resources in the group `velero.io` that are created such as:
-    - Backup
-    - Restore
-    - BackupStorageLocation
-    - PodVolumeBackup
-    - PodVolumeRestore
-    - *etc ...*
-- Log of the backup and restore, if specified in the param
-
-A project called `crash-diagnostics` (or `crashd`) (https://github.com/vmware-tanzu/crash-diagnostics)  implements the Kubernetes API queries and provides Starlark scripting language to abstract details, and collect the information into a local copy.   It can be used as a standalone CLI executing a Starlark script file.
-With the capabilities of embedding files in Go 1.16, we can define a Starlark script gathering the necessary information, embed the script at build time, then the velero debug command will invoke `crashd`, passing in the script’s text contents.
-
-## Detailed Design
-### Triggering the script
-The Starlark script to be called by crashd:
-
-```python
-def capture_backup_logs(cmd, namespace):
-    if args.backup:
-        log("Collecting log and information for backup: {}".format(args.backup))
-        backupDescCmd = "{} --namespace={} backup describe {} --details".format(cmd, namespace, args.backup)
-        capture_local(cmd=backupDescCmd, file_name="backup_describe_{}.txt".format(args.backup))
-        backupLogsCmd = "{} --namespace={} backup logs {}".format(cmd, namespace, args.backup)
-        capture_local(cmd=backupLogsCmd, file_name="backup_{}.log".format(args.backup))
-def capture_restore_logs(cmd, namespace):
-    if args.restore:
-        log("Collecting log and information for restore: {}".format(args.restore))
-        restoreDescCmd = "{} --namespace={} restore describe {} --details".format(cmd, namespace, args.restore)
-        capture_local(cmd=restoreDescCmd, file_name="restore_describe_{}.txt".format(args.restore))
-        restoreLogsCmd = "{} --namespace={} restore logs {}".format(cmd, namespace, args.restore)
-        capture_local(cmd=restoreLogsCmd, file_name="restore_{}.log".format(args.restore))
-
-ns = args.namespace if args.namespace else "velero"
-output = args.output if args.output else "bundle.tar.gz"
-cmd = args.cmd if args.cmd else "velero"
-# Working dir for writing during script execution
-crshd = crashd_config(workdir="./velero-bundle")
-set_defaults(kube_config(path=args.kubeconfig, cluster_context=args.kubecontext))
-log("Collecting velero resources in namespace: {}". format(ns))
-kube_capture(what="objects", namespaces=[ns], groups=['velero.io'])
-capture_local(cmd="{} version -n {}".format(cmd, ns), file_name="version.txt")
-log("Collecting velero deployment logs in namespace: {}". format(ns))
-kube_capture(what="logs", namespaces=[ns])
-capture_backup_logs(cmd, ns)
-capture_restore_logs(cmd, ns)
-archive(output_file=output, source_paths=[crshd.workdir])
-log("Generated debug information bundle: {}".format(output))
-```
-The sample command to trigger the script via crashd:
-```shell
-./crashd run ./velero.cshd --args 
-'backup=harbor-backup-2nd,namespace=velero,basedir=,restore=,kubeconfig=/home/.kube/minikube-250-224/config,output='
-```
-To trigger the script in `velero debug`, in the package `pkg/cmd/cli/debug` a struct `option` will be introduced
-```go
-type option struct {
-	// currCmd the velero command
-	currCmd string
-	// workdir for crashd will be $baseDir/velero-debug
-	baseDir string
-	// the namespace where velero server is installed
-	namespace string
-	// the absolute path for the log bundle to be generated
-	outputPath string
-	// the absolute path for the kubeconfig file that will be read by crashd for calling K8S API
-	kubeconfigPath string
-	// the kubecontext to be used for calling K8S API
-	kubeContext string
-	// optional, the name of the backup resource whose log will be packaged into the debug bundle
-	backup string
-	// optional, the name of the restore resource whose log will be packaged into the debug bundle
-	restore string
-	// optional, it controls whether to print the debug log messages when calling crashd
-	verbose bool
-}
-```
-The code will consolidate the input parameters and execution context of the `velero` CLI to form the option struct, which can be transformed into the `argsMap` that can be used when calling the func `exec.Execute` in `crashd`:
-https://github.com/vmware-tanzu/crash-diagnostics/blob/v0.3.4/exec/executor.go#L17
-
-## Alternatives Considered
-The collection could be done via the kubernetes client-go API, but such integration is not necessarily trivial to implement, therefore, `crashd` is preferred approach
-
-## Security Considerations
-- The starlark script will be embedded into the velero binary, and the byte slice will be passed to the `exec.Execute` func directly, so there’s little risk that the script will be modified before being executed.
-
-## Compatibility
-As the `crashd` project evolves the behavior of the internal functions used in the Starlark script may change.  We’ll ensure the correctness of the script via regular E2E tests.
-
-
-## Implementation
-1. Bump up to use Go v1.16 to compile velero
-2. Embed the starlark script
-3. Implement the `velero debug` sub-command to call the script
-4. Add E2E test case
-
-## Open Questions
-- **Command dependencies:** In the Starlark script, for collecting version info and backup logs, it calls the `velero backup logs` and `velero version`, which makes the call stack like velero debug -> crashd -> velero xxx.  We need to make sure this works under different PATH settings.
-- **Progress and error handling:** The log collection may take a relatively long time, log messages should be printed to indicate the progress when different items are being downloaded and packaged.  Additionally, when an error happens, `crashd` may omit some errors, so before the script is executed we'll do some validation and make sure the `debug` command fail early if some parameters are incorrect.

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/graph-manifest.md

@@ -1,219 +0,0 @@
-# Object Graph Manifest for Velero
-
-## Abstract
-
-One to two sentences that describes the goal of this proposal and the problem being solved by the proposed change.
-The reader should be able to tell by the title, and the opening paragraph, if this document is relevant to them.
-
-Currently, Velero does not have a complete manifest of everything in the backup, aside from the backup tarball itself.
-This change introduces a new data structure to be stored with a backup in object storage which will allow for more efficient operations in reporting of what a backup contains.
-Additionally, this manifest should enable advancements in Velero's features and architecture, enabling dry-run support, concurrent backup and restore operations, and reliable restoration of complex applications.
-
-## Background
-
-Right now, Velero backs up items one at a time, sorted by API Group and namespace.
-It also restores items one at a time, using the restoreResourcePriorities flag to indicate which order API Groups should have their objects restored first.
-While this does work currently, it presents challenges for more complex applications that have their dependencies in the form of a graph rather than strictly linear.
-
-For example, Cluster API clusters are a set of complex Kubernetes objects that require that the "root" objects are restored first, before their "leaf" objects.
-If a Cluster that a ClusterResourceSetBinding refers to does not exist, then a restore of the CAPI cluster will fail.
-
-Additionally, Velero does not have a reliable way to communicate what objects will be affected in a backup or restore operation without actually performing the operation.
-This complicates dry-run tasks, because a user must simply perform the action without knowing what will be touched.
-It also complicates allowing backups and restores to run in parallel, because there is currently no way to know if a single Kubernetes object is included in multiple backups or restores, which can lead to unreliability, deadlocking, and race conditions were Velero made to be more concurrent today.
-
-## Goals
-
-- Introduce a manifest data structure that defines the contents of a backup.
-- Store the manifest data into object storage alongside existing backup data.
-
-## Non Goals
-
-This proposal seeks to enable, but not define, the following.
-
-- Implementing concurrency beyond what already exists in Velero.
-- Implementing a dry-run feature.
-- Implementing a new restore ordering procedure.
-
-While the data structure should take these scenarios into account, they will not be implemented alongside it.
-
-## High-Level Design
-
-To uniquely identify a Kubernetes object within a cluster or backup, the following fields are sufficient:
-
-- API Group and Version (example: backup.velero.io/v1)
-- Namespace 
-- Name
-- Labels
-
-This criteria covers the majority of Velero's inclusion or exclusion logic.
-However, some additional fields enable further use cases.
-
-- Owners, which are other Kubernetes objects that have some relationship to this object. They may be strict or soft dependencies.
-- Annotations, which provide extra metadata about the object that might be useful for other programs to consume.
-- UUID generated by Kubernetes. This is useful in defining Owner relationships, providing a single, immutable key to find an object. This is _not_ considered at restore time, only internally for defining links.
-
-All of this information already exists within a Velero backup's tarball of resources, but extracting such data is inefficient.
-The entire tarball must be downloaded and extracted, and then JSON within parsed to read labels, owners, annotations, and a UUID.
-The rest of the information is encoded in the file system structure within the Velero backup tarball.
-While doable, this is heavyweight in terms of time and potentially memory.
-
-Instead, this proposal suggests adding a new manifest structure that is kept alongside the backup tarball.
-This structure would contain the above fields only, and could be used to perform inclusion/exclusion logic on a backup, select a resource from within a backup, and do set operations over backup or restore contents to identify overlapping resources.
-
-Here are some use cases that this data structure should enable, that have been difficult to implement prior to its existence:
-
-- A dry-run operation on backup, informing the user what would be selected if they were to perform the operation.
- A manifest could be created and saved, allowing for a user to do a dry-run, then accept it to perform the backup.
- Restore operations can be treated similarly.
-- Efficient, non-overlapping parallelization of backup and restore operations.
- By building or reading a manifest before performing a backup or restore, Velero can determine if there are overlapping resources.
- If there are no overlaps, the operations can proceed in parallel.
- If there are overlaps, the operations can proveed serially.
-- Graph-based restores for non-linear dependencies.
- Not all resources in a Kubernetes cluster can be defined in a strict, linear way.
- They may have multiple owners, and writing BackupItemActions or RestoreItemActions to simply return a chain of owners is not an efficient way to support the many Kubernetes operators/controllers being written.
- Instead, by having a manifest with enough information, Velero can build a discrete list that ensures dependencies are restored before their dependents, with less input from plugin authors.
-
-## Detailed Design
-
-The Manifest data structure would look like this, in Go type structure:
-
-```golang
-// NamespacedItems maps a given namespace to all of its contained items.
-type NamespacedItems map[string]*Item
-
-// APIGroupNamespaces maps an API group/version to a map of namespaces and their items.
-type KindNamespaces map[string]NamespacedItems
-
-type Manifest struct {
-    // Kinds holds the top level map of all resources in a manifest.
-    Kinds KindNamespaces
-
-    // Index is used to look up an individual item quickly based on UUID.
-    // This enables fetching owners out of the maps more efficiently at the cost of memory space.
-    Index map[string]*Item
-}
-
-
-// Item represents a Kubernetes resource within a backup based on it's selectable criteria.
-// It is not the whole Kubernetes resource as retrieved from the API server, but rather a collection of important fields needed for filtering.
-type Item struct {
-    // Kubernetes API group which this Item belongs to.
-    // Could be a core resource, or a CustomResourceDefinition.
-    APIGroup string
-
-    // Version of the APIGroup that the Item belongs to.
-    APIVersion string
-
-    // Kubernetes namespace which contains this item.
-    // Empty string for cluster-level resource.
-    Namespace string
-
-    // Item's given name.
-    Name string
-
-    // Map of labels that the Item had at backup time.
-    Labels map[string]string
-
-    // Map of annotations that the Item had at Backup time.
-    // Useful for plugins that may decide to process only Items with specific annotations.
-    Annotations map[string]string
-
-    // Owners is a list of UUIDs to other items that own or refer to this item.
-    Owners []string
-
-    // Manifest is a pointer to the Manifest in which this object is contained.
-    // Useful for getting access to things like the Manifest.Index map.
-    Manifest *Manifest
-}
-```
-
-In addition to the new types, the following Go interfaces would be provided for convenience.
-
-```golang
-type Itermer interface {
-    // Returns the Item as a string, following the current Velero backup version 1.1.0 tarball structure format.
-    // <APIGroup>/<Namespace>/<APIVersion>/<name>.json
-    String() string
-
-    // Owners returns a slice of realized Items that own or refer to the current Item.
-    // Useful for building out a full graph of Items to restore.
-    // Will use the UUIDs in Item.Owners to look up the owner Items in the Manifest.
-    Owners() []*Item
-
-    // Kind returns the Kind of an object, which is a combination of the APIGroup and APIVersion.
-    // Useful for verifying the needed CustomResourceDefinition exists before actually restoring this Item.
-    Kind() *Item
-
-    // Children returns a slice of all Items that refer to this item as an Owner.
-    Children() []*Items
-}
-
-// This error type is being created in order to make reliable sentinel errors.
-// See https://dave.cheney.net/2019/06/10/constant-time for more details.
-type ManifestError string
-
-func (e ManifestError) Error() string {
-    return string(e)
-}
-
-const ItemAlreadyExists = ManifestError("item already exists in manifest")
-
-type Manifester interface {
-    // Set returns the entire list of resources as a set of strings (using Itemer.String).
-    // This is useful for comparing two manifests and determining if they have any overlapping resources.
-    // In the future, when implementing concurrent operations, this can be used as a sanity check to ensure resources aren't being backed up or restored by two operations at once.
-    Set() sets.String
-
-    // Adds an item to the appropriate APIGroup and Namespace within a Manifest
-    // Returns (true, nil) if the Item is successfully added to the Manifest,
-    // Returns (false, ItemAlreadyExists) if the Item is already in the Manifest.
-    Add(*Item) (bool, error)
-}
-```
-
-### Serialization
-
-The entire `Manifest` should be serialized into the `manifest.json` file within the object storage for a single backup.
-It is possible that this file could also be compressed for space efficiency.
-
-### Memory Concerns
-
-Because the `Manifest` is holding a minimal amount of data, memory sizes should not be a concern for most clusters.
-TODO: Document known limits on API group name, resource name, and kind name character limits.
-
-## Security Considerations
-
-Introducing this manifest does not increase the attack surface of Velero, as this data is already present in the existing backups.
-Storing the manifest.json file next to the existing backup data in the object storage does not change access patterns.
-
-## Compatibility
-
-The introduction of this file should trigger Velero backup version 1.2.0, but it will not interfere with Velero versions that do not support the `Manifest` as the file will be additive.
-In time, this file will replace the `<backupname>-resource-list.json.gz` file, but for compatibility the two will appear side by side.
-
-When first implemented, Velero should simply build the `Manifest` as it backs up items, and serialize it at the end.
-Any logic changes that rely on the `Manifest` file must be introduced with their own design document, with their own compatibility concerns.
-
-## Implementation
-
-The `Manifest` object will _not_ be implemented as a Kubernetes CustomResourceDefinition, but rather one of Velero's own internal constructs.
-
-Implementation for the data structure alone should be minimal - the types will need to be defined in a `manifest` package.
-Then, the backup process should create a `Manifest`, passing it to the various `*Backuppers` in the `backup` package.
-These methods will insert individual `Items` into the `Manifest`.
-Finally, logic should be added to the `persistence` package to ensure that the new `manifest.json` file is uploadable and allowed.
-
-## Alternatives Considered
-
-None so far.
-
-## Open Issues
-
-- When should compatibility with the `<backupname>-resource-list.json.gz` file be dropped?
-- What are some good test case Kubernetes resources and controllers to try this out with?
-Cluster API seems like an obvious choice, but are there others?
-- Since it is not implemented as a CustomResourceDefinition, how can a `Manifest` be retained so that users could issue a dry-run command, then perform their actual desire operation?
-Could it be stored in Velero's temp directories?
-Note that this is making Velero itself more stateful.

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
 

design/secrets.md

@@ -8,19 +8,15 @@ This makes it so switching from one plugin to another necessitates overriding th
 
 - To allow Velero to create and store multiple secrets for provider credentials, even multiple credentials for the same provider
 - To improve the UX for configuring the velero deployment with multiple plugins/providers.
-- Enable use cases such as AWS volume snapshots w/Minio as the object storage
-- Continue to support use cases where multiple Backup Storage Locations are in use simultaneously 
-    - `velero backup logs` while backup/restore is running
-- Handle changes in configuration while operations are happening as well as they currently are
 
 ## Non Goals
 
 - To make any change except what's necessary to handle multiple credentials
-- To allow multiple credentials for or change the UX for node-based authentication (e.g. AWS IAM, GCP Workload Identity, Azure AAD Pod Identity).  Node-based authentication will not allow cases such as a mix of AWS snapshots with Minio object storage.
+- To allow multiple credentials for or change the UX for node-based authentication (e.g. AWS IAM, GCP Workload Identity, Azure AAD Pod Identity).
 
 ## Design overview
 
-Instead of one credential per Velero deployment, multiple credentials can be added and used with different BSLs.
+Instead of one credential per Velero deployment, multiple credentials can be added and used with different BSLs VSLs.
   
 There are two aspects to handling multiple credentials:
 
@@ -34,98 +30,36 @@ Each of these aspects will be discussed in turn.
 Currently, Velero creates a secret (`cloud-credentials`) during install with a single entry that contains the contents of the credentials file passed by the user.
 
 Instead of adding new CLI options to Velero to create and manage credentials, users will create their own Kubernetes secrets within the Velero namespace and reference these.
-This approach is being chosen as it allows users to directly manage Kubernetes secrets objects as they wish and it removes the need for wrapper functions to be created within Velero to manage the creation of secrets.  Separate credentials rather than combining credentials in a single secret also avoids issues with maximum size of credentials as well as update in place issues. 
+This approach is being chosen as it allows users to directly manage Kubernetes secrets objects as they wish and it removes the need for wrapper functions to be created within Velero to manage the creation of secrets.
+An initial approach to this problem included modifying the existing `cloud-credentials` secret to add a new entry with each new set of credentials.
+It is likely that this approach would encounter problems as users added more credentials as the maximum size of Secret in Kubernetes is 1MB.
+By allowing users to create Secrets as they need to, we remove these potential limitations.
 
-To enable the use of existing Kubernetes secrets, BSLs will be modified to have a new field `Credential`.
-This field will be a [`SecretKeySelector`](https://godoc.org/k8s.io/api/core/v1#SecretKeySelector) which will enable the user to specify which key within a particular secret the BSL should use.
+To enable the use of existing Kubernetes secrets, BSLs and VSLs will be modified to have a new field `Credential`.
+This field will be a [`SecretKeySelector`](https://godoc.org/k8s.io/api/core/v1#SecretKeySelector) which will enable the user to specify which key within a particular secret the BSL/VSL should use.
 
-Existing BackupStorageLocationSpec definition:
-
-	// BackupStorageLocationSpec defines the desired state of a Velero BackupStorageLocation
-	type BackupStorageLocationSpec struct {
-		// Provider is the provider of the backup storage.
-		Provider string `json:"provider"`
-	
-		// Config is for provider-specific configuration fields.
-		// +optional
-		Config map[string]string `json:"config,omitempty"`
-	
-		StorageType `json:",inline"`
-	
-		// Default indicates this location is the default backup storage location.
-		// +optional
-		Default bool `json:"default,omitempty"`
-	
-		// AccessMode defines the permissions for the backup storage location.
-		// +optional
-		AccessMode BackupStorageLocationAccessMode `json:"accessMode,omitempty"`
-	
-		// BackupSyncPeriod defines how frequently to sync backup API objects from object storage. A value of 0 disables sync.
-		// +optional
-		// +nullable
-		BackupSyncPeriod *metav1.Duration `json:"backupSyncPeriod,omitempty"`
-	
-		// ValidationFrequency defines how frequently to validate the corresponding object storage. A value of 0 disables validation.
-		// +optional
-		// +nullable
-		ValidationFrequency *metav1.Duration `json:"validationFrequency,omitempty"`
-	}
-
-The following field will be added:
-
-	Credential *corev1api.SecretKeySelector `json:"credential,omitempty"`
-
-The resulting BackupStorageLocationSpec will be this:
-
-	// BackupStorageLocationSpec defines the desired state of a Velero BackupStorageLocation
-	type BackupStorageLocationSpec struct {
-		// Provider is the provider of the backup storage.
-		Provider string `json:"provider"`
-	
-		// Config is for provider-specific configuration fields.
-		// +optional
-		Config map[string]string `json:"config,omitempty"`
-	
-		// Credential contains the credential information intended to be used with this location
-		// +optional
-		Credential *corev1api.SecretKeySelector `json:"credential,omitempty"`
-	
-		StorageType `json:",inline"`
-	
-		// Default indicates this location is the default backup storage location.
-		// +optional
-		Default bool `json:"default,omitempty"`
-	
-		// AccessMode defines the permissions for the backup storage location.
-		// +optional
-		AccessMode BackupStorageLocationAccessMode `json:"accessMode,omitempty"`
-	
-		// BackupSyncPeriod defines how frequently to sync backup API objects from object storage. A value of 0 disables sync.
-		// +optional
-		// +nullable
-		BackupSyncPeriod *metav1.Duration `json:"backupSyncPeriod,omitempty"`
-	
-		// ValidationFrequency defines how frequently to validate the corresponding object storage. A value of 0 disables validation.
-		// +optional
-		// +nullable
-		ValidationFrequency *metav1.Duration `json:"validationFrequency,omitempty"`
-	}
-	
-The CLI for managing Backup Storage Locations (BSLs) will be modified to allow the user to set these credentials.
-Both `velero backup-location (create|set)` will have a new flag (`--credential`) to specify the secret and key within the secret to use.
+The CLI for managing BSLs and VSLs will be modified to allow the user to set these credentials.
+Both `velero backup-location (create|set)` and `velero snapshot-location (create|set)` will have a new flag (`--credential`) to specify the secret and key within the secret to use.
 This flag will take a key-value pair in the format `<secret-name>=<key-in-secret>`.
 The arguments will be validated to ensure that the secret exists in the Velero namespace.
-If the Credential field is empty in a BSL, the default credentials from `cloud-credentials` will be used as they
-are currently.
 
 ### Making credentials available to plugins
 
-The approach we have chosen is to include the path to the credentials file in the `config` map passed to a plugin.
+There are three different approaches that can be taken to provide credentials to plugin processes:
+
+1. Providing the path to the credentials file as an environment variable per plugin. This is how credentials are currently passed.
+1. Include the path to the credentials file in the `config` map passed to a plugin.
+1. Include the details of the secret in the `config` map passed to a plugin.
+
+The last two options require changes to the plugin as the plugin will need to instantiate a client using the provided credentials.
+The client libraries used by the plugins will not be able to rely on the credentials details being available in the environment as they currently do.
+
+We have selected option 2 as the approach to take which will be described below.
 
 ### Including the credentials file path in the `config` map
 
-Prior to using any secret for a BSL, it will need to be serialized to disk.
-Using the details in the `Credential` field in the BSL, the contents of the Secret will be read and serialized.
+Prior to using any secret for a BSL or VSL, it will need to be serialized to disk.
+Using the details in the `Credential` field in the BSL/VSL, the contents of the Secret will be read and serialized.
 To achieve this, we will create a new package, `credentials`, which will introduce new types and functions to manage the fetching of credentials based on a `SecretKeySelector`.
 This will also be responsible for serializing the fetched credentials to a temporary directory on the Velero pod filesystem.
 
@@ -137,8 +71,8 @@ This means that any time a `BackupStore`, or other type which requires credentia
 If we instead wanted to use an unique file each time, we could work around the of multiple files being written by cleaning up the temporary files upon completion of the plugin operations, if this information is known.
 
 Once the credentials have been serialized, this path will be made available to the plugins.
-Instead of setting the necessary environment variable for the plugin process, the `config` map for the BSL will be modified to include an addiitional entry with the path to the credentials file: `credentialsFile`.
-This will be passed through when [initializing the BSL](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/velero/object_store.go#L27-L30) and it will be the responsibility of the plugin to use the passed credentials when starting a session.
+Instead of setting the necessary environment variable for the plugin process, the `config` map for the BSL/VSL will be modified to include an addiitional entry with the path to the credentials file: `credentialsFile`.
+This will be passed through when [initializing the BSL/VSL](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/velero/object_store.go#L27-L30) and it will be the responsibility of the plugin to use the passed credentials when starting a session.
 For an example of how this would affect the AWS plugin, see [this PR](https://github.com/vmware-tanzu/velero-plugin-for-aws/pull/69).
 
 The restic controllers will also need to be updated to use the correct credentials.
@@ -150,22 +84,6 @@ Currently, GCP is the only provider that relies on the existing environment vari
 For GCP, the environment variable will be overwritten with the path of the serialized secret.
 
 
-## Split credentials between VolumeSnapshotter and ObjectStore plugins
-
-One of the use cases we wish to satisfy is the ability to specify a different object store than the cloud provider offers,
-for example, using a Minio S3 object store from within AWS.  Currently the VolumeSnapshotter and the ObjectStore plugin
-share the cloud credentials.  Each backup/restore has a BackupStorageLocation associated
-with it.  The BackupStorageLocation can optionally specify the credential used by the ObjectStorePlugin and Restic daemons 
-while the cloud credential will always be used for the VolumeSnapshotter.
-
-## Velero Plugin for vSphere compatibility
-
-The vSphere plugin is implemented as a BackupItemAction and shares the credentials of the AWS plug-in for S3 access.
-The backup storage location is passed in _Backup.Spec.StorageLocation_.  Currently the plugin retrieves the S3 bucket and
-server from the BSL and creates a BackupRespositoryClaim with that and the credentials retrieved from the cloud credential.
-The plug-in will need to be modified to retrieve the credentials field from the BSL and use that credential in the
-BackupRepositoryClaim.
-
 ## Backwards compatibility
 
 For now, regardless of the approaches used above, we will still support the existing workflow.
@@ -174,33 +92,15 @@ Users will be able to set credentials during install and a secret will be create
 This secret will still be mounted into the Velero pods and the appropriate environment variables set.
 This will allow users to use versions of plugins which haven't yet been updated to use credentials directly, such as with many community created plugins.
 
-Multiple credential handling will only be used in the case where a particular BSL has been modified to use an existing secret.
+Multiple credential handling will only be used in the case where a particular BSL/VSL has been modified to use an existing secret.
 
 ## Security Considerations
 
 Although the handling of secrets will be similar to how credentials are currently managed within Velero, care must be taken to ensure that any new code does not leak the contents of secrets, for example, including them within logs.
 
-## Parallelism
-In order to support parallelism, Velero will need to be able to use multiple credentials simultaneously with the
-ObjectStore.  Currently backups are single threaded and a single BSL will be used throughout the entire backup.  The only
-existing points of parallelism are when a user downloads logs for a backup or the BackupStorageLocationReconciler 
-reconciles while a backup or restore is running.  In the current code, `download_request_controller.go` and 
-`backup_storage_location_controller.go` create a new plug-in manager and hence another ObjectStore plugin in 
-parallel with the ObjectStore plugin servicing a backup or restore (if one is running).
-
 ## Alternatives Considered
 
-Three different approaches can be taken to provide credentials to plugin processes:
-
-1. Providing the path to the credentials file as an environment variable per plugin. This is how credentials are currently passed.
-1. Include the path to the credentials file in the `config` map passed to a plugin.
-1. Include the details of the secret in the `config` map passed to a plugin.
-
-The last two options require changes to the plugin as the plugin will need to instantiate a client using the provided credentials.
-The client libraries used by the plugins will not be able to rely on the credentials details being available in the environment as they currently do.
-
-We have selected option 2 as the approach to take.
-
+As mentioned above, there were three potential approaches for providing this support.
 The approaches that were not selected are detailed below for reference.
 
 #### Providing the credentials via environment variables
@@ -210,11 +110,11 @@ Currently, there is a single secret, which is mounted into every pod deployed by
 This path is made known to all plugins through provider specific environment variables and all possible provider environment variables are set to this path.
 
 Instead of setting the environment variables for all the pods, we can modify plugin processes are created so that the environment variables are set on a per plugin process basis.
-Prior to using any secret for a BSL, it will need to be serialized to disk.
-Using the details in the `Credential` field in the BSL, the contents of the Secret will be read and serialized to a file.
+Prior to using any secret for a BSL or VSL, it will need to be serialized to disk.
+Using the details in the `Credential` field in the BSL/VSL, the contents of the Secret will be read and serialized to a file.
 Each plugin process would still have the same set of environment variables set, however the value used for each of these variables would instead be the path to the serialized secret.
 
-To set the environment variables for a plugin process, the plugin manager must be modified so that when creating an ObjectStore, we pass in the entire BSL object, rather than [just the provider](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/manager.go#L132-L158).
+To set the environment variables for a plugin process, the plugin manager must be modified so that when creating an ObjectStore or VolumeSnapshotter, we pass in the entire BSL/VSL object, rather than [just the provider](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/manager.go#L132-L158).
 The plugin manager currently stores a map of [plugin executables to an associated `RestartableProcess`](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/manager.go#L59-L70).
 New restartable processes are created only [with the executable that the process would run](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/manager.go#L122).
 This could be modified to also take the necessary environment variables so that when [underlying go-plugin process is created](https://github.com/vmware-tanzu/velero/blob/main/pkg/plugin/clientmgmt/client_builder.go#L78), these environment variables could be provided and would be set on the plugin process.

design/upload-progress.md

@@ -1,311 +0,0 @@
-# Upload Progress Monitoring
-
-Volume snapshotter plug-in are used by Velero to take snapshots of persistent volume contents. 
-Depending on the underlying storage system, those snapshots may be available to use immediately, 
-they may be uploaded to stable storage internally by the plug-in or they may need to be uploaded after
-the snapshot has been taken. We would like for Velero to continue on to the next part of the backup as quickly
-as possible but we would also like the backup to not be marked as complete until it is a usable backup.  We'd also
-eventually like to bring the control of upload under the control of Velero and allow the user to make decisions
-about the ultimate destination of backup data independent of the storage system they're using.
-
-
-
-## Examples
-AWS - AWS snapshots return quickly, but are then uploaded in the background and cannot be used until EBS moves
-the data into S3 internally.
-
-vSphere - The vSphere plugin takes a local snapshot and then the vSphere plugin uploads the data to S3.  The local
-snapshot is usable before the upload completes.
-
-Restic - Does not go through the volume snapshot path.  Restic backups will block Velero progress until completed.
-
-## Goals
-
-- Enable monitoring of operations that continue after snapshotting operations have completed
-- Keep non-usable backups (upload/persistence has not finished) from appearing as completed
-- Minimize change to volume snapshot and BackupItemAction plug-ins
-
-## Non-goals
-- Unification of BackupItemActions and VolumeSnapshotters
-
-## Models
-
-### Internal configuration and management
-In this model, movement of the snapshot to stable storage is under the control of the snapshot
-plug-in.  Decisions about where and when the snapshot gets moved to stable storage are not
-directly controlled by Velero.  This is the model for the current VolumeSnapshot plugins.
-
-### Velero controlled management
-In this model, the snapshot is moved to external storage under the control of Velero.  This
-enables Velero to move data between storage systems.  This also allows backup partners to use
-Velero to snapshot data and then move the data into their backup repository.
-
-## Backup phases
-
-Velero currently has backup phases "InProgress" and "Completed".  The backup moves to the Completed
-phase when all of the volume snapshots have completed and the Kubernetes metadata has been written
-into the object store.  However, the actual data movement may be happening in the background
-after the backup has been marked "Completed".  The backup is not actually a stable backup until
-the data has been persisted properly.  In some cases (e.g. AWS) the backup cannot be restored from
-until the snapshots have been persisted.
-
-Once the snapshots have been taken, however, it is possible for additional backups to be made without
-interference.  Waiting until all data has been moved before starting the next backup will
-slow the progress of the system without adding any actual benefit to the user.
-
-A new backup phase, "Uploading" will be introduced.  When a backup has entered this phase, Velero
-is free to start another backup.  The backup will remain in the "Uploading" phase until all data
-has been successfully moved to persistent storage.  The backup will not fail once it reaches
-this phase, it will continuously retry moving the data.  If the backup is deleted (cancelled), the plug-ins will
-attempt to delete the snapshots and stop the data movement - this may not be possible with all
-storage systems.
-
-### State progression
-
-![image](UploadFSM.png)
-### New
-When a backup request is initially created, it is in the "New" phase.  
-
-The next state is either "InProgress" or "FailedValidation"
-
-### FailedValidation
-If the backup request is incorrectly formed, it goes to the "FailedValidation" phase and terminates
-
-### InProgress
-When work on the backup begins, it moves to the "InProgress" phase.  It remains in the "InProgress"
-phase until all pre/post execution hooks have been executed, all snapshots have been taken and the
-Kubernetes metadata and backup info is safely written to the object store plug-in.
-
-In the current implementation, Restic backups will move data during the "InProgress" phase.
-In the future, it may be possible to combine a snapshot with a Restic (or equivalent) backup which
-would allow for data movement to be handled in the "Uploading" phase,
-
-The next phase is either "Completed", "Uploading", "Failed" or "PartiallyFailed".  Backups which 
-would have a final phase of "Completed" or "PartiallyFailed" may move to the "Uploading" state.
-A backup which will be marked "Failed" will go directly to
-the "Failed" phase.  Uploads may continue in the background for snapshots that were taken by a "Failed"
-backup, but no progress will not be monitored or updated.  When a "Failed" backup is deleted, all snapshots
-will be deleted and at that point any uploads still in progress should be aborted.
-
-### Uploading (new)
-The "Uploading" phase signifies that the main part of the backup, including snapshotting has completed successfully
-and and uploading is continuing.  In the event of an error during uploading, the phase will change to 
-UploadingPartialFailure.  On success, the phase changes to Completed.  The backup cannot be
-restored from when it is in the Uploading state.
-
-### UploadingPartialFailure (new)
-The "UploadingPartialFailure" phase signifies that the main part of the backup, including snapshotting has completed,
-but there were partial failures either during the main part or during the uploading.  The backup cannot be
-restored from when it is in the UploadingPartialFailure state.
-
-### Failed
-When a backup has had fatal errors it is marked as "Failed"  This backup cannot be restored from.
-
-### Completed
-The "Completed" phase signifies that the backup has completed, all data has been transferred to stable storage
-and the backup is ready to be used in a restore.  When the Completed phase has been reached it is safe
-to remove any of the items that were backed up.
-
-### PartiallyFailed
-The "PartiallyFailed" phase signifies that the backup has completed and at least part of the backup is usable.
-Restoration from a PartiallyFailed backup will not result in a complete restoration but pieces may be available.
-
-## Workflow
-
-When a BackupAction is executed, any SnapshotItemAction or VolumeSnapshot plugins will return snapshot IDs.
-The plugin should be able to provide status on
-the progress for the snapshot and handle cancellation of the upload if the snapshot is deleted.
-If the plugin is restarted, the snapshot ID should remain valid.
-
-When all snapshots have been taken and Kubernetes resources have been persisted to the ObjectStorePlugin
-the backup will either have fatal errors or will be at least partially usable.
-
-If the backup has fatal errors it will move to the "Failed" state and finish. If a backup fails, the upload will not be
-cancelled but it will not be monitored either.  For backups in any phase, all snapshots will be deleted when the backup
-is deleted.  Plugins will cancel any data movement and
-remove snapshots and other associated resources when the VolumeSnapshotter DeleteSnapshot method or 
-DeleteItemAction Execute method is called.
-
-Velero will poll the plugins for status on the snapshots when the backup exits the "InProgress" phase and
-has no fatal errors.
-
-If any snapshots are not complete, the backup will move to either Uploading or UploadingPartialFailure or Failed.
-
-Post-snapshot operations may take a long time and Velero and its plugins may be restarted during 
-this time.  Once a backup has moved into the Uploading or UploadingPartialFailure phase, another 
-backup may be started.
-
-While in the Uploading or UploadingPartialFailure phase, the snapshots and backup items will be periodically polled.
-When all of the snapshots and backup items have reported success, the backup will move to the Completed or 
-PartiallyFailed phase, depending on whether the backup was in the Uploading or UploadingPartialFailure phase.
-
-The Backup resources will not be written to object storage until the backup has entered a final phase: 
-Completed, Failed or PartialFailure
-## Reconciliation of InProgress backups
-
-InProgress backups will not have a `velero-backup.json` present in the object store.  During reconciliation, backups which
-do not have a `velero-backup.json` object in the object store will be ignored.
-
-## Plug-in API changes
-
-### UploadProgress struct
-
-    type UploadProgress struct {
-        completed bool                          // True when the operation has completed, either successfully or with a failure
-        err error                               // Set when the operation has failed
-        itemsCompleted, itemsToComplete int64   // The number of items that have been completed and the items to complete
-                                                // For a disk, an item would be a byte and itemsToComplete would be the
-                                                // total size to transfer (may be less than the size of a volume if
-                                                // performing an incremental) and itemsCompleted is the number of bytes
-                                                // transferred.  On successful completion, itemsCompleted and itemsToComplete
-                                                // should be the same
-        started, updated time.Time              // When the upload was started and when the last update was seen.  Not all
-                                                // systems retain when the upload was begun, return Time 0 (time.Unix(0, 0))
-                                                // if unknown.
-    }
-
-### VolumeSnapshotter changes
-
-A new method will be added to the VolumeSnapshotter interface (details depending on plug-in versioning spec)
-
-    UploadProgress(snapshotID string) (UploadProgress, error)
-
-UploadProgress will report the current status of a snapshot upload.  This should be callable at any time after the snapshot
-has been taken.  In the event a plug-in is restarted, if the snapshotID continues to be valid it should be possible to
-retrieve the progress.
-
-`error` is set if there is an issue retrieving progress.  If the snapshot is has encountered an error during the upload,
-the error should be return in UploadProgress and error should be nil.
-
-### SnapshotItemAction plug-in
-
-Currently CSI snapshots and the Velero Plug-in for vSphere are implemented as BackupItemAction plugins.  The majority of
-BackupItemAction plugins do not take snapshots or upload data so rather than modify BackupItemAction we introduce a new
-plug-ins, SnapshotItemAction.  SnapshotItemAction will be used in place of BackupItemAction for
-the CSI snapshots and the Velero Plug-in for vSphere and will return a snapshot ID in addition to the item itself.
-
-The SnapshotItemAction plugin identifier as well as the Item and Snapshot ID will be stored in the 
-`<backup-name>-itemsnapshots.json.gz`.  When checking for progress, this info will be used to select the appropriate
-SnapshotItemAction plugin to query for progress.
-
-_NotApplicable_ should only be returned if the SnapshotItemAction plugin should not be handling the item.  If the
-SnapshotItemAction plugin should handle the item but, for example, the item/snapshot ID cannot be found to report progress, a
-UploadProgress struct with the error set appropriately (in this case _NotFound_) should be returned.
-
-    // SnapshotItemAction is an actor that snapshots an individual item being backed up (it may also do other
-    operations on the item that is returned).
-    
-    type SnapshotItemAction interface {
-    	// AppliesTo returns information about which resources this action should be invoked for.
-    	// A BackupItemAction's Execute function will only be invoked on items that match the returned
-    	// selector. A zero-valued ResourceSelector matches all resources.
-    	AppliesTo() (ResourceSelector, error)
-    
-    	// Execute allows the ItemAction to perform arbitrary logic with the item being backed up,
-    	// including mutating the item itself prior to backup. The item (unmodified or modified)
-    	// should be returned, along with an optional slice of ResourceIdentifiers specifying
-    	// additional related items that should be backed up.
-    	Execute(item runtime.Unstructured, backup *api.Backup) (runtime.Unstructured, snapshotID string,
-    	    []ResourceIdentifier, error)
-    	
-    	// Progress  
-    	Progress(input *SnapshotItemProgressInput) (UploadProgress, error)
-    }
-    
-    // SnapshotItemProgressInput contains the input parameters for the SnapshotItemAction's Progress function.
-    type SnapshotItemProgressInput struct {
-    	// Item is the item that was stored in the backup
-    	Item runtime.Unstructured
-    	// SnapshotID is the snapshot ID returned by SnapshotItemAction
-    	SnapshotID string
-    	// Backup is the representation of the restore resource processed by Velero.
-    	Backup *velerov1api.Backup
-    }
-
-
-## Changes in Velero backup format
-
-No changes to the existing format are introduced by this change.  A `<backup-name>-itemsnapshots.json.gz` file will be 
-added that contains the items and snapshot IDs returned by ItemSnapshotAction.  Also, the creation of the 
-`velero-backup.json` object will not occur until the backup moves to one of the terminal phases (_Completed_, 
-_PartiallyFailed_, or _Failed_).  Reconciliation should ignore backups that do not have a `velero-backup.json` object.
-
-The cluster that is creating the backup will have the Backup resource present and will be able to manage the backup
-before the backup completes.
-
-If the Backup resource is removed (e.g. Velero is uninstalled) before a backup completes and writes its 
-`velero-backup.json` object, the other objects in the object store for the backup will be effectively orphaned.  This 
-can currently happen but the current window is much smaller.
-
-### `<backup-name>-itemsnapshots.json.gz`
-The itemsnapshots file is similar to the existing `<backup-name>-itemsnapshots.json.gz`  Each snapshot taken via
-SnapshotItemAction will have a JSON record in the file.  Exact format TBD.
-
-## CSI snapshots
-
-For systems such as EBS, a snapshot is not available until the storage system has transferred the snapshot to
-stable storage.  CSI snapshots expose the _readyToUse_ state that, in the case of EBS, indicates that the snapshot
-has been transferred to durable storage and is ready to be used.  The CSI BackupItemProgress.Progress method will
-poll that field and when completed, return completion.
-
-## vSphere plug-in
-
-The vSphere Plug-in for Velero uploads snapshots to S3 in the background.  This is also a BackupItemAction plug-in,
-it will check the status of the Upload records for the snapshot and return progress.
-
-## Backup workflow changes
-
-The backup workflow remains the same until we get to the point where the `velero-backup.json` object is written.
-At this point, we will queue the backup to a finalization go-routine.  The next backup may then begin.  The finalization
-routine will run across all of the volume snapshots and call the _UploadProgress_ method on each of them.  It will
-then run across all items and call _BackupItemProgress.Progress_ for any that match with a BackupItemProgress.
-
-If all snapshots and backup items have finished uploading (either successfully or failed), the backup will be completed
-and the backup will move to the appropriate terminal phase and upload the `velero-backup.json` object to the object store
-and the backup will be complete.
-
-If any of the snapshots or backup items are still being processed, the phase of the backup will be set to the appropriate
-phase (_Uploading_ or _UploadingPartialFailure_).  In the event of any of the upload progress checks return an error, the 
-phase will move to _UploadingPartialFailure_.  The backup will then be requeued and will be rechecked again after some 
-time has passed.
-
-## Restart workflow
-On restart, the Velero server will scan all Backup resources.  Any Backup resources which are in the _InProgress_ phase
-will be moved to the _Failed_ phase.  Any Backup resources in the _Oploading_ or _OploadingPartialFailure_ phase will
-be treated as if they have been requeued and progress checked and the backup will be requeued or moved to a terminal
-phase as appropriate.
-
-# Implementation tasks
-
-VolumeSnapshotter new plugin APIs  
-BackupItemProgress new plugin interface  
-New backup phases  
-Defer uploading `velero-backup.json`  
-AWS EBS plug-in UploadProgress implementation  
-Upload monitoring  
-Implementation of `<backup-name>-itemsnapshots.json.gz` file  
-Restart logic  
-Change in reconciliation logic to ignore backups that have not completed  
-CSI plug-in BackupItemProgress implementation  
-vSphere plug-in BackupItemProgress implementation (vSphere plug-in team)  
-
-# Future Fragile/Durable snapshot tracking
-Futures are here for reference, they may change radically when actually implemented.
-
-Some storage systems have the ability to provide different levels of protection for snapshots.  These are termed "Fragile"
-and "Durable".  Currently, Velero expects snapshots to be Durable (they should be able to survive the destruction of the
-cluster and the storage it is using).  In the future we would like the ability to take advantage of snapshots that are
-Fragile.  For example, vSphere snapshots are Fragile (they reside in the same datastore as the virtual disk).  The Velero
-Plug-in for vSphere uses a vSphere local/fragile snapshot to get a consistent snapshot, then uploads the data to S3 to
-make it Durable.  In the current design, upload progress will not be complete until the snapshot is ready to use and
-Durable.  It is possible, however, to restore data from a vSphere snapshot before it has been made Durable, and this is a
-capability we'd like to expose in the future.  Other storage systems implement this functionality as well.  We will be moving
-the control of the data movement from the vSphere plug-in into Velero.
-
-Some storage system, such as EBS, are only capable of creating Durable snapshots.  There is no usable intermediate Fragile stage.
-
-For a Velero backup, users should be able to specify whether they want a Durable backup or a Fragile backup (Fragile backups
-may consume less resources, be quicker to restore from and are suitable for things like backing up a cluster before upgrading
-software).  We can introduce three snapshot states - Creating, Fragile and Durable.  A snapshot would be created with a
-desired state, Fragile or Durable.  When the snapshot reaches the desired or higher state (e.g. request was for Fragile but
-snapshot went to Durable as on EBS), then the snapshot would be completed.

design/wait-for-additional-items.md

@@ -50,82 +50,54 @@ we still have a reference to the additional items (`GroupResource` and
 namespaced name), as well as a reference to the `RestoreItemAction`
 plugin which required it.
 
-At this point, if the `RestoreItemActionExecuteOutput`
-`WaitForAdditionalItems` field is set to `true` we need to call a func
-similar to `crdAvailable` which we will call `itemsAvailable`
+At this point, if the `RestoreItemActionExecuteOutput` includes a
+non-nil `AdditionalItemsReadyFunc` we need to call a func similar to
+`crdAvailable` which we will call `itemsAvailable`
 https://github.com/vmware-tanzu/velero/blob/main/pkg/restore/restore.go#L623
 This func should also be defined within restore.go
 
 Instead of the one minute CRD timeout, we'll use a timeout specific to
 waiting for additional items. There will be a new field added to
 serverConfig, `additionalItemsReadyTimeout`, with a
-`defaultAdditionalItemsReadyTimeout` const set to 10 minutes. In
-addition, each plugin will be able to define an override for the
-global server-level value, which will be added as another optional
-field in the `RestoreItemActionExecuteOutput` struct. Instead of the
-`IsUnstructuredCRDReady` call, we'll call `AreAdditionalItemsReady` on
-the plugin, passing in the same `AdditionalItems` slice as an argument
-(with items which failed to restore filtered out). If this func
-returns an error, then `itemsAvailable` will propagate the error, and
-`restoreItem` will handle it the same way it handles an error return
-on restoring an additional item. If the timeout is reached without
-ready returning true, velero will continue on to attempt restore of
-the current item.
-
-### `RestoreItemAction` plugin interface changes
-
-In order to implement the `AreAdditionalItemsReady` plugin func, a new
-function will be added to the `RestoreItemAction` interface.
-```
-type RestoreItemAction interface {
-        // AppliesTo returns information about which resources this action should be invoked for.
-        // A RestoreItemAction's Execute function will only be invoked on items that match the returned
-        // selector. A zero-valued ResourceSelector matches all resources.
-        AppliesTo() (ResourceSelector, error)
-
-        // Execute allows the ItemAction to perform arbitrary logic with the item being restored,
-        // including mutating the item itself prior to restore. The item (unmodified or modified)
-        // should be returned, along with an optional slice of ResourceIdentifiers specifying additional
-        // related items that should be restored, a warning (which will be logged but will not prevent
-        // the item from being restored) or error (which will be logged and will prevent the item
-        // from being restored) if applicable.
-        Execute(input *RestoreItemActionExecuteInput) (*RestoreItemActionExecuteOutput, error)
-
-	// AreAdditionalItemsReady allows the ItemAction to communicate whether the passed-in
-	// slice of AdditionalItems (previously returned by Execute())
-	// are ready. Returns true if all items are ready, and false
-	// otherwise. The second return value is an error string if an
-	// error occurred.
-	AreAdditionalItemsReady(restore *api.Restore, AdditionalItems []ResourceIdentifier) (bool, string)
-}
-```
+`defaultAdditionalItemsReadyTimeout` const set to 10 minutes. In addition,
+each plugin will be able to define an override for the global
+server-level value, which will be added as another optional field in
+the `RestoreItemActionExecuteOutput` struct. Instead of the
+`IsUnstructuredCRDReady` call, we'll call the returned
+`AdditionalItemsReadyFunc` passing in the same `AdditionalItems` slice
+as an argument (with items which failed to restore filtered out). If
+this func returns an error, then `itemsAvailable` will
+propagate the error, and `restoreItem` will handle it the same way it
+handles an error return on restoring an additional item. If the
+timeout is reached without ready returning true, velero will continue
+on to attempt restore of the current item.
 
 ### `RestoreItemActionExecuteOutput` changes
 
 Two new fields will be added to `RestoreItemActionExecuteOutput`, both
-optional. `AdditionalItemsReadyTimeout`, if non-zero, will override
-`serverConfig.additionalItemsReadyTimeout`. If
-`WaitForAdditionalItems` is true, then `restoreItem` will call
+optional. `AdditionalItemsReadyTimeout`, if specified, will override
+`serverConfig.additionalItemsReadyTimeout`. If the new func field
+`AdditionalItemsReadyFunc` is non-nil, then `restoreItem` will call
 `itemsAvailable` which will invoke the plugin func
-`AreAdditionalItemsReady` and wait until the func returns true or the
-timeout is reached. If `WaitForAdditionalItems` is false (the default
+`AdditionalItemsReadyFunc` and wait until the func returns true or the
+timeout is reached. If `AdditionalItemsReadyFunc` is nil (the default
 case), then current velero behavior will be followed. Existing plugins
 which do not need to signal to wait for `AdditionalItems` won't need
 to change their `Execute()` functions.
 
-In addition, a new func, `WithItemsWait()` will
+In addition, a new func, `WithItemsWait(readyFunc *func)` will
 be added to `RestoreItemActionExecuteOutput` similar to
-`WithoutRestore()` which will set `WaitForAdditionalItems` to
-true. This will allow a plugin to include waiting for
+`WithoutRestore()` which will set `AdditionalItemsReadyFunc` to
+`readyfunc`. This will allow a plugin to include waiting for
 AdditionalItems like this:
 ```
-func AreAdditionalItemsReady (restore *api.Restore, additionalItems []ResourceIdentifier) (bool, string) {
+func AreItemsReady (restore *api.Restore, additionalItems []ResourceIdentifier) (bool, error) {
 	...
-	return true, ""
+	return true, nil
 }
 func (p *RestorePlugin) Execute(input *velero.RestoreItemActionExecuteInput) (*velero.RestoreItemActionExecuteOutput, error) {
 	...
-	return velero.NewRestoreItemActionExecuteOutput(input.Item).WithItemsWait(), nil
+	return velero.NewRestoreItemActionExecuteOutput(input.Item).WithItemsWait(AreItemsReady), nil
 }
 
 ```
@@ -146,6 +118,68 @@ type RestoreItemActionExecuteOutput struct {
 	// value is true, AdditionalItems will be ignored.
 	SkipRestore bool
 
+	// AdditionalItemsReadyFunc is a func which returns true if
+	// the additionalItems passed into the func are
+	// ready/available. A nil value for this func means that
+	// velero will not wait for the items to be ready before
+	// attempting to restore the current item.
+	AdditionalItemsReadyFunc func(restore *api.Restore, []ResourceIdentifier) (bool, error)
+
+	// AdditionalItemsReadyTimeout will override serverConfig.additionalItemsReadyTimeout
+	// if specified. This value specifies how long velero will wait
+	// for additional items to be ready before moving on.
+	AdditionalItemsReadyTimeout *time.Duration
+}
+
+// WithoutRestore returns SkipRestore for RestoreItemActionExecuteOutput
+func (r *RestoreItemActionExecuteOutput) WithItemsWait(
+	readyFunc func(*api.Restore, []ResourceIdentifier)
+) *RestoreItemActionExecuteOutput {
+	r.AdditionalItemsReadyFunc = readyFunc
+	return r
+}
+
+```
+
+### Earlier iteration (no longer the current implementation plan)
+
+What follows is the first iteration of the design. Everything from
+here is superseded by the content above. The options below require
+either breaking backwards compatibility or dealing with runtime
+casting and optional interfaces. Adding the func pointer to
+`RestoreItemActionExecuteOutput` resolves the problem without
+requiring either.
+
+#### `RestoreItemActionExecuteOutput` changes
+
+A new boolean field will be added to
+`RestoreItemActionExecuteOutput`. If `WaitForAdditionalItems` is true,
+then `restoreItem` will call `itemsAvailable` which will invoke the
+plugin func `AreAdditionalItemsReady` and wait until the func returns
+true or the timeout is reached. If `WaitForAdditionalItems` is false
+(the default case), then current velero behavior will be
+followed. Existing plugins which do not need to signal to wait for
+`AdditionalItems` won't need to change their `Execute()` functions.
+
+In addition, a new func, `WithItemsWait()` will be added to
+`RestoreItemActionExecuteOutput` similar to `WithoutRestore()` which
+will set the `WaitForAdditionalItems` bool to `true`.
+
+```
+// RestoreItemActionExecuteOutput contains the output variables for the ItemAction's Execution function.
+type RestoreItemActionExecuteOutput struct {
+        // UpdatedItem is the item being restored mutated by ItemAction.
+        UpdatedItem runtime.Unstructured
+
+        // AdditionalItems is a list of additional related items that should
+        // be restored.
+        AdditionalItems []ResourceIdentifier
+
+        // SkipRestore tells velero to stop executing further actions
+        // on this item, and skip the restore step. When this field's
+        // value is true, AdditionalItems will be ignored.
+        SkipRestore bool
+
         // WaitForAdditionalItems determines whether velero will wait
 	// until AreAdditionalItemsReady returns true before restoring
 	// this item. If this field's value is true, then after restoring
@@ -153,55 +187,65 @@ type RestoreItemActionExecuteOutput struct {
 	// until AreAdditionalItemsReady returns true or the timeout is
         // reached. Otherwise, AreAdditionalItemsReady is not called.
         WaitForAdditionalItems bool
-
-	// AdditionalItemsReadyTimeout will override serverConfig.additionalItemsReadyTimeout
-	// if specified. This value specifies how long velero will wait
-	// for additional items to be ready before moving on.
-	AdditionalItemsReadyTimeout time.Duration
-}
-
-// WithItemsWait returns RestoreItemActionExecuteOutput with WaitForAdditionalItems set to true.
-func (r *RestoreItemActionExecuteOutput) WithItemsWait()
-) *RestoreItemActionExecuteOutput {
-	r.WaitForAdditionalItems = true
-	return r
-}
-
-```
-
-## New design iteration (Feb 2021)
-
-In starting the implementation based on the originally approved
-design, I've run into an unexpected snag. When adding the wait func
-pointer to the `RestoreItemActionExecuteOutput` struct, I had
-forgotten about the protocol buffer message format that's used for
-passing args to the plugin methods. Funcs are predefined RPC calls
-with autogenerated go code, so we can't just pass a regular golang
-func pointer in the struct. I've modified the above design to instead
-use an explicit `AreAdditionalItemsReady` func. Since this will break
-backwards compatibility with current `RestoreItemAction` plugins,
-implementation of this feature should wait until Velero plugin
-versioning, as described in
-https://github.com/vmware-tanzu/velero/issues/3285 is
-implemented. With plugin versioning in place, existing (non-versioned
-or 1.0-versioned) `RestoreItemAction` plugins which do not define
-`AreAdditionalItemsReady` would be able to coexist with a
-to-be-implemented `RestoreItemAction` plugin version 2.0 (or 1.1,
-etc.) which defines this new interface method. Without plugin
-versioning, implementing this feature would break all existing plugins
-until they define `AreAdditionalItemsReady`.
-
-Also note that when moving to the new plugin version, the vast
-majority of plugins will probably not need to wait for additional
-items. All they will need to do to react to this plugin interface
-change would be to define the following in the plugin:
-
-```
-func AreAdditionalItemsReady (restore *api.Restore, additionalItems []ResourceIdentifier) (bool, string) {
-	return true, ""
 }
 ```
 
-As long as they never set `WaitForAdditionalItems` to true, this
-function won't be called anyway, but if it is called, there will be no
-waiting, since it will always return true.
+#### `RestoreItemAction` plugin interface changes
+
+In order to implement the `AreAdditionalItemsReady` plugin func, there
+are two different approaches we could take.
+
+The first would be to simply add another entry to the
+`RestoreItemAction` interface:
+```
+type RestoreItemAction interface {
+        // AppliesTo returns information about which resources this action should be invoked for.
+        // A RestoreItemAction's Execute function will only be invoked on items that match the returned
+        // selector. A zero-valued ResourceSelector matches all resources.
+        AppliesTo() (ResourceSelector, error)
+
+        // Execute allows the ItemAction to perform arbitrary logic with the item being restored,
+        // including mutating the item itself prior to restore. The item (unmodified or modified)
+        // should be returned, along with an optional slice of ResourceIdentifiers specifying additional
+        // related items that should be restored, a warning (which will be logged but will not prevent
+        // the item from being restored) or error (which will be logged and will prevent the item
+        // from being restored) if applicable.
+        Execute(input *RestoreItemActionExecuteInput) (*RestoreItemActionExecuteOutput, error)
+
+	// AreAdditionalItemsReady allows the ItemAction to communicate whether the passed-in 
+	// slice of AdditionalItems (previously returned by Execute())
+	// are ready. Returns true if all items are ready, and false otherwise
+	AreAdditionalItemsReady(restore *api.Restore, AdditionalItems []ResourceIdentifier) (bool, error)
+}
+```
+
+The downside of this approach is that it is not backwards compatible,
+and every `RestoreItemAction` plugin will have to implement the new
+func, simply to return `true` in most cases, since the plugin will
+either never return `AdditionalItems` from Execute or not have any
+special readiness requirements.
+
+The alternative to this would be to define an additional interface for
+the optional func, leaving the `RestoreItemAction` interface alone.
+```
+type RestoreItemActionReadyCheck interface {
+	// AreAdditionalItemsReady allows the ItemAction to communicate whether the passed-in 
+	// slice of AdditionalItems (previously returned by Execute())
+	// are ready. Returns true if all items are ready, and false otherwise
+	AreAdditionalItemsReady(restore *api.Restore, AdditionalItems []ResourceIdentifier) (bool, error)
+}
+
+```
+In this case, existing plugins which do not need this functionality
+can remain as-is, while plugins which want to make use of this
+functionality will just need to implement the optional func. With the
+optional interface approach, `itemsAvailable` will only wait if the
+plugin can be type-asserted to the new interface:
+```
+	if actionWithReadyCheck, ok := action.(RestoreItemActionReadyCheck); ok {
+		// wait for ready/timeout
+	} else {
+		return true, nil
+	}
+```
+

go.mod

@@ -1,126 +1,51 @@
 module github.com/vmware-tanzu/velero
 
-go 1.17
+go 1.15
 
 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/go-autorest/autorest v0.11.21
-	github.com/Azure/go-autorest/autorest/azure/auth v0.5.8
+	github.com/Azure/azure-sdk-for-go v42.0.0+incompatible
+	github.com/Azure/go-autorest/autorest v0.9.6
+	github.com/Azure/go-autorest/autorest/azure/auth v0.4.2
 	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 v1.1.0
-	github.com/evanphx/json-patch v4.11.0+incompatible
-	github.com/fatih/color v1.13.0
+	github.com/docker/spdystream v0.0.0-20170912183627-bc6354cbbc29 // indirect
+	github.com/evanphx/json-patch v4.9.0+incompatible
+	github.com/fatih/color v1.10.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.6
-	github.com/google/uuid v1.2.0
-	github.com/hashicorp/go-hclog v0.14.1
-	github.com/hashicorp/go-plugin v1.4.3
+	github.com/golang/protobuf v1.4.2
+	github.com/google/uuid v1.1.2
+	github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd
+	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.16.0
+	github.com/kubernetes-csi/external-snapshotter/client/v4 v4.0.0
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.10.2
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.12.2
+	github.com/prometheus/client_golang v1.7.1
 	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.2.1
+	github.com/sirupsen/logrus v1.6.0
+	github.com/spf13/afero v1.2.2
+	github.com/spf13/cobra v1.1.1
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.7.0
-	github.com/vmware-tanzu/crash-diagnostics v0.3.7
-	golang.org/x/mod v0.4.2
-	golang.org/x/net v0.0.0-20210525063256-abc453219eb5
-	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	google.golang.org/api v0.56.0
-	google.golang.org/grpc v1.40.0
-	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
+	github.com/stretchr/testify v1.5.1
+	golang.org/x/mod v0.3.0
+	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
+	google.golang.org/genproto v0.0.0-20200731012542-8145dea6a485 // indirect
+	google.golang.org/grpc v1.31.0
+	google.golang.org/protobuf v1.25.0 // indirect
+	k8s.io/api v0.19.12
+	k8s.io/apiextensions-apiserver v0.19.12
+	k8s.io/apimachinery v0.19.12
+	k8s.io/cli-runtime v0.19.12
+	k8s.io/client-go v0.19.12
 	k8s.io/klog v1.0.0
+	k8s.io/klog/v2 v2.3.0 // indirect
 	k8s.io/kube-aggregator v0.19.12
-	sigs.k8s.io/controller-runtime v0.10.2
-	sigs.k8s.io/yaml v1.3.0
-)
-
-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/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/go-logr/logr v0.4.0 // indirect
-	github.com/go-logr/zapr v0.4.0 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/googleapis/gax-go/v2 v2.1.0 // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
-	github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // 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/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.32.1 // 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.0 // indirect
-	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
-	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
-	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71 // indirect
-	google.golang.org/protobuf v1.27.1 // 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.0-20210107192922-496545a6307b // indirect
-	k8s.io/component-base v0.22.2 // indirect
-	k8s.io/klog/v2 v2.9.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
-	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+	k8s.io/utils v0.0.0-20201005171033-6301aaf42dc7 // indirect
+	sigs.k8s.io/cluster-api v0.3.11-0.20210106212952-b6c1b5b3db3d
+	sigs.k8s.io/controller-runtime v0.7.1-0.20201215171748-096b2e07c091
 )
 
 replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2

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.17.13
+FROM golang:1.15
 
 ARG GOPROXY
 
@@ -24,19 +24,17 @@ 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 get 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)

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,24 +56,26 @@ elif [[ "$triggeredBy" == "tags" ]]; then
     TAG=$(echo $GITHUB_REF | cut -d / -f 3)
 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
@@ -85,7 +87,6 @@ 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."

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 )"
 
@@ -92,31 +89,18 @@ fi
 # Since we're past the validation of the VELERO_VERSION, parse the version's individual components.
 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
-# 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"
-    ON_RELEASE_BRANCH=TRUE
-fi
+[[ "$VELERO_PATCH" != 0 ]] && printf "*\t This is a patch release.\n"
 
-# $VELERO_PRERELEASE gets populated by the chk_version.go script that parses and verifies the given version format
-# If we've got a GA release, we assume the tag is on release branch.
+# $VELERO_PRERELEASE gets populated by the chk_version.go script that parses and verifies the given version format 
 # -n is "string is non-empty"
 [[ -n $VELERO_PRERELEASE ]] && printf "*\t This is a pre-release.\n"
 
 # -z is "string is empty"
-if [[ -z $VELERO_PRERELEASE ]]; then
-    printf "*\t This is a GA release.\n"
-    ON_RELEASE_BRANCH=TRUE
-fi
-
-if [[ "$ON_RELEASE_BRANCH" == "TRUE" ]]; then
-   release_branch_name=release-$VELERO_MAJOR.$VELERO_MINOR
-   printf "*\t The commit to tag is on branch: %s.  Please make sure this branch has been created.\n" $release_branch_name
-fi
+[[ -z $VELERO_PRERELEASE ]] && printf "*\t This is a GA release.\n"
 
 if [[ $publish == "TRUE" ]]; then
     echo "If this is all correct, press enter/return to proceed to TAG THE RELEASE and UPLOAD THE TAG TO GITHUB."
@@ -133,29 +117,55 @@ echo "Alright, let's go."
 echo "Pulling down all git tags and branches before doing any work."
 git fetch "$remote" --tags
 
-if [[ -n $release_branch_name ]]; then
-    # Tag on release branch
+# $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'll need to create a release branch for it.
+if [[ "$VELERO_PATCH" > 0 ]]; then
+    release_branch_name=release-$VELERO_MAJOR.$VELERO_MINOR
     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;})
-    if [[ -z $remote_branch ]]; then
-        echo "The branch $remote_release_branch_name must be created before you tag the release."
-        exit 1
-    fi
-    if [[ -z $local_branch ]]; then
+    local_branch=$(git branch | grep "$release_branch_name")
+    remote_branch=$(git branch -r | grep "$remote_release_branch_name")
+
+    if [[ -n $remote_branch ]]; then
+      if [[ -z $local_branch ]]; then
         # Remote branch exists, but does not exist locally. Checkout and track the remote branch.
         git checkout --track "$remote_release_branch_name"
-    else
+      else
         # Checkout the local release branch and ensure it is up to date with the remote
         git checkout "$release_branch_name"
         git pull --set-upstream "$remote" "$release_branch_name"
+      fi
+    else
+      if [[ -z $local_branch ]]; then
+        # Neither the remote or local release branch exists, create it
+        git checkout -b $release_branch_name
+      else
+        # The local branch exists so check it out.
+        git checkout $release_branch_name
+      fi
     fi
+
+    echo "Now you'll need to cherry-pick any relevant git commits into this release branch."
+    echo "Either pause this script with ctrl-z, or open a new terminal window and do the cherry-picking."
+    if [[ $publish == "TRUE" ]]; then
+        read -p "Press enter when you're done cherry-picking. THIS WILL MAKE A TAG PUSH THE BRANCH TO $remote"
+    else
+        read -p "Press enter when you're done cherry-picking."
+    fi
+
+    # TODO can/should we add a way to review the cherry-picked commits before the push?
+
+    if [[ $publish == "TRUE" ]]; then
+        echo "Pushing $release_branch_name to \"$remote\" remote"
+        git push --set-upstream "$remote" $release_branch_name
+    fi
+
     tag_and_push
 else
     echo "Checking out $remote/main."
     git checkout "$remote"/main
+
     tag_and_push
 fi
 

hack/test.sh

@@ -38,10 +38,5 @@ if [[ -n "${GOFLAGS:-}" ]]; then
   echo "GOFLAGS: ${GOFLAGS}"
 fi
 
-# After bumping up "sigs.k8s.io/controller-runtime" to v0.10.2, get the error "panic: mkdir /.cache/kubebuilder-envtest: permission denied"
-# when running this script with "make test" command. This is caused by that "make test" runs inside a container with user and group specified,
-# 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[@]}"
+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,7 @@ import (
 	"github.com/vmware-tanzu/velero/pkg/archive"
 	"github.com/vmware-tanzu/velero/pkg/discovery"
 	"github.com/vmware-tanzu/velero/pkg/plugin/velero"
+	"github.com/vmware-tanzu/velero/pkg/util/collections"
 	"github.com/vmware-tanzu/velero/pkg/util/filesystem"
 )
 
@@ -42,13 +41,14 @@ type Context struct {
 	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 +62,23 @@ 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 {
-		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 +88,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 +115,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 +135,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 {
+	velero.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 []velero.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)

internal/storage/storagelocation.go

@@ -53,7 +53,7 @@ func IsReadyToValidate(bslValidationFrequency *metav1.Duration, lastValidationTi
 	}
 
 	if validationFrequency < 0 {
-		log.Debugf("Validation period must be non-negative, changing from %d to %d", validationFrequency, serverValidationFrequency)
+		log.Debugf("Validation period must be non-negative, changing from %d to %d", validationFrequency, validationFrequency)
 		validationFrequency = serverValidationFrequency
 	}
 

pkg/apis/velero/v1/backup.go

@@ -20,14 +20,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-type Metadata struct {
-	Labels map[string]string `json:"labels,omitempty"`
-}
-
 // BackupSpec defines the specification for a Velero backup.
 type BackupSpec struct {
-	// +optional
-	Metadata `json:"metadata,omitempty"`
 	// IncludedNamespaces is a slice of namespace names to include objects
 	// from. If empty, all namespaces are included.
 	// +optional
@@ -59,15 +53,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 +95,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.
@@ -228,17 +207,6 @@ const (
 	// BackupPhaseInProgress means the backup is currently executing.
 	BackupPhaseInProgress BackupPhase = "InProgress"
 
-	// BackupPhaseUploading means the backups of Kubernetes resources
-	// and creation of snapshots was successful and snapshot data
-	// is currently uploading.  The backup is not usable yet.
-	BackupPhaseUploading BackupPhase = "Uploading"
-
-	// BackupPhaseUploadingPartialFailure means the backup of Kubernetes
-	// resources and creation of snapshots partially failed (final phase
-	// will be PartiallyFailed) and snapshot data is currently uploading.
-	// The backup is not usable yet.
-	BackupPhaseUploadingPartialFailure BackupPhase = "UploadingPartialFailure"
-
 	// BackupPhaseCompleted means the backup has run successfully without
 	// errors.
 	BackupPhaseCompleted BackupPhase = "Completed"
@@ -307,10 +275,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 +293,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.