Add missing files

.github/ISSUE_TEMPLATE/bug_report.md

@@ -5,18 +5,15 @@ about: Tell us about a problem you are experiencing
 ---
 
 **What steps did you take and what happened:**
-<!--A clear and concise description of what the bug is, and what commands you ran.-->
+[A clear and concise description of what the bug is, and what commands you ran.)
 
 
 **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>`
@@ -25,7 +22,7 @@ Please provide the output of the following commands (Pasting long output into a
 
 
 **Anything else you would like to add:**
-<!--Miscellaneous information that will assist in solving the issue.-->
+[Miscellaneous information that will assist in solving the issue.]
 
 
 **Environment:**

.github/ISSUE_TEMPLATE/feature-enhancement-request.md

@@ -5,15 +5,15 @@ about: Suggest an idea for this project
 ---
 
 **Describe the problem/challenge you have**
-<!--A description of the current limitation/problem/challenge that you are experiencing.-->
+[A description of the current limitation/problem/challenge that you are experiencing.]
 
 
 **Describe the solution you'd like**
-<!--A clear and concise description of what you want to happen.-->
+[A clear and concise description of what you want to happen.]
 
 
 **Anything else you would like to add:**
-<!--Miscellaneous information that will assist in solving the issue.-->
+[Miscellaneous information that will assist in solving the issue.]
 
 
 **Environment:**

.github/auto-assignees.yml

@@ -9,20 +9,15 @@ reviewers:
 
   groups:
     maintainers:
+      - zubron
+      - dsu-igeek
+      - jenting
       - sseago
       - reasonerjt
       - ywk253100
-      - blackpiglet
-      - qiuming-best
-      - shubham-pampattiwar
-      - Lyndon-Li
-      - anshulahuja98
 
     tech-writer:
-      - sseago
-      - reasonerjt
-      - ywk253100
-      - Lyndon-Li
+      - a-mccarthy
 
 files:
   'site/**':

.github/dependabot.yml

@@ -1,21 +0,0 @@
-version: 2
-updates:
-  # Dependencies listed in .github/workflows
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    labels:
-      - "Dependencies"
-      - "github_actions"
-      - "kind/changelog-not-required"
-  # Dependencies listed in go.mod
-  - package-ecosystem: "gomod"
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "weekly"
-    labels:
-      - "kind/changelog-not-required"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]

.github/labeler.yml

@@ -1,33 +0,0 @@
-# This file is used by Auto Label PRs action.
-# Works with https://github.com/actions/labeler/
-# Below this line, the keys are labels to be applied, and the values are the file globs to match against.
-# Anything in the `design` directory gets the `Design` label.
-Area/Design:
-  - changed-files:
-      - any-glob-to-any-file: design/*
-# Anything that has plugin infra will be labeled.
-# Individual plugins don't necessarily live here, though
-Area/Plugins:
-  - changed-files:
-      - any-glob-to-any-file: pkg/plugins/**/*
-Dependencies:
-  - changed-files:
-      - any-glob-to-any-file: go.mod
-Documentation:
-  - changed-files:
-      - any-glob-to-any-file: site/content/docs/**/*
-# Anything in the site directory gets the website label *EXCEPT* docs
-Website:
-  - all:
-      - changed-files:
-          - any-glob-to-any-file: site/**/*
-          - all-globs-to-all-files: '!site/content/docs/**/*'
-has-changelog:
-  - changed-files:
-      - any-glob-to-any-file: changelogs/**
-has-e2e-2tests:
-  - changed-files:
-      - any-glob-to-any-file: test/e2e/**/*
-has-unit-tests:
-  - changed-files:
-      - any-glob-to-any-file: pkg/**/*_test.go

.github/labels.yaml

@@ -1,43 +0,0 @@
-# This file is used by [prow github action](https://github.com/jpmcb/prow-github-actions/) in .github/workflows/prow-action.yml.
-# This file only has values for kind and area commands.
-area:
-  - CLI
-  - CSI
-  - Cloud/AWS
-  - Cloud/Azure
-  - Cloud/DigitalOcean
-  - Cloud/GCP
-  - Cloud/vSphere
-  - Design
-  - Documentation
-  - Filters
-  - Plugins
-  - Process
-  - Storage/Minio
-  - Storage/Cinder
-  - WindowsSupport
-  - datamover
-  - fs-backup
-  - fs-backup/deletion
-  - fs-backup/file-selectable
-  - fs-uploader
-  - kopia-integration
-  - migration
-  - multi-tenancy
-  - progress-monitoring
-  - resilience
-  - schedule
-  - storage/IBM-ObjectStorage
-  - upgrade
-  - volume-snapshot-dm
-kind:
-  - changelog-not-required
-  - question
-  - refactor
-  - requirement
-  - release-note
-  - release-blocker
-  - spike
-  - tech-debt
-  - usage-error
-  - voting

.github/labels.yml

@@ -0,0 +1,41 @@
+area:
+  - "Cloud/AWS"
+  - "Cloud/GCP"
+  - "Cloud/Azure"
+  - "Design"
+  - "Plugins"
+
+# Labels that can be applied to PRs with the /kind command
+kind:
+  - "changelog-not-required"
+  - "tech-debt"
+
+# Works with https://github.com/actions/labeler/
+# Below this line, the keys are labels to be applied, and the values are the file globs to match against.
+# Anything in the `design` directory gets the `Design` label.
+Area/Design:
+  - design/*
+
+# Anything in the site directory gets the website label *EXCEPT* docs
+Website:
+  - any: ["site/**/*", "!site/content/docs/**/*"]
+
+Documentation:
+  - site/content/docs/**/*
+
+Dependencies:
+  - go.mod
+
+# Anything that has plugin infra will be labeled.
+# Individual plugins don't necessarily live here, though
+Area/Plugins:
+  - "pkg/plugins/**/*"
+
+has-unit-tests:
+  - "pkg/**/*_test.go"
+
+has-e2e-2tests:
+  - "test/e2e/**/*"
+
+has-changelog:
+  - "changelogs/**"

.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

@@ -0,0 +1,38 @@
+# 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
+  - Enhancement/User
+  - kind/tech-debt
+  - Needs investigation
+  - 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

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set the author of a PR as the assignee
-        uses: kentaro-m/auto-assign-action@v2.0.0
+        uses: kentaro-m/auto-assign-action@v1.1.1
         with:
           configuration-path: ".github/auto-assignees.yml"
           repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/auto_label_prs.yml

@@ -13,7 +13,7 @@ jobs:
   triage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v5
+      - uses: actions/labeler@v3
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
-          configuration-path: .github/labeler.yml
+          configuration-path: .github/labels.yml

.github/workflows/auto_request_review.yml

@@ -11,7 +11,7 @@ jobs:
     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.13.0
+        uses: necojackarc/auto-request-review@v0.7.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           config: .github/auto-assignees.yml

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

@@ -12,14 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
-          go-version: '1.22.6'
+          go-version: 1.16
         id: go
       # Look for a CLI that's made for this PR
       - name: Fetch built CLI
         id: cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         env:
           cache-name: cache-velero-cli
         with:
@@ -31,7 +31,7 @@ jobs:
             velero-${{ github.event.pull_request.number }}-
 
       - name: Fetch cached go modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         if: steps.cache.outputs.cache-hit != 'true'
         with:
           path: ~/go/pkg/mod
@@ -40,7 +40,7 @@ jobs:
             ${{ runner.os }}-go-
 
       - name: Check out the code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         if: steps.cache.outputs.cache-hit != 'true'
 
       # If no binaries were built for this PR, build it now.
@@ -49,7 +49,7 @@ jobs:
         run: |
           make local
 
-  # Check the common CLI against all Kubernetes versions
+  # Check the common CLI against all kubernetes versions
   crd-check:
     needs: build-cli
     runs-on: ubuntu-latest
@@ -57,19 +57,20 @@ jobs:
       matrix:
         # Latest k8s versions. There's no series-based tag, nor is there a latest tag.
         k8s:
-          - 1.23.17
-          - 1.24.17
-          - 1.25.16
-          - 1.26.13
-          - 1.27.10
-          - 1.28.6
-          - 1.29.1
+          - 1.15.12
+          - 1.16.15
+          - 1.17.17
+          - 1.18.15
+          - 1.19.7
+          - 1.20.2
+          - 1.21.1
+          - 1.22.0
     # All steps run in parallel unless otherwise specified.
     # See https://docs.github.com/en/actions/learn-github-actions/managing-complex-workflows#creating-dependent-jobs
     steps:
       - name: Fetch built CLI
         id: cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         env:
           cache-name: cache-velero-cli
         with:
@@ -81,7 +82,7 @@ jobs:
             velero-${{ github.event.pull_request.number }}-
       - uses: engineerd/setup-kind@v0.5.0
         with:
-          version: "v0.21.0"
+          version: "v0.11.1"
           image: "kindest/node:v${{ matrix.k8s }}"
       - name: Install CRDs
         run: |

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

@@ -12,27 +12,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
-          go-version: '1.22.6'
+          go-version: 1.16
         id: go
       # Look for a CLI that's made for this PR
       - name: Fetch built CLI
         id: cli-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ./_output/bin/linux/amd64/velero
           # The cache key a combination of the current PR number and the commit SHA
           key: velero-cli-${{ github.event.pull_request.number }}-${{ github.sha }}
       - name: Fetch built image
         id: image-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ./velero.tar
           # The cache key a combination of the current PR number and the commit SHA
           key: velero-image-${{ github.event.pull_request.number }}-${{ github.sha }}
       - name: Fetch cached go modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         if: steps.cli-cache.outputs.cache-hit != 'true'
         with:
           path: ~/go/pkg/mod
@@ -40,7 +40,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
       - name: Check out the code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         if: steps.cli-cache.outputs.cache-hit != 'true' || steps.image-cache.outputs.cache-hit != 'true'
       # If no binaries were built for this PR, build it now.
       - name: Build Velero CLI
@@ -53,55 +53,47 @@ jobs:
         run: |
           IMAGE=velero VERSION=pr-test make container
           docker save velero:pr-test -o ./velero.tar
-  # Run E2E test against all Kubernetes versions on kind
+  # Run E2E test against all kubernetes versions on kind
   run-e2e-test:
     needs: build
     runs-on: ubuntu-latest
     strategy:
       matrix:
         k8s:
-          - 1.23.17
-          - 1.24.17
-          - 1.25.16
-          - 1.26.13
-          - 1.27.10
-          - 1.28.6
-          - 1.29.1
-        focus:
-          # tests to focus on, use `|` to concatenate multiple regexes to run on the same job
-          # ordered according to e2e_suite_test.go order
-          - Basic\]\[ClusterResource
-          - ResourceFiltering
-          - ResourceModifier|Backups|PrivilegesMgmt\]\[SSR
-          - Schedule\]\[OrderedResources
-          - NamespaceMapping\]\[Single\]\[Restic|NamespaceMapping\]\[Multiple\]\[Restic
-          - Basic\]\[Nodeport
-          - Basic\]\[StorageClass
+          # doesn't cover 1.15 as 1.15 doesn't support "apiextensions.k8s.io/v1" that is needed for the case
+          #- 1.15.12
+          - 1.16.15
+          - 1.17.17
+          - 1.18.15
+          - 1.19.7
+          - 1.20.2
+          - 1.21.1
+          - 1.22.0
       fail-fast: false
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
-          go-version: '1.22.6'
+          go-version: 1.16
         id: go
       - name: Check out the code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       - name: Install MinIO
         run:
           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.21.0"
+          version: "v0.11.1"
           image: "kindest/node:v${{ matrix.k8s }}"
       - name: Fetch built CLI
         id: cli-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ./_output/bin/linux/amd64/velero
           key: velero-cli-${{ github.event.pull_request.number }}-${{ github.sha }}
       - name: Fetch built Image
         id: image-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ./velero.tar
           key: velero-image-${{ github.event.pull_request.number }}-${{ github.sha }}
@@ -110,7 +102,7 @@ jobs:
           kind load image-archive velero.tar
       # always try to fetch the cached go modules as the e2e test needs it either
       - name: Fetch cached go modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -123,23 +115,10 @@ jobs:
           aws_access_key_id=minio
           aws_secret_access_key=minio123
           EOF
-
-          # Match kubectl version to k8s server version
-          curl -LO https://dl.k8s.io/release/v${{ matrix.k8s }}/bin/linux/amd64/kubectl
-          sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
-
           GOPATH=~/go CLOUD_PROVIDER=kind \
               OBJECT_STORE_PROVIDER=aws BSL_CONFIG=region=minio,s3ForcePathStyle="true",s3Url=http://$(hostname -i):9000 \
               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='${{ matrix.focus }}' VELERO_IMAGE=velero:pr-test \
-              GINKGO_SKIP='SKIP_KIND|pv-backup|Restic|Snapshot|LongTime' \
-              make -C test/ run-e2e
-        timeout-minutes: 30
-      - name: Upload debug bundle
-        if: ${{ failure() }}
-        uses: actions/upload-artifact@v4
-        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/milestoned-issues.yml

@@ -0,0 +1,18 @@
+name: Add issues with a milestone to the milestone's board
+
+on:
+  issues:
+    types: [milestoned]
+
+jobs:
+  automate-project-columns:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: alex-page/github-project-automation-plus@v0.3.0
+        with:
+          # Do NOT add PRs to the board, as that's duplication. Their corresponding issue should be on the board.
+          if: ${{ !github.event.issue.pull_request }}
+          project: "${{ github.event.issue.milestone.title }}"
+          column: "To Do"
+          repo-token: ${{ secrets.GH_TOKEN }}
+

.github/workflows/nightly-trivy-scan.yml

@@ -1,36 +0,0 @@
-name: Trivy Nightly Scan
-on:
-  schedule:
-    - cron: '0 2 * * *' # run at 2 AM UTC
-
-jobs:
-  nightly-scan:
-    name: Trivy nightly scan
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        # maintain the versions of Velero those need security scan
-        versions: [main]
-        # list of images that need scan
-        images: [velero, velero-restore-helper]
-    permissions:
-      security-events: write  # for github/codeql-action/upload-sarif to upload SARIF results
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'docker.io/velero/${{ matrix.images }}:${{ matrix.versions }}'
-          severity: 'CRITICAL,HIGH,MEDIUM'
-          format: 'template'
-          template: '@/contrib/sarif.tpl'
-          output: 'trivy-results.sarif'
-
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          sarif_file: 'trivy-results.sarif'

.github/workflows/opened-issues-triage.yml

@@ -0,0 +1,15 @@
+name: Move new issues into Triage
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  automate-project-columns:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: alex-page/github-project-automation-plus@v0.3.0
+        with:
+          project: "Velero Support Board"
+          column: "New"
+          repo-token: ${{ secrets.GH_TOKEN }}

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

@@ -1,9 +1,5 @@
 name: Pull Request Changelog Check
-# by setting `on: [pull_request]`, that means action will be trigger when PR is opened, synchronize, reopened.
-# Add labeled and unlabeled events too.
-on:
-  pull_request:
-    types: [opened, synchronize, reopened, labeled, unlabeled]
+on: [pull_request]
 jobs:
 
   build:
@@ -12,7 +8,7 @@ jobs:
     steps:
 
     - name: Check out the code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
 
     - name: Changelog check
       if: ${{ !(contains(github.event.pull_request.labels.*.name, 'kind/changelog-not-required') || contains(github.event.pull_request.labels.*.name, 'Design') || contains(github.event.pull_request.labels.*.name, 'Website') || contains(github.event.pull_request.labels.*.name, 'Documentation'))}}

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

@@ -4,18 +4,16 @@ jobs:
   build:
     name: Run CI
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v2
         with:
-          go-version: '1.22.6'
+          go-version: 1.16
         id: go
       - name: Check out the code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       - name: Fetch cached go modules
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -23,10 +21,3 @@ jobs:
             ${{ runner.os }}-go-
       - name: Make ci
         run: make ci
-      - name: Upload test coverage
-        uses: codecov/codecov-action@v4
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          files: coverage.out
-          verbose: true
-          fail_ci_if_error: true

.github/workflows/pr-codespell.yml

@@ -8,50 +8,13 @@ jobs:
     steps:
 
     - name: Check out the code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
 
     - name: Codespell
       uses: codespell-project/actions-codespell@master
       with:
         # ignore the config/.../crd.go file as it's generated binary data that is edited elswhere.
-        skip: .git,*.png,*.jpg,*.woff,*.ttf,*.gif,*.ico,./config/crd/v1beta1/crds/crds.go,./config/crd/v1/crds/crds.go,./config/crd/v2alpha1/crds/crds.go,./go.sum,./LICENSE
-        ignore_words_list: iam,aks,ist,bridget,ue,shouldnot,atleast,notin,sme
+        skip: .git,*.png,*.jpg,*.woff,*.ttf,*.gif,*.ico,./config/crd/v1beta1/crds/crds.go,./config/crd/v1/crds/crds.go
+        ignore_words_list: iam,aks,ist,bridget,ue
         check_filenames: true
         check_hidden: true
-
-    - name: Velero.io word list check
-      shell: bash {0}
-      run: |
-        IGNORE_COMMENT="Velero.io word list : ignore"
-        FILES_TO_CHECK=$(find . -type f \
-          ! -path "./.git/*" \
-          ! -path "./site/content/docs/v*" \
-          ! -path "./changelogs/CHANGELOG-*" \
-          ! -path "./.github/workflows/pr-codespell.yml" \
-          ! -path "./site/static/fonts/Metropolis/Open Font License.md" \
-          ! -regex '.*\.\(png\|jpg\|woff\|ttf\|gif\|ico\|svg\)'
-        )
-        function check_word_in_files() {
-            local word=$1
-
-            xargs grep -Iinr "$word" <<< "$FILES_TO_CHECK" | \
-            grep -v "$IGNORE_COMMENT" | \
-            grep -i --color=always "$word" && \
-            EXIT_STATUS=1
-        }
-        function check_word_case_sensitive_in_files() {
-            local word=$1
-
-            xargs grep -Inr "$word" <<< "$FILES_TO_CHECK" | \
-            grep -v "$IGNORE_COMMENT" | \
-            grep --color=always "$word" && \
-            EXIT_STATUS=1
-        }
-        EXIT_STATUS=0
-        check_word_case_sensitive_in_files ' kubernetes '
-        check_word_in_files 'on-premise\b'
-        check_word_in_files 'back-up'
-        check_word_in_files 'plug-in'
-        check_word_in_files 'whitelist'
-        check_word_in_files 'blacklist'
-        exit $EXIT_STATUS

.github/workflows/pr-containers.yml

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

.github/workflows/pr-goreleaser.yml

@@ -1,29 +0,0 @@
-name: Verify goreleaser change
-
-on:
-  pull_request:
-    branches:
-      - 'main'
-      - 'release-**'
-    paths:
-      - '.goreleaser.yml'
-      - 'hack/release-tools/goreleaser.sh'
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      name: Checkout
-
-    - name: Verify .goreleaser.yml and try a dryrun release.
-      if: github.repository == 'vmware-tanzu/velero'
-      run: |
-        CHANGELOG=$(ls changelogs | sort -V -r | head -n 1)
-        GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} \
-        REGISTRY=velero \
-        RELEASE_NOTES_FILE=changelogs/$CHANGELOG \
-        PUBLISH=false \
-        make release
-

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

@@ -6,15 +6,9 @@ jobs:
     name: Run Linter Check
     runs-on: ubuntu-latest
     steps:
-      - name: Check out the code
-        uses: actions/checkout@v4
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: 'go.mod'
-        id: go
-      - name: Linter check
-        uses: golangci/golangci-lint-action@v6
-        with:
-          version: v1.57.2
-          args: --verbose
+
+    - name: Check out the code
+      uses: actions/checkout@v2
+
+    - name: Linter check
+      run: make lint

.github/workflows/prow-action.yml

@@ -9,21 +9,12 @@ jobs:
   execute:
     runs-on: ubuntu-latest
     steps:
-      - uses: jpmcb/prow-github-actions@v1.1.3
+      - uses: jpmcb/prow-github-actions@v1.1.2
         with:
+          # Only support /kind command for now.
           # TODO: before allowing the /lgtm command, see if we can block merging if changelog labels are missing.
-          prow-commands: |
-            /approve
-            /area
-            /assign
-            /cc
-            /close
-            /hold
+          prow-commands: "/area
             /kind
-            /milestone
-            /retitle
-            /remove
-            /reopen
-            /uncc
-            /unassign
+            /cc
+            /uncc"
           github-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/push-builder.yml

@@ -12,16 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@v4
-      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:
       - '*'
 
@@ -16,88 +14,35 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v2
       with:
-        go-version: '1.22.6'
+        go-version: 1.16
       id: go
 
-    - uses: actions/checkout@v4
-
-    - id: 'auth'
-      uses: google-github-actions/auth@v2
-      with:
-        credentials_json: '${{ secrets.GCS_SA_KEY }}'
-
-    - name: 'set up GCloud SDK'
-      uses: google-github-actions/setup-gcloud@v2
-
-    - name: 'use gcloud CLI'
-      run: |
-        gcloud info
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
 
     - name: Set up QEMU
       id: qemu
-      uses: docker/setup-qemu-action@v3
+      uses: docker/setup-qemu-action@v1
       with:
         platforms: all
 
     - name: Set up Docker Buildx
       id: buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v1
       with:
         version: latest
 
     - name: Build
-      run: |
-        make local
-        # Clean go cache to ease the build environment storage pressure.
-        go clean -modcache -cache
+      run: make local
 
     - name: Test
       run: make test
 
-    - name: Upload test coverage
-      uses: codecov/codecov-action@v4
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        files: coverage.out
-        verbose: true
-
-    # Use the JSON key in secret to login gcr.io
-    - uses: 'docker/login-action@v3'
-      with:
-        registry: 'gcr.io' # or REGION.docker.pkg.dev
-        username: '_json_key'
-        password: '${{ secrets.GCR_SA_KEY }}'
-
     # 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: |
-        sudo swapoff -a
-        sudo rm -f /mnt/swapfile
-        docker system prune -a --force
-              
-        # Build and push Velero image to docker registry
         docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
-        VERSION=$(./hack/docker-push.sh | grep 'VERSION:' | awk -F: '{print $2}' | xargs)
-
-        # Upload Velero image package to GCS
-        source hack/ci/build_util.sh
-        BIN=velero
-        RESTORE_HELPER_BIN=velero-restore-helper
-        GCS_BUCKET=velero-builds
-        VELERO_IMAGE=${BIN}-${VERSION}
-        VELERO_RESTORE_HELPER_IMAGE=${RESTORE_HELPER_BIN}-${VERSION}
-        VELERO_IMAGE_FILE=${VELERO_IMAGE}.tar.gz
-        VELERO_RESTORE_HELPER_IMAGE_FILE=${VELERO_RESTORE_HELPER_IMAGE}.tar.gz
-        VELERO_IMAGE_BACKUP_FILE=${VELERO_IMAGE}-'build.'${GITHUB_RUN_NUMBER}.tar.gz
-        VELERO_RESTORE_HELPER_IMAGE_BACKUP_FILE=${VELERO_RESTORE_HELPER_IMAGE}-'build.'${GITHUB_RUN_NUMBER}.tar.gz
-
-        cp ${VELERO_IMAGE_FILE} ${VELERO_IMAGE_BACKUP_FILE}
-        cp ${VELERO_RESTORE_HELPER_IMAGE_FILE} ${VELERO_RESTORE_HELPER_IMAGE_BACKUP_FILE}
-
-        uploader ${VELERO_IMAGE_FILE} ${GCS_BUCKET}
-        uploader ${VELERO_RESTORE_HELPER_IMAGE_FILE} ${GCS_BUCKET}
-        uploader ${VELERO_IMAGE_BACKUP_FILE} ${GCS_BUCKET}
-        uploader ${VELERO_RESTORE_HELPER_IMAGE_BACKUP_FILE} ${GCS_BUCKET}
+        ./hack/docker-push.sh

.github/workflows/rebase.yml

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout the latest code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
       with:
         fetch-depth: 0
     - name: Automatic Rebase
-      uses: cirrus-actions/rebase@1.8
+      uses: cirrus-actions/rebase@1.3.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/stale-issues.yml

@@ -1,23 +1,24 @@
 name: "Close stale issues and PRs"
 on:
   schedule:
-    - cron: "30 1 * * *" # Every day at 1:30 UTC
+    # First of every month
+    - cron: "30 1 * * *"
 
 jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9.0.0
+      - uses: actions/stale@v3
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          stale-issue-message: "This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 14 days. If a Velero team member has requested log or more information, please provide the output of the shared commands."
-          close-issue-message: "This issue was closed because it has been stalled for 14 days with no activity."
-          days-before-issue-stale: 60
-          days-before-issue-close: 14
-          stale-issue-label: staled
+          stale-issue-message: "This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days. If a Velero team member has requested log or more information, please provide the output of the shared commands."
+          close-issue-message: "This issue was closed because it has been stalled for 5 days with no activity."
+          days-before-issue-stale: 30
+          days-before-issue-close: 5
           # Disable stale PRs for now; they can remain open.
           days-before-pr-stale: -1
           days-before-pr-close: -1
           # Only issues made after Feb 09 2021.
           start-date: "2021-09-02T00:00:00"
-          exempt-issue-labels: "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"
+          # Only make issues stale if they have these labels. Comma separated.
+          only-labels: "Needs info,Duplicate"

.gitignore

@@ -38,7 +38,6 @@ _testmain.go
 # Hugo compiled data
 site/public
 site/resources
-site/.hugo_build.lock
 
 .vs
 
@@ -47,10 +46,5 @@ _tiltbuild
 tilt-resources/tilt-settings.json
 tilt-resources/velero_v1_backupstoragelocation.yaml
 tilt-resources/deployment.yaml
-tilt-resources/node-agent.yaml
+tilt-resources/restic.yaml
 tilt-resources/cloud
-
-# test generated files
-test/e2e/report.xml
-coverage.out
-__debug_bin*

.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
@@ -46,9 +48,6 @@ archives:
     files:
       - LICENSE
       - examples/**/*
-    # Add the setting to resolve the DEPRECATED warning. Actually, Velero's case is not affected by the rlcp behavior change.
-    # https://github.com/orgs/goreleaser/discussions/3659#discussioncomment-4587257
-    rlcp: true 
 checksum:
   name_template: 'CHECKSUM'
 release:
@@ -57,10 +56,3 @@ release:
     name: velero
   draft: true
   prerelease: auto
-
-git:
-  # What should be used to sort tags when gathering the current and previous
-  # tags if there are more than one tag in the same commit.
-  #
-  # Default: `-version:refname`
-  tag_sort: -version:creatordate

ADOPTERS.md

@@ -3,7 +3,6 @@
 If you're using Velero and want to add your organization to this list, 
 [follow these directions][1]!
 
-<a href="https://www.pitsdatarecovery.net/" border="0" target="_blank"><img alt="pitsdatarecovery.net" src="site/static/img/adopters/PITSGlobalDataRecoveryServices.svg" height="50"></a>
 <a href="https://www.bitgo.com" border="0" target="_blank"><img alt="bitgo.com" src="site/static/img/adopters/BitGo.svg" height="50"></a>&nbsp; &nbsp; &nbsp;
 <a href="https://www.nirmata.com" border="0" target="_blank"><img alt="nirmata.com" src="site/static/img/adopters/nirmata.svg" height="50"></a>&nbsp; &nbsp; &nbsp;
 <a href="https://kyma-project.io/" border="0" target="_blank"><img alt="kyma-project.io" src="site/static/img/adopters/kyma.svg" height="50"></a>&nbsp; &nbsp; &nbsp;
@@ -15,18 +14,17 @@ If you're using Velero and want to add your organization to this list,
 <a href="https://sighup.io/" border="0" target="_blank"><img alt="sighup.io" src="site/static/img/adopters/sighup.svg" height="50"></a>&nbsp; &nbsp; &nbsp;
 <a href="https://mayadata.io/" border="0" target="_blank"><img alt="mayadata.io" src="site/static/img/adopters/mayadata.svg" height="50"></a>&nbsp; &nbsp; &nbsp;
 <a href="https://www.replicated.com/" border="0" target="_blank"><img alt="replicated.com" src="site/static/img/adopters/replicated-logo-red.svg" height="50"></a>
-<a href="https://cloudcasa.io/" border="0" target="_blank"><img alt="cloudcasa.io" src="site/static/img/adopters/cloudcasa.svg" height="50"></a>
-<a href="https://azure.microsoft.com/" border="0" target="_blank"><img alt="azure.com" src="site/static/img/adopters/azure.svg" height="50"></a>
+
 ## Success Stories
 
 Below is a list of adopters of Velero in **production environments** that have
 publicly shared the details of how they use it.
 
 **[BitGo][20]**  
-BitGo uses Velero backup and restore capabilities to seamlessly provision and scale fullnode statefulsets on the fly as well as having it serve an integral piece for our Kubernetes disaster-recovery story.
+BitGo uses Velero backup and restore capabilities to seamlessly provision and scale fullnode statefulsets on the fly as well as having it serve an integral piece for our kubernetes disaster-recovery story.
 
 **[Bugsnag][30]**  
-We use Velero for managing backups of an internal instance of our on-premise clustered solution. We also recommend our users of [on-premise Bugsnag installations](https://www.bugsnag.com/on-premise) use Velero for [managing their own backups](https://docs.bugsnag.com/on-premise/clustered/backup-restore/). <!-- Velero.io word list : ignore -->
+We use Velero for managing backups of an internal instance of our on-premise clustered solution. We also recommend our users of [on-premise Bugsnag installations][31] use Velero for [managing their own backups][32].
 
 **[Banzai Cloud][60]**  
 [Banzai Cloud Pipeline][61] is a Kubernetes-based microservices platform that integrates services needed for Day-1 and Day-2 operations along with first-class support both for on-prem and hybrid multi-cloud deployments. We use Velero to periodically [backup and restore these clusters in case of disasters][62].
@@ -42,9 +40,7 @@ We have integrated our [solution with Velero][11] to provide our customers with
 Kyma [integrates with Velero][41] to effortlessly back up and restore Kyma clusters with all its resources. Velero capabilities allow Kyma users to define and run manual and scheduled backups in order to successfully handle a disaster-recovery scenario.
 
 **[Red Hat][50]**  
-Red Hat has developed 2 operators for the OpenShift platform:
-- [Migration Toolkit for Containers][51] (Crane): This operator uses [Velero and Restic][52] to drive the migration of applications between OpenShift clusters.
-- [OADP (OpenShift API for Data Protection) Operator][53]: This operator sets up and installs Velero on the OpenShift platform, allowing users to backup and restore applications.
+Red Hat has developed the [Cluster Application Migration Tool][51] which uses [Velero and Restic][52] to drive the migration of applications between OpenShift clusters.
 
 **[Dell EMC][70]**  
 For Kubernetes environments, [PowerProtect Data Manager][71] leverages the Container Storage Interface (CSI) framework to take snapshots to back up the persistent data or the data that the application creates e.g. databases. [Dell EMC leverages Velero][72] to backup the namespace configuration files (also known as Namespace meta data) for enterprise grade data protection.
@@ -60,14 +56,8 @@ MayaData is a large user of Velero as well as a contributor. MayaData offers a D
 Okteto integrates Velero in [Okteto Cloud][94] and [Okteto Enterprise][95] to periodically backup and restore our clusters for disaster recovery. Velero is also a core software building block to provide namespace cloning capabilities, a feature that allows our users cloning staging environments into their personal development namespace for providing production-like development environments.
 
 **[Replicated][100]**<br>
-Replicated uses the Velero open source project to enable snapshots in [KOTS][101] to backup Kubernetes manifests & persistent volumes. In addition to the default functionality that Velero provides, [KOTS][101] provides a detailed interface in the [Admin Console][102] that can be used to manage the storage destination and schedule, and to perform and monitor the backup and restore process.<br>
-
-**[CloudCasa][103]**<br>
-[Catalogic Software][104] integrates Velero with [CloudCasa][103] - A Smart Home in the Cloud for Backups. CloudCasa is a full-featured, scalable, cloud-native solution providing Kubernetes data protection, disaster recovery, and migration as a service. An option to manage existing Velero instances and an enterprise self-hosted option are also available.<br>
-
-**[Microsoft Azure][105]**<br>
-[Azure Backup for AKS][106] is an Azure native, Kubernetes aware, Enterprise ready backup for containerized applications deployed on Azure Kubernetes Service (AKS). AKS Backup utilizes Velero to perform backup and restore operations to protect stateful applications in AKS clusters.<br>
-
+Replicated uses the Velero open source project to enable snapshots in [KOTS][101] to backup Kubernetes manifests & persistent volumes. In addition to the default functionality that Velero provides, [KOTS][101] provides a detailed interface in the [Admin Console][102] that can be used to manage the storage destination and schedule, and to perform and monitor the backup and restore process.
+​
 ## Adding your organization to the list of Velero Adopters
 
 If you are using Velero and would like to be included in the list of `Velero Adopters`, add an SVG version of your logo to the `site/static/img/adopters` directory in this repo and submit a [pull request][3] with your change. Name the image file something that reflects your company (e.g., if your company is called Acme, name the image acme.png). See this for an example [PR][4].
@@ -87,6 +77,8 @@ If you would like to add your logo to a future `Adopters of Velero` section on [
 [20]: https://bitgo.com
 
 [30]: https://bugsnag.com
+[31]: https://www.bugsnag.com/on-premise
+[32]: https://docs.bugsnag.com/on-premise/clustered/backup-restore/
 
 [40]: https://kyma-project.io
 [41]: https://kyma-project.io/docs/components/backup/#overview-overview
@@ -94,7 +86,6 @@ If you would like to add your logo to a future `Adopters of Velero` section on [
 [50]: https://redhat.com
 [51]: https://github.com/fusor/mig-operator
 [52]: https://github.com/fusor/mig-operator/blob/master/docs/usage/2.md
-[53]: https://github.com/openshift/oadp-operator
 
 [60]: https://banzaicloud.com
 [61]: https://banzaicloud.com/products/pipeline/
@@ -119,9 +110,3 @@ If you would like to add your logo to a future `Adopters of Velero` section on [
 [100]: https://www.replicated.com
 [101]: https://kots.io
 [102]: https://kots.io/kotsadm/snapshots/overview/
-
-[103]: https://cloudcasa.io/
-[104]: https://www.catalogicsoftware.com/
-
-[105]: https://azure.microsoft.com/
-[106]: https://learn.microsoft.com/azure/backup/backup-overview

CHANGELOG.md

@@ -1,14 +1,7 @@
 ## Current release:
-  * [CHANGELOG-1.14.md][24]
+  * [CHANGELOG-1.7.md][17]
 
 ## Older releases:
-  * [CHANGELOG-1.13.md][23]
-  * [CHANGELOG-1.12.md][22]
-  * [CHANGELOG-1.11.md][21]
-  * [CHANGELOG-1.10.md][20]
-  * [CHANGELOG-1.9.md][19]
-  * [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]
@@ -27,13 +20,6 @@
   * [CHANGELOG-0.3.md][1]
 
 
-[24]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.14.md
-[23]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.13.md
-[22]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.12.md
-[21]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.11.md
-[20]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.10.md
-[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

CODE_OF_CONDUCT.md

@@ -5,7 +5,7 @@
 We as members, contributors, and leaders pledge to make participation in the Velero project and our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socioeconomic status,
+identity and expression, level of experience, education, socio-economic status,
 nationality, personal appearance, race, religion, or sexual identity
 and orientation.
 

Dockerfile

@@ -11,72 +11,50 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-# Velero binary build section
-FROM --platform=$BUILDPLATFORM golang:1.22.6-bookworm as velero-builder
+FROM --platform=$BUILDPLATFORM golang:1.16 as builder-env
 
 ARG GOPROXY
-ARG BIN
 ARG PKG
 ARG VERSION
-ARG REGISTRY
 ARG GIT_SHA
 ARG GIT_TREE_STATE
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
+ARG REGISTRY
 
 ENV CGO_ENABLED=0 \
     GO111MODULE=on \
     GOPROXY=${GOPROXY} \
-    GOOS=${TARGETOS} \
-    GOARCH=${TARGETARCH} \
-    GOARM=${TARGETVARIANT} \
     LDFLAGS="-X ${PKG}/pkg/buildinfo.Version=${VERSION} -X ${PKG}/pkg/buildinfo.GitSHA=${GIT_SHA} -X ${PKG}/pkg/buildinfo.GitTreeState=${GIT_TREE_STATE} -X ${PKG}/pkg/buildinfo.ImageRegistry=${REGISTRY}"
 
 WORKDIR /go/src/github.com/vmware-tanzu/velero
 
 COPY . /go/src/github.com/vmware-tanzu/velero
 
-RUN mkdir -p /output/usr/bin && \
-    export GOARM=$( echo "${GOARM}" | cut -c2-) && \
-    go build -o /output/${BIN} \
-    -ldflags "${LDFLAGS}" ${PKG}/cmd/${BIN} && \
-    go build -o /output/velero-helper \
-    -ldflags "${LDFLAGS}" ${PKG}/cmd/velero-helper && \
-    go clean -modcache -cache
+RUN apt-get update && apt-get install -y bzip2
 
-# Restic binary build section
-FROM --platform=$BUILDPLATFORM golang:1.22.6-bookworm as restic-builder
+FROM --platform=$BUILDPLATFORM builder-env as builder
 
-ARG BIN
 ARG TARGETOS
 ARG TARGETARCH
 ARG TARGETVARIANT
+ARG PKG
+ARG BIN
 ARG RESTIC_VERSION
 
-ENV CGO_ENABLED=0 \
-    GO111MODULE=on \
-    GOPROXY=${GOPROXY} \
-    GOOS=${TARGETOS} \
+ENV GOOS=${TARGETOS} \
     GOARCH=${TARGETARCH} \
     GOARM=${TARGETVARIANT}
 
-COPY . /go/src/github.com/vmware-tanzu/velero
-
 RUN mkdir -p /output/usr/bin && \
-    export GOARM=$(echo "${GOARM}" | cut -c2-) && \
-    /go/src/github.com/vmware-tanzu/velero/hack/build-restic.sh && \
-    go clean -modcache -cache
+    bash ./hack/download-restic.sh && \
+    export GOARM=$( echo "${GOARM}" | cut -c2-) && \
+    go build -o /output/${BIN} \
+    -ldflags "${LDFLAGS}" ${PKG}/cmd/${BIN}
 
-# Velero image packing section
-FROM paketobuildpacks/run-jammy-tiny:0.2.46
+FROM gcr.io/distroless/base-debian10:nonroot
 
-LABEL maintainer="Xun Jiang <jxun@vmware.com>"
+LABEL maintainer="Nolan Brubaker <brubakern@vmware.com>"
 
-COPY --from=velero-builder /output /
+COPY --from=builder /output /
 
-COPY --from=restic-builder /output /
-
-USER cnb:cnb
+USER nonroot:nonroot
 

MAINTAINERS.md

@@ -4,16 +4,14 @@
 
 ## Maintainers
 
-| Maintainer          | GitHub ID                                                     | Affiliation                                      |
-|---------------------|---------------------------------------------------------------|--------------------------------------------------|
-| 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)        |
-| Yonghui Li          | [Lyndon-Li](https://github.com/Lyndon-Li)                     | [VMware](https://www.github.com/vmware/)         |
-| Anshul Ahuja        | [anshulahuja98](https://github.com/anshulahuja98)             | [Microsoft Azure](https://www.github.com/azure/) |
+| Maintainer | GitHub ID | Affiliation |
+| --------------- | --------- | ----------- |
+| Bridget McErlean | [zubron](https://github.com/zubron) | [VMware](https://www.github.com/vmware/) |
+| Dave Smith-Uchida | [dsu-igeek](https://github.com/dsu-igeek) | [VMware](https://www.github.com/vmware/) |
+| JenTing Hsiao | [jenting](https://github.com/jenting) | [SUSE](https://github.com/SUSE/)
+| Scott Seago | [sseago](https://github.com/sseago) | [OpenShift](https://github.com/openshift)
+| Daniel Jiang | [reasonerjt](https://github.com/reasonerjt) | [VMware](https://www.github.com/vmware/)
+| Wenkai Yin | [ywk253100](https://github.com/ywk253100) | [VMware](https://www.github.com/vmware/) |
 
 ## Emeritus Maintainers
 * Adnan Abdulhussein ([prydonius](https://github.com/prydonius))
@@ -23,17 +21,14 @@
 * 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))
-* Dave Smith-Uchida ([dsu-igeek](https://github.com/dsu-igeek))
-  
+
 ## Velero Contributors & Stakeholders
 
-| Feature Area           |                                         Lead                                         |
-|------------------------|:------------------------------------------------------------------------------------:|
-| Technical Lead         |               Daniel Jiang [reasonerjt](https://github.com/reasonerjt)               |
-| Kubernetes CSI Liaison |                                                                                      |
-| Deployment             |                                                                                      |
-| Community Management   |            Orlin Vasilev [OrlinVasilev](https://github.com/OrlinVasilev)             |
-| Product Management     | Pradeep Kumar Chaturvedi [pradeepkchaturvedi](https://github.com/pradeepkchaturvedi) |
-
+| Feature Area | Lead |
+| ----------------------------- | :---------------------: |
+| Architect | Dave Smith-Uchida (dsu-igeek) |
+| Technical Lead | Daniel Jiang (reasonerjt) |
+| Kubernetes CSI Liaison |  |
+| Deployment | JenTing Hsiao (jenting) |
+| Community Management | Jonas Rosland (jonasrosland) |
+| Product Management | Eleanor Millman (eleanor-millman) |

Makefile

@@ -22,11 +22,9 @@ PKG := github.com/vmware-tanzu/velero
 
 # Where to push the docker image.
 REGISTRY ?= velero
-GCR_REGISTRY ?= gcr.io/velero-gcp
 
 # Image name
 IMAGE ?= $(REGISTRY)/$(BIN)
-GCR_IMAGE ?= $(GCR_REGISTRY)/$(BIN)
 
 # We allow the Dockerfile to be configurable to enable the use of custom Dockerfiles
 # that pull base images from different registries.
@@ -68,23 +66,11 @@ TAG_LATEST ?= false
 
 ifeq ($(TAG_LATEST), true)
 	IMAGE_TAGS ?= $(IMAGE):$(VERSION) $(IMAGE):latest
-	GCR_IMAGE_TAGS ?= $(GCR_IMAGE):$(VERSION) $(GCR_IMAGE):latest
 else
 	IMAGE_TAGS ?= $(IMAGE):$(VERSION)
-	GCR_IMAGE_TAGS ?= $(GCR_IMAGE):$(VERSION)
 endif
 
-# check buildx is enabled only if docker is in path
-# macOS/Windows docker cli without Docker Desktop license: https://github.com/abiosoft/colima
-# To add buildx to docker cli: https://github.com/abiosoft/colima/discussions/273#discussioncomment-2684502
-ifeq ($(shell which docker 2>/dev/null 1>&2 && docker buildx inspect 2>/dev/null | awk '/Status/ { print $$2 }'), running)
-	BUILDX_ENABLED ?= true
-# if emulated docker cli from podman, assume enabled
-# emulated docker cli from podman: https://podman-desktop.io/docs/migrating-from-docker/emulating-docker-cli-with-podman
-# podman known issues:
-# - on remote podman, such as on macOS,
-#   --output issue: https://github.com/containers/podman/issues/15922
-else ifeq ($(shell which docker 2>/dev/null 1>&2 && cat $(shell which docker) | grep -c "exec podman"), 1)
+ifeq ($(shell docker buildx inspect 2>/dev/null | awk '/Status/ { print $$2 }'), running)
 	BUILDX_ENABLED ?= true
 else
 	BUILDX_ENABLED ?= false
@@ -96,9 +82,9 @@ see: https://velero.io/docs/main/build-from-source/#making-images-and-updating-v
 endef
 
 # The version of restic binary to be downloaded
-RESTIC_VERSION ?= 0.15.0
+RESTIC_VERSION ?= 0.12.1
 
-CLI_PLATFORMS ?= linux-amd64 linux-arm linux-arm64 darwin-amd64 darwin-arm64 windows-amd64 linux-ppc64le
+CLI_PLATFORMS ?= linux-amd64 linux-arm linux-arm64 darwin-amd64 windows-amd64 linux-ppc64le
 BUILDX_PLATFORMS ?= $(subst -,/,$(ARCH))
 BUILDX_OUTPUT_TYPE ?= docker
 
@@ -110,6 +96,9 @@ else
 	GIT_TREE_STATE ?= clean
 endif
 
+# The default linters used by lint and local-lint
+LINTERS ?= "gosec,goconst,gofmt,goimports,unparam"
+
 ###
 ### These variables should not need tweaking.
 ###
@@ -118,29 +107,26 @@ platform_temp = $(subst -, ,$(ARCH))
 GOOS = $(word 1, $(platform_temp))
 GOARCH = $(word 2, $(platform_temp))
 GOPROXY ?= https://proxy.golang.org
-GOBIN=$$(pwd)/.go/bin
 
 # If you want to build all binaries, see the 'all-build' rule.
 # If you want to build all containers, see the 'all-containers' rule.
 all:
 	@$(MAKE) build
-	@$(MAKE) build BIN=velero-restore-helper
+	@$(MAKE) build BIN=velero-restic-restore-helper
 
 build-%:
 	@$(MAKE) --no-print-directory ARCH=$* build
-	@$(MAKE) --no-print-directory ARCH=$* build BIN=velero-restore-helper
+	@$(MAKE) --no-print-directory ARCH=$* build BIN=velero-restic-restore-helper
 
 all-build: $(addprefix build-, $(CLI_PLATFORMS))
 
-all-containers:
+all-containers: container-builder-env
 	@$(MAKE) --no-print-directory container
-	@$(MAKE) --no-print-directory container BIN=velero-restore-helper
+	@$(MAKE) --no-print-directory container BIN=velero-restic-restore-helper
 
 local: build-dirs
-# Add DEBUG=1 to enable debug locally
 	GOOS=$(GOOS) \
 	GOARCH=$(GOARCH) \
-	GOBIN=$(GOBIN) \
 	VERSION=$(VERSION) \
 	REGISTRY=$(REGISTRY) \
 	PKG=$(PKG) \
@@ -157,7 +143,6 @@ _output/bin/$(GOOS)/$(GOARCH)/$(BIN): build-dirs
 	$(MAKE) shell CMD="-c '\
 		GOOS=$(GOOS) \
 		GOARCH=$(GOARCH) \
-		GOBIN=$(GOBIN) \
 		VERSION=$(VERSION) \
 		REGISTRY=$(REGISTRY) \
 		PKG=$(PKG) \
@@ -177,7 +162,6 @@ shell: build-dirs build-env
 	@# under $GOPATH).
 	@docker run \
 		-e GOFLAGS \
-		-e GOPROXY \
 		-i $(TTY) \
 		--rm \
 		-u $$(id -u):$$(id -g) \
@@ -192,6 +176,20 @@ shell: build-dirs build-env
 		$(BUILDER_IMAGE) \
 		/bin/sh $(CMD)
 
+container-builder-env:
+ifneq ($(BUILDX_ENABLED), true)
+	$(error $(BUILDX_ERROR))
+endif
+	@docker buildx build \
+	--target=builder-env \
+	--build-arg=GOPROXY=$(GOPROXY) \
+	--build-arg=PKG=$(PKG) \
+	--build-arg=VERSION=$(VERSION) \
+	--build-arg=GIT_SHA=$(GIT_SHA) \
+	--build-arg=GIT_TREE_STATE=$(GIT_TREE_STATE) \
+	--build-arg=REGISTRY=$(REGISTRY) \
+	-f $(VELERO_DOCKERFILE) .
+
 container:
 ifneq ($(BUILDX_ENABLED), true)
 	$(error $(BUILDX_ERROR))
@@ -200,8 +198,6 @@ endif
 	--output=type=$(BUILDX_OUTPUT_TYPE) \
 	--platform $(BUILDX_PLATFORMS) \
 	$(addprefix -t , $(IMAGE_TAGS)) \
-	$(addprefix -t , $(GCR_IMAGE_TAGS)) \
-	--build-arg=GOPROXY=$(GOPROXY) \
 	--build-arg=PKG=$(PKG) \
 	--build-arg=BIN=$(BIN) \
 	--build-arg=VERSION=$(VERSION) \
@@ -211,12 +207,6 @@ endif
 	--build-arg=RESTIC_VERSION=$(RESTIC_VERSION) \
 	-f $(VELERO_DOCKERFILE) .
 	@echo "container: $(IMAGE):$(VERSION)"
-ifeq ($(BUILDX_OUTPUT_TYPE)_$(REGISTRY), registry_velero)
-	docker pull $(IMAGE):$(VERSION)
-	rm -f $(BIN)-$(VERSION).tar
-	docker save $(IMAGE):$(VERSION) -o $(BIN)-$(VERSION).tar
-	gzip -f $(BIN)-$(VERSION).tar
-endif
 
 SKIP_TESTS ?=
 test: build-dirs
@@ -236,21 +226,27 @@ endif
 
 lint:
 ifneq ($(SKIP_TESTS), 1)
-	@$(MAKE) shell CMD="-c 'hack/lint.sh'"
+	@$(MAKE) shell CMD="-c 'hack/lint.sh $(LINTERS)'"
 endif
 
 local-lint:
 ifneq ($(SKIP_TESTS), 1)
-	@hack/lint.sh
+	@hack/lint.sh $(LINTERS)
+endif
+
+lint-all:
+ifneq ($(SKIP_TESTS), 1)
+	@$(MAKE) shell CMD="-c 'hack/lint.sh $(LINTERS) true'"
+endif
+
+local-lint-all:
+ifneq ($(SKIP_TESTS), 1)
+	@hack/lint.sh $(LINTERS) true
 endif
 
 update:
 	@$(MAKE) shell CMD="-c 'hack/update-all.sh'"
 
-# update-crd is for development purpose only, it is faster than update, so is a shortcut when you want to generate CRD changes only
-update-crd:
-	@$(MAKE) shell CMD="-c 'hack/update-3generated-crd-code.sh'"	
-
 build-dirs:
 	@mkdir -p _output/bin/$(GOOS)/$(GOARCH)
 	@mkdir -p .go/src/$(PKG) .go/pkg .go/bin .go/std/$(GOOS)/$(GOARCH) .go/go-build .go/golangci-lint
@@ -342,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
@@ -362,19 +358,12 @@ serve-docs: build-image-hugo
 	-v "$$(pwd)/site:/srv/hugo" \
 	-it -p 1313:1313 \
 	$(HUGO_IMAGE) \
-	server --bind=0.0.0.0 --enableGitInfo=false
-# gen-docs generates a new versioned docs directory under site/content/docs.
+	hugo server --bind=0.0.0.0 --enableGitInfo=false
+# 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/ run-e2e
-
-.PHONY: test-perf
-test-perf: local
-	$(MAKE) -e VERSION=$(VERSION) -C test/ run-perf
-
-go-generate:
-	go generate ./pkg/...
+	$(MAKE) -e VERSION=$(VERSION) -C test/e2e run

OWNERS

@@ -1,24 +0,0 @@
-# This file is used by the [PROW action](https://github.com/jpmcb/prow-github-actions) to approve and merge PRs.
-# The file's format follows the [OWNERS SPEC](https://www.kubernetes.dev/docs/guide/owners/#owners-spec).
-
-# List of usernames who may use /lgtm
-reviewers:
-- @Lyndon-Li
-- @anshulahuja98
-- @blackpiglet
-- @qiuming-best
-- @reasonerjt
-- @shubham-pampattiwar
-- @sseago
-- @ywk253100
-
-# List of usernames who may use /approve
-approvers:
-- @Lyndon-Li
-- @anshulahuja98
-- @blackpiglet
-- @qiuming-best
-- @reasonerjt
-- @shubham-pampattiwar
-- @sseago
-- @ywk253100

PROJECT

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

README.md

@@ -1,13 +1,11 @@
 ![100]
 
 [![Build Status][1]][2] [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3811/badge)](https://bestpractices.coreinfrastructure.org/projects/3811)
-![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/vmware-tanzu/velero)
+
 
 ## Overview
 
-Velero (formerly Heptio Ark) gives you tools to back up and restore your Kubernetes cluster resources and persistent volumes. You can run Velero with a public cloud platform or on-premises. 
-
-Velero lets you:
+Velero (formerly Heptio Ark) gives you tools to back up and restore your Kubernetes cluster resources and persistent volumes. You can run Velero with a public cloud platform or on-premises. Velero lets you:
 
 * Take backups of your cluster and restore in case of loss.
 * Migrate cluster resources to other clusters.
@@ -20,7 +18,7 @@ Velero consists of:
 
 ## Documentation
 
-[The documentation][29] provides a getting started guide and information about building from source, architecture, extending Velero and more.
+[The documentation][29] provides a getting started guide and information about building from source, architecture, extending Velero, and more.
 
 Please use the version selector at the top of the site to ensure you are using the appropriate documentation for your version of Velero.
 
@@ -36,26 +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.14           | 1.18-latest                               | 1.27.9, 1.28.9, and 1.29.4          |
-| 1.13           | 1.18-latest                               | 1.26.5, 1.27.3, 1.27.8, and 1.28.3  |
-| 1.12           | 1.18-latest                               | 1.25.7, 1.26.5, 1.26.7, and 1.27.3  |
-| 1.11           | 1.18-latest                               | 1.23.10, 1.24.9, 1.25.5, and 1.26.1 |
-| 1.10           | 1.18-latest                               | 1.22.5, 1.23.8, 1.24.6 and 1.25.1   |
-
-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 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.
-
-For each release, Velero maintainers run the test to ensure the upgrade path from n-2 minor release.  For example, before the release of v1.10.x, the test will verify that the backup created by v1.9.x and v1.8.x can be restored using the build to be tagged as v1.10.x.
-
 [1]: https://github.com/vmware-tanzu/velero/workflows/Main%20CI/badge.svg
 [2]: https://github.com/vmware-tanzu/velero/actions?query=workflow%3A"Main+CI"
 [4]: https://github.com/vmware-tanzu/velero/issues

ROADMAP.md

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

Tiltfile

@@ -7,19 +7,17 @@ k8s_yaml([
     'config/crd/v1/bases/velero.io_downloadrequests.yaml',
     'config/crd/v1/bases/velero.io_podvolumebackups.yaml',
     'config/crd/v1/bases/velero.io_podvolumerestores.yaml',
-    'config/crd/v1/bases/velero.io_backuprepositories.yaml',
+    'config/crd/v1/bases/velero.io_resticrepositories.yaml',
     'config/crd/v1/bases/velero.io_restores.yaml',
     'config/crd/v1/bases/velero.io_schedules.yaml',
     'config/crd/v1/bases/velero.io_serverstatusrequests.yaml',
     'config/crd/v1/bases/velero.io_volumesnapshotlocations.yaml',
-    'config/crd/v2alpha1/bases/velero.io_datauploads.yaml',
-    'config/crd/v2alpha1/bases/velero.io_datadownloads.yaml',    
 ])
 
 # default values
 settings = {
     "default_registry": "docker.io/velero",
-    "use_node_agent": False,
+    "enable_restic": False,
     "enable_debug": False,
     "debug_continue_on_start": True,  # Continue the velero process by default when in debug mode
     "create_backup_locations": False,
@@ -36,9 +34,9 @@ k8s_yaml(kustomize('tilt-resources'))
 k8s_yaml('tilt-resources/deployment.yaml')
 if settings.get("enable_debug"):
     k8s_resource('velero', port_forwards = '2345')
-    # TODO: Need to figure out how to apply port forwards for all node-agent pods
-if settings.get("use_node_agent"):
-    k8s_yaml('tilt-resources/node-agent.yaml')
+    # TODO: Need to figure out how to apply port forwards for all restic pods
+if settings.get("enable_restic"):
+    k8s_yaml('tilt-resources/restic.yaml')
 if settings.get("create_backup_locations"):
     k8s_yaml('tilt-resources/velero_v1_backupstoragelocation.yaml')
 if settings.get("setup-minio"):
@@ -52,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.22.6 as tilt-helper
+FROM golang:1.16.6 as tilt-helper
 
 # Support live reloading with Tilt
 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh  && \
@@ -62,9 +60,9 @@ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com
 
 additional_docker_helper_commands = """
 # Install delve to allow debugging
-RUN go install github.com/go-delve/delve/cmd/dlv@latest
+RUN go get github.com/go-delve/delve/cmd/dlv
 
-RUN wget -qO- https://dl.k8s.io/v1.25.2/kubernetes-client-linux-amd64.tar.gz | tar xvz
+RUN wget -qO- https://dl.k8s.io/v1.19.2/kubernetes-client-linux-amd64.tar.gz | tar xvz
 RUN wget -qO- https://get.docker.com | sh
 """
 
@@ -105,12 +103,12 @@ local_resource(
 
 local_resource(
     "restic_binary",
-    cmd = 'cd ' + '.' + ';mkdir -p _tiltbuild/restic; BIN=velero GOOS=linux GOARCH=amd64 GOARM="" RESTIC_VERSION=0.13.1 OUTPUT_DIR=_tiltbuild/restic ./hack/build-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
 tilt_dockerfile_header = """
-FROM ubuntu:22.04 as tilt
+FROM ubuntu:focal as tilt
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y ca-certificates tzdata && rm -rf /var/lib/apt/lists/*
 
@@ -218,7 +216,7 @@ def enable_provider(provider):
 
     # Note: we need a distro with a shell to do a copy of the plugin binary
     tilt_dockerfile_header = """
-    FROM ubuntu:22.04 as tilt
+    FROM ubuntu:focal as tilt
     WORKDIR /
     COPY --from=tilt-helper /start.sh .
     COPY --from=tilt-helper /restart.sh .

assets/README.md

@@ -1,6 +1,6 @@
 # Velero Assets
 
-This folder contains logo images for Velero in gray (for light backgrounds) and white (for dark backgrounds like black t-shirts or dark mode!) – horizontal and stacked… in .eps and .svg.
+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
 

changelogs/CHANGELOG-0.9.md

@@ -154,7 +154,7 @@
   * Skip completed jobs and pods when restoring (#463, @nrb)
   * Set namespace correctly when syncing backups from object storage (#472, @skriss)
   * When building on macOS, bind-mount volumes with delegated config (#478, @skriss)
-  * Add replica sets and daemonsets to cohabiting resources so they're not backed up twice (#482 #485, @skriss)
+  * Add replica sets and daemonsets to cohabitating resources so they're not backed up twice (#482 #485, @skriss)
   * Shut down the Ark server gracefully on SIGINT/SIGTERM (#483, @skriss)
   * Only back up resources that support GET and DELETE in addition to LIST and CREATE (#486, @nrb)
   * Show a better error message when trying to get an incomplete restore's logs (#496, @nrb)

changelogs/CHANGELOG-1.10.md

@@ -1,190 +0,0 @@
-  ## v1.10.0
-### 2022-11-23
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.10.0
-
-### Container Image
-`velero/velero:v1.10.0`
-
-### Documentation
-https://velero.io/docs/v1.10/
-
-### Upgrading
-https://velero.io/docs/v1.10/upgrade-to-1.10/
-
-### Highlights
-
-#### Unified Repository and Kopia integration
-In this release, we introduced the Unified Repository architecture to build a data path where data movers and the backup repository are decoupled and a unified backup repository could serve various data movement activities.
-
-In this release, we also deeply integrate Velero with Kopia, specifically, Kopia's uploader modules are isolated as a generic file system uploader; Kopia's repository modules are encapsulated as the unified backup repository.
-
-For more information, refer to the [design document](https://github.com/vmware-tanzu/velero/blob/v1.10.0/design/unified-repo-and-kopia-integration/unified-repo-and-kopia-integration.md).
-
-#### File system backup refactor
-Velero's file system backup (a.k.s. pod volume backup or formerly restic backup) is refactored as the first user of the Unified Repository architecture. Specifically, we added a new path, the Kopia path, besides the existing Restic path. While Restic path is still available and set as default, you can opt in Kopia path by specifying the `uploader-type` parameter at installation time. Meanwhile, you are free to restore from existing backups under either path, Velero dynamically switches to the correct path to process the restore.
-
-Because of the new path, we renamed some modules and parameters, refer to the Break Changes section for more details.
-
-For more information, visit the [file system backup document](https://velero.io/docs/v1.10/file-system-backup/) and [v1.10 upgrade guide document](https://velero.io/docs/v1.10/upgrade-to-1.10/).
-
-Meanwhile, we've created a performance guide for both Restic path and Kopia path, which helps you to choose between the two paths and provides you the best practice to configure them under different scenarios. Please note that the results in the guide are based on our testing environments, you may get different results when testing in your own ones. For more information, visit the [performance guide document](https://velero.io/docs/v1.10/performance-guidance/).
-
-#### Plugin versioning V1 refactor
-In this release, Velero moves plugins BackupItemAction, RestoreItemAction and VolumeSnapshotterAction to version v1, this allows future plugin changes that do not support backward compatibility, so is a preparation for various complex tasks, for example, data movement tasks.
-For more information, refer to the [plugin versioning design document](https://github.com/vmware-tanzu/velero/blob/v1.10.0/design/plugin-versioning.md).
-
-#### 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.
-
-#### Add credentials to volume snapshot locations
-In this release, we enabled dedicate credentials options to volume snapshot locations so that you can specify credentials per volume snapshot location as same as backup storage location.
-
-For more information, please visit the [locations document](https://velero.io/docs/v1.10/locations/).
-
-#### CSI snapshot enhancements
-In this release we added several changes to enhance the robustness of CSI snapshot procedures, for example, some protection code for error handling, and a mechanism to skip exclusion checks so that CSI snapshot works with various backup resource filters.
-
-#### Backup schedule pause/unpause
-In this release, Velero supports to pause/unpause a backup schedule during or after its creation. Specifically:
-
-At creation time, you can specify `–paused` flag to `velero schedule create` command, if so, you will create a paused schedule that will not run until it is unpaused
-After creation, you can run `velero schedule pause` or `velero schedule unpause` command to pause/unpause a schedule
-
-#### Runtime and dependencies
-In order to fix CVEs, we changed Velero's runtime and dependencies as follows:
-
-Bump go runtime to v1.18.8
-Bump some core dependent libraries to newer versions
-Compile Restic (v0.13.1) with go 1.18.8 instead of packaging the official binary
-
-
-#### Breaking changes
-Due to file system backup refactor, below modules and parameters name have been changed in this release:
-
-`restic` daemonset is renamed to `node-agent`
-`resticRepository` CR is renamed to `backupRepository`
-`velero restic repo` command is renamed to `velero repo`
-`velero-restic-credentials` secret is renamed to `velero-repo-credentials`
-`default-volumes-to-restic` parameter is renamed to `default-volumes-to-fs-backup`
-`restic-timeout` parameter is renamed to `fs-backup-timeout`
-`default-restic-prune-frequency` parameter is renamed to `default-repo-maintain-frequency`
-
-#### Upgrade
-Due to the major changes of file system backup, the old upgrade steps are not suitable any more. For the new upgrade steps, visit [v1.10 upgrade guide document](https://velero.io/docs/v1.10/upgrade-to-1.10/).
-
-#### Limitations/Known issues
-In this release, Kopia backup repository (so the Kopia path of file system backup) doesn't support self signed certificate for S3 compatible storage. To track this problem, refer to this [Velero issue](https://github.com/vmware-tanzu/velero/issues/5123) or [Kopia issue](https://github.com/kopia/kopia/issues/1443). 
-
-Due to the code change in Velero, there will be some code change required in vSphere plugin, without which the functionality may be impacted.  Therefore, if you are using vSphere plugin in your workflow, please hold the upgrade until the issue [#485](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/issues/485) is fixed in vSphere plugin.
-
-### All changes
-  
-  * Restore ClusterBootstrap before Cluster otherwise a new default ClusterBootstrap object is create for the cluster  (#5616, @ywk253100)
-  * Add compile restic binary for CVE fix  (#5574, @qiuming-best)
-  * Fix controller problematic log output  (#5572, @qiuming-best)
-  * Enhance the restore priorities list to support specifying the low prioritized resources that need to be restored in the last (#5535, @ywk253100)
-  * fix restic backup progress error (#5534, @qiuming-best)
-  * fix restic backup failure with self-signed certification backend storage (#5526, @qiuming-best)
-  * Add credential store in backup deletion controller to support VSL credential. (#5521, @blackpiglet)
-  * Fix issue 5505: the pod volume backups/restores except the first one fail under the kopia path if "AZURE_CLOUD_NAME" is specified (#5512, @Lyndon-Li)
-  * After Pod Volume Backup/Restore refactor, remove all the unreasonable appearance of "restic" word from documents (#5499, @Lyndon-Li)
-  * Refactor Pod Volume Backup/Restore doc to match the new behavior (#5484, @Lyndon-Li)
-  * Remove redundancy code block left by #5388. (#5483, @blackpiglet)
-  * Issue fix 5477: create the common way to support S3 compatible object storages that work for both Restic and Kopia; Keep the resticRepoPrefix parameter for compatibility (#5478, @Lyndon-Li)
-  * Update the k8s.io dependencies to 0.24.0.
-This also required an update to github.com/bombsimon/logrusr/v3.
-Removed the `WithClusterName` method
-as it is a "legacy field that was
-always cleared by the system and never used" as per upstream k8s
-https://github.com/kubernetes/apimachinery/blob/release-1.24/pkg/apis/meta/v1/types.go#L257-L259 (#5471, @kcboyle)
-  * Add v1.10 velero upgrade doc (#5468, @qiuming-best)
-  * Upgrade velero docker image to use go 1.18 and upgrade golangci-lint to 1.45.0 (#5459, @Lyndon-Li)
-  * Add VolumeSnapshot client back. (#5449, @blackpiglet)
-  * Change subcommand `velero restic repo` to `velero repo` (#5446, @allenxu404)
-  * Remove irrational "Restic" names in Velero code after the PVBR refactor (#5444, @Lyndon-Li)
-  * moved RIA execute input/output structs back to velero package (#5441, @sseago)
-  * Rename Velero pod volume restore init helper from "velero-restic-restore-helper" to "velero-restore-helper" (#5432, @Lyndon-Li)
-  * Skip the exclusion check for additional resources returned by BIA (#5429, @reasonerjt)
-  * Change B/R describe CLI to support Kopia (#5412, @allenxu404)
-  * Add nil check before execution of csi snapshot delete (#5401, @shubham-pampattiwar)
-  * update velero using klog to version v2.9.0 (#5396, @blackpiglet)
-  * Fix Test_prepareBackupRequest_BackupStorageLocation UT failure. (#5394, @blackpiglet)
-  * Rename Velero daemonset from "restic" to "node-agent" (#5390, @Lyndon-Li)
-  * Add some corner cases checking for CSI snapshot in backup controller. (#5388, @blackpiglet)
-  * Fix issue 5386: Velero providers a full URL as the S3Url while the underlying minio client only accept the host part of the URL as the endpoint and the schema should be specified separately. (#5387, @Lyndon-Li)
-  * Fix restore error with flag namespace-mappings (#5377, @qiuming-best)
-  * Pod Volume Backup/Restore Refactor: Rename parameters in CRDs and commands to remove "Restic" word (#5370, @Lyndon-Li)
-  * Added backupController's UT to test the prepareBackupRequest() method BackupStorageLocation processing logic (#5362, @niulechuan)
-  * Fix a repoEnsurer problem introduced by the refactor - The repoEnsurer didn't check "" state of BackupRepository, as a result, the function GetBackupRepository always returns without an error even though the ensreReady is specified. (#5359, @Lyndon-Li)
-  * Add E2E test for schedule backup (#5355, @danfengliu)
-  * Add useOwnerReferencesInBackup field doc for schedule. (#5353, @cleverhu)
-  * Clarify the help message for the default value of parameter --snapshot-volumes, when it's not set. (#5350, @blackpiglet)
-  * Fix restore cmd extraflag overwrite bug (#5347, @qiuming-best)
-  * Resolve gopkg.in/yaml.v3 vulnerabilities by upgrading gopkg.in/yaml.v3 to v3.0.1 (#5344, @kaovilai)
-  * Increase ensure restic repository timeout to 5m (#5335, @shubham-pampattiwar)
-  * Add opt-in and opt-out PersistentVolume backup to E2E tests (#5331, @danfengliu)
-  * Cancel downloadRequest when timeout without downloadURL (#5329, @kaovilai)
-  * Fix PVB finds wrong parent snapshot (#5322, @qiuming-best)
-  * Fix issue 4874 and 4752: check the daemonset pod is running in the node where the workload pod resides before running the PVB for the pod (#5319, @Lyndon-Li)
-  * plugin versioning v1 refactor for VolumeSnapshotter (#5318, @sseago)
-  * Change the status of restore to completed from partially failed when restore empty backup (#5314, @allenxu404)
-  * RestoreItemAction v1 refactoring for plugin api versioning (#5312, @sseago)
-  * Refactor the repoEnsurer code to use controller runtime client and wrap some common BackupRepository operations to share with other modules (#5308, @Lyndon-Li)
-  * Remove snapshot related lister, informer and client from backup controller. (#5299, @jxun)
-  * Remove github.com/apex/log logger. (#5297, @blackpiglet)
-  * change CSISnapshotTimeout from pointer to normal variables. (#5294, @cleverhu)
-  * Optimize code for restore exists resources. (#5293, @cleverhu)
-  * Add more detailed comments for labels columns. (#5291, @cleverhu)
-  * Add backup status checking in schedule controller. (#5283, @blackpiglet)
-  * Add changes for problems/enhancements found during smoking test for Kopia pod volume backup/restore (#5282, @Lyndon-Li)
-  * Support pause/unpause schedules (#5279, @ywk253100)
-  *  plugin/clientmgmt refactoring for BackupItemAction v1 (#5271, @sseago)
-  * Don't move velero v1 plugins to new proto dir (#5263, @sseago)
-  * Fill gaps for Kopia path of PVBR: integrate Repo Manager with Unified Repo; pass UploaderType to PVBR backupper and restorer; pass RepositoryType to BackupRepository controller and Repo Ensurer (#5259, @Lyndon-Li)
-  * Add csiSnapshotTimeout for describe backup (#5252, @cleverhu)
-  * equip gc controller with configurable frequency (#5248, @allenxu404)
-  * Fix nil pointer panic when restoring StatefulSets (#5247, @divolgin)
-  * Controller refactor code modifications. (#5241, @jxun)
-  * Fix edge cases for already exists resources (#5239, @shubham-pampattiwar)
-  * Check for empty ns list before checking nslist[0] (#5236, @sseago)
-  * Remove reference to non-existent doc (#5234, @reasonerjt)
-  * Add changes for Kopia Integration: Kopia Lib - method implementation. Add changes to write Kopia Repository logs to Velero log (#5233, @Lyndon-Li)
-  * Add changes for Kopia Integration: Kopia Lib - initialize Kopia repo (#5231, @Lyndon-Li)
-  * Uploader Implementation: Kopia backup and restore (#5221, @qiuming-best)
-  * Migrate backup sync controller from code-generator to kubebuilder. (#5218, @jxun)
-  * check vsc null pointer (#5217, @lilongfeng0902)
-  * Refactor GCController with kubebuilder (#5215, @allenxu404)
-  * Uploader Implementation: Restic backup and restore (#5214, @qiuming-best)
-  * Add parameter "uploader-type" to velero server (#5212, @reasonerjt)
-  * Add annotation "pv.kubernetes.io/migrated-to" for CSI checking. (#5181, @jxun)
-  * Add changes for Kopia Integration: Unified Repository Provider - method implementation (#5179, @Lyndon-Li)
-  * Treat namespaces with exclude label as excludedNamespaces
-Related issue: #2413 (#5178, @allenxu404)
-  * Reduce CRD size. (#5174, @jxun)
-  * Fix restic backups to multiple backup storage locations bug (#5172, @qiuming-best)
-  * Add changes for Kopia Integration: Unified Repository Provider - Repo Password (#5167, @Lyndon-Li)
-  * Skip registering "crd-remap-version" plugin when feature flag "EnableAPIGroupVersions" is set (#5165, @reasonerjt)
-  * Kopia uploader integration on shim progress uploader module (#5163, @qiuming-best)
-  * Add labeled and unlabeled events for PR changelog check action. (#5157, @jxun)
-  * VolumeSnapshotLocation refactor with kubebuilder. (#5148, @jxun)
-  * Delay CA file deletion in PVB controller. (#5145, @jxun)
-  * This commit splits the pkg/restic package into several packages to support Kopia integration works (#5143, @ywk253100)
-  * Kopia Integration: Add the Unified Repository Interface definition. Kopia Integration: Add the changes for Unified Repository storage config. Related Issues; #5076, #5080 (#5142, @Lyndon-Li)
-  * Update the CRD for kopia integration (#5135, @reasonerjt)
-  * Let "make shell xxx" respect GOPROXY (#5128, @reasonerjt)
-  * Modify BackupStoreGetter to avoid BSL spec changes (#5122, @sseago)
-  * Dump stack trace when the plugin server handles panic (#5110, @reasonerjt)
-  * Make CSI snapshot creation timeout configurable. (#5104, @jxun)
-  *  Fix bsl validation bug: the BSL is validated continually and doesn't respect the validation period configured (#5101, @ywk253100)
-  * Exclude "csinodes.storage.k8s.io" and "volumeattachments.storage.k8s.io" from restore by default. (#5064, @jxun)
-  * Move 'velero.io/exclude-from-backup' label string to const (#5053, @niulechuan)
-  * Modify Github actions. (#5052, @jxun)
-  * Fix typo in doc, in https://velero.io/docs/main/restore-reference/ "Restore order" section, "Mamespace" should be "Namespace". (#5051, @niulechuan)
-  * Delete opened issues triage action. (#5041, @jxun)
-  * When spec.RestoreStatus is empty, don't restore status (#5008, @sseago)
-  * 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.  (#4980, @anshulahuja98)
-  * Refactor BackupItemAction proto and related code to backupitemaction/v1 package.  This is part of implementation of the plugin version design https://github.com/vmware-tanzu/velero/blob/main/design/plugin-versioning.md (#4943, @phuongatemc)
-  * Unified Repository Design (#4926, @Lyndon-Li)
-  * Add credentials to volume snapshot locations (#4864, @sseago)

changelogs/CHANGELOG-1.11.md

@@ -1,126 +0,0 @@
-## v1.11
-### 2023-04-07
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.11.0
-
-### Container Image
-`velero/velero:v1.11.0`
-
-### Documentation
-https://velero.io/docs/v1.11/
-
-### Upgrading
-https://velero.io/docs/v1.11/upgrade-to-1.11/
-
-### Highlights
-
-#### BackupItemAction v2
-This feature implements the BackupItemAction v2. BIA v2 has two new methods: Progress() and Cancel() and modifies the Execute() return value.
-
-The API change is needed to facilitate long-running BackupItemAction plugin actions that may not be complete when the Execute() method returns. This will allow long-running BackupItemAction plugin actions to continue in the background while the Velero moves to the following plugin or the next item.
-
-#### RestoreItemAction v2
-This feature implemented the RestoreItemAction v2. RIA v2 has three new methods: Progress(), Cancel(), and AreAdditionalItemsReady(), and it modifies RestoreItemActionExecuteOutput() structure in the RIA return value.
-
-The Progress() and Cancel() methods are needed to facilitate long-running RestoreItemAction plugin actions that may not be complete when the Execute() method returns. This will allow long-running RestoreItemAction plugin actions to continue in the background while the Velero moves to the following plugin or the next item. The AreAdditionalItemsReady() method is needed to allow plugins to tell Velero to wait until the returned additional items have been restored and are ready for use in the cluster before restoring the current item.
-
-#### Plugin Progress Monitoring
-This is intended as a replacement for the previously-approved Upload Progress Monitoring design ([Upload Progress Monitoring](https://github.com/vmware-tanzu/velero/blob/main/design/upload-progress.md)) to expand the supported use cases beyond snapshot upload to include what was previously called Async Backup/Restore Item Actions.
-
-#### Flexible resource policy that can filter volumes to skip in the backup
-This feature provides a flexible policy to filter volumes in the backup without requiring patching any labels or annotations to the pods or volumes. This policy is configured as k8s ConfigMap and maintained by the users themselves, and it can be extended to more scenarios in the future. By now, the policy rules out volumes from backup depending on the CSI driver, NFS setting, volume size, and StorageClass setting. Please refer to [policy API design](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/handle-backup-of-volumes-by-resources-filters.md#api-design) for the policy's ConifgMap format. It is not guaranteed to work on unofficial third-party plugins as it may not follow the existing backup workflow code logic of Velero.
-
-#### Resource Filters that can distinguish cluster scope and namespace scope resources
-This feature adds four new resource filters for backup. The new filters are separated into cluster scope and namespace scope. Before this feature, Velero could not filter cluster scope resources precisely. This feature provides the ability and refactors existing resource filter parameters.
-
-#### Add a parameter for setting the Velero server connection with the k8s API server's timeout
-In Velero, some code pieces need to communicate with the k8s API server. Before v1.11, these code pieces used hard-code timeout settings. This feature adds a resource-timeout parameter in the velero server binary to make it configurable.
-
-#### Add resource list in the output of the restore describe command
-Before this feature, Velero restore didn't have a restored resources list as the Velero backup. It's not convenient for users to learn what is restored. This feature adds the resources list and the handling result of the resources (including created, updated, failed, and skipped).
-
-#### Refactor controllers with controller-runtime
-In v1.11, Backup Controller and Restore controller are refactored with controller-runtime. Till v1.11, all Velero controllers use the controller-runtime framework.
-
-#### Runtime and dependencies
-To fix CVEs and keep pace with Golang, Velero made changes as follows:
-* Bump Golang runtime to v1.19.8.
-* Bump several dependent libraries to new versions.
-* Compile Restic (v0.15.0) with Golang v1.19.8 instead of packaging the official binary.
-
-
-### Breaking changes
-* The Velero CSI plugin now determines whether to restore Volume's data from snapshots on the restore's restorePVs setting. Before v1.11, the CSI plugin doesn't check the restorePVs parameter setting. 
-
-
-### Limitations/Known issues
-* The Flexible resource policy that can filter volumes to skip in the backup is not guaranteed to work on unofficial third-party plugins because the plugins may not follow the existing backup workflow code logic of Velero. The ConfigMap used as the policy is supposed to be maintained by users.
-
-
-### All Changes
-* Modify new scope resource filters name. (#6089, @blackpiglet)
-* Make Velero not exits when EnableCSI is on and CSI snapshot not installed (#6062, @blackpiglet)
-* Restore Services before Clusters (#6057, @ywk253100)
-* Fixed backup deletion bug related to async operations (#6041, @sseago)
-* Update Golang version to v1.19 for branch main. (#6039, @blackpiglet)
-* Fix issue #5972, don't assume errorField as error type when dealing with logger.WithError (#6028, @Lyndon-Li)
-* distinguish between New and InProgress operations (#6012, @sseago)
-* Modify golangci.yaml file. Resolve found lint issues. (#6008, @blackpiglet)
-* Remove Reference of itemsnapshotter (#5997, @reasonerjt)
-* minor fixes for backup_operations_controller (#5996, @sseago)
-* RIAv2 async operations controller work (#5993, @sseago)
-* Follow-on fixes for BIAv2 controller work (#5971, @sseago)
-* Refactor backup controller based on the controller-runtime framework. (#5969, @qiuming-best)
-* Fix client wait problem after async operation change, velero backup/restore --wait should check a full list of the terminal status (#5964, @Lyndon-Li)
-* Fix issue #5935, refactor the logics for backup/restore persistent log, so as to remove the contest to gzip writer (#5956, @Lyndon-Li)
-* Switch the base image to distroless/base-nossl-debian11 to reduce the CVE triage efforts (#5939, @ywk253100)
-* Wait for additional items to be ready before restoring current item (#5933, @sseago)
-* Add configurable server setting for default timeouts (#5926, @eemcmullan)
-* Add warning/error result to cmd `velero backup describe` (#5916, @allenxu404)
-* Fix Dependabot alerts. Use 1.18 and 1.19 golang instead of patch image in dockerfile. Add release-1.10 and release-1.9 in Trivy daily scan. (#5911, @blackpiglet)
-* Update client-go to v0.25.6 (#5907, @kaovilai)
-* Limit the concurrent number for backup's VolumeSnapshot operation. (#5900, @blackpiglet)
-* Fix goreleaser issue for resolving tags and updated it's version. (#5899, @anshulahuja98)
-* This is to fix issue 5881, enhance the PVB tracker in two modes, Track and Taken (#5894, @Lyndon-Li)
-* Add labels for velero installed namespace to support PSA. (#5873, @blackpiglet)
-* Add restored resource list in the restore describe command (#5867, @ywk253100)
-* Add a json output to cmd velero backup describe  (#5865, @allenxu404)
-* Make restore controller adopting the controller-runtime framework. (#5864, @blackpiglet)
-* Replace k8s.io/apimachinery/pkg/util/clock with k8s.io/utils/clock (#5859, @hezhizhen)
-* Restore finalizer and managedFields of metadata during the restoration (#5853, @ywk253100)
-* BIAv2 async operations controller work (#5849, @sseago)
-* Add secret restore item action to handle service account token secret (#5843, @ywk253100)
-* Add new resource filters can separate cluster and namespace scope resources. (#5838, @blackpiglet)
-* Correct PVB/PVR Failed Phase patching during startup (#5828, @kaovilai)
-* bump up golang net to fix CVE-2022-41721 (#5812, @Lyndon-Li)
-* Update CRD descriptions for SnapshotVolumes and restorePVs (#5807, @shubham-pampattiwar)
-* Add mapped selected-node existence check (#5806, @blackpiglet)
-* Add option "--service-account-name" to install cmd (#5802, @reasonerjt)
-* Enable staticcheck linter. (#5788, @blackpiglet)
-* Set Kopia IgnoreUnknownTypes in ErrorHandlingPolicy to True for ignoring backup unknown file type (#5786, @qiuming-best)
-* Bump up Restic version to 0.15.0  (#5784, @qiuming-best)
-* Add File system backup related metrics to Grafana dashboard
-  - Add metrics backup_warning_total for record of total warnings
-  - Add metrics backup_last_status for record of last status of the backup  (#5779, @allenxu404)
-* Design for Handling backup of volumes by resources filters (#5773, @qiuming-best)
-* Add PR container build action, which will not push image. Add GOARM parameter. (#5771, @blackpiglet)
-* Fix issue 5458, track pod volume backup until the CR is submitted in case it is skipped half way (#5769, @Lyndon-Li)
-* Fix issue 5226, invalidate the related backup repositories whenever the backup storage info change in BSL (#5768, @Lyndon-Li)
-* Add Restic builder in Dockerfile, and keep the used built Golang image version in accordance with upstream Restic. (#5764, @blackpiglet)
-* Fix issue 5043, after the restore pod is scheduled, check if the node-agent pod is running in the same node. (#5760, @Lyndon-Li)
-* Remove restore controller's redundant client. (#5759, @blackpiglet)
-* Define itemoperations.json format and update DownloadRequest API (#5752, @sseago)
-* Add Trivy nightly scan. (#5740, @jxun)
-* Fix issue 5696, check if the repo is still openable before running the prune and forget operation, if not, try to reconnect the repo (#5715, @Lyndon-Li)
-* Fix error with Restic backup empty volumes (#5713, @qiuming-best)
-* new backup and restore phases to support async plugin operations:
-  - WaitingForPluginOperations
-  - WaitingForPluginOperationsPartiallyFailed (#5710, @sseago)
-* Prevent nil panic on exec restore hooks (#5675, @dymurray)
-* Fix CVEs scanned by trivy (#5653, @qiuming-best)
-* Publish backupresults json to enhance error info during backups. (#5576, @anshulahuja98)
-* RestoreItemAction v2 API implementation (#5569, @sseago)
-* add new RestoreItemAction of "velero.io/change-image-name" to handle the issue mentioned at #5519 (#5540, @wenterjoy)
-* BackupItemAction v2 API implementation (#5442, @sseago)
-* Proposal to separate resource filter into cluster scope and namespace scope (#5333, @blackpiglet)

changelogs/CHANGELOG-1.12.md

@@ -1,134 +0,0 @@
-## v1.12
-### 2023-08-18
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.12.0
-
-### Container Image
-`velero/velero:v1.12.0`
-
-### Documentation
-https://velero.io/docs/v1.12/
-
-### Upgrading
-https://velero.io/docs/v1.12/upgrade-to-1.12/
-
-### Highlights
-
-#### CSI Snapshot Data Movement
-CSI Snapshot Data Movement refers to back up CSI snapshot data from the volatile and limited production environment into durable, heterogeneous, and scalable backup storage in a consistent manner; and restore the data to volumes in the original or alternative environment.
-
-CSI Snapshot Data Movement is useful in below scenarios:
-
-* For on-premises users, the storage usually doesn't support durable snapshots, so it is impossible/less efficient/cost ineffective to keep volume snapshots by the storage This feature helps to move the snapshot data to a storage with lower cost and larger scale for long time preservation.
-* For public cloud users, this feature helps users to fulfill the multiple cloud strategy. It allows users to back up volume snapshots from one cloud provider and preserve or restore the data to another cloud provider. Then users will be free to flow their business data across cloud providers based on Velero backup and restore
-
-CSI Snapshot Data Movement is built according to the Volume Snapshot Data Movement design ([Volume Snapshot Data Movement](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/unified-repo-and-kopia-integration/unified-repo-and-kopia-integration.md)). More details can be found in the design.
-
-#### Resource Modifiers
-In many use cases, customers often need to substitute specific values in Kubernetes resources during the restoration process like changing the namespace, changing the storage class, etc. 
-
-To address this need, Resource Modifiers (also known as JSON Substitutions) offer a generic solution in the restore workflow. It allows the user to define filters for specific resources and then specify a JSON patch (operator, path, value) to apply to the resource. This feature simplifies the process of making substitutions without requiring the implementation of a new RestoreItemAction plugin. More details can be found in Volume Snapshot Resource Modifiers design ([Resource Modifiers](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/json-substitution-action-design.md)).
-
-#### Multiple VolumeSnapshotClasses
-Prior to version 1.12, the Velero CSI plugin would choose the VolumeSnapshotClass in the cluster based on matching driver names and the presence of the "velero.io/csi-volumesnapshot-class" label. However,  this approach proved inadequate for many user scenarios.
-
-With the introduction of version 1.12, Velero now offers support for multiple VolumeSnapshotClasses in the CSI Plugin, enabling users to select a specific class for a particular backup. More details can be found in Multiple VolumeSnapshotClasses design ([Multiple VolumeSnapshotClasses](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/multiple-csi-volumesnapshotclass-support.md)).
-
-#### Restore Finalizer
-Before v1.12, the restore controller would only delete restore resources but wouldn’t delete restore data from the backup storage location when the command `velero restore delete` was executed. The only chance Velero deletes restores data from the backup storage location is when the associated backup is deleted.
-
-In this version, Velero introduces a finalizer that ensures the cleanup of all associated data for restores when running the command `velero restore delete`.
-
-#### Runtime and dependencies
-To fix CVEs and keep pace with Golang, Velero made changes as follows:
-* Bump Golang runtime to v1.20.7.
-* Bump several dependent libraries to new versions.
-* Bump Kopia to v0.13.
-
-
-### Breaking changes
-* Prior to v1.12, the parameter `uploader-type` for Velero installation had a default value of "restic". However, starting from this version, the default value has been changed to "kopia". This means that Velero will now use Kopia as the default path for file system backup.
-* The ways of setting CSI snapshot time have changed in v1.12. First, the sync waiting time for creating a snapshot handle in the CSI plugin is changed from the fixed 10 minutes into backup.Spec.CSISnapshotTimeout. The second, the async waiting time for VolumeSnapshot and VolumeSnapshotContent's status turning into `ReadyToUse` in operation uses the operation's timeout. The default value is 4 hours.
-* As from [Velero helm chart v4.0.0](https://github.com/vmware-tanzu/helm-charts/releases/tag/velero-4.0.0), it supports multiple BSL and VSL, and the BSL and VSL have changed from the map into a slice, and[ this breaking change](https://github.com/vmware-tanzu/helm-charts/pull/413) is not backward compatible. So it would be best to change the BSL and VSL configuration into slices before the Upgrade.
-
-
-### Limitations/Known issues
-* The Azure plugin supports Azure AD Workload identity way, but it only works for Velero native snapshots. It cannot support filesystem backup and snapshot data mover scenarios. 
-
-
-### All Changes
-* Fixes #6498. Get resource client again after restore actions in case resource's gv is changed. This is an improvement of pr #6499, to support group changes. A group change usually happens in a restore plugin which is used for resource conversion: convert a resource from a not supported gv to a supported gv (#6634, @27149chen)
-* Add API support for volMode block, only error for now. (#6608, @shawn-hurley)
-* Fix how the AWS credentials are obtained from configuration (#6598, @aws_creds)
-* Add performance E2E test (#6569, @qiuming-best)
-* Non default s3 credential profiles work on Unified Repository Provider (kopia) (#6558, @kaovilai)
-* Fix issue #6571, fix the problem for restore item operation to set the errors correctly so that they can be recorded by Velero restore and then reflect the correct status for Velero restore. (#6594, @Lyndon-Li)
-* Fix issue 6575, flush the repo after delete the snapshot, otherwise, the changes(deleting repo snapshot) cannot be committed to the repo. (#6587, @Lyndon-Li)
-* Delete moved snapshots when the backup is deleted (#6547, @reasonerjt)
-* check if restore crd exist before operating restores (#6544, @allenxu404)
-* Remove PVC's selector in backup's PVC action. (#6481, @blackpiglet)
-* Delete the expired deletebackuprequests that are stuck in "InProgress" (#6476, @reasonerjt)
-* Fix issue #6534, reset PVB CR's StorageLocation to the latest one during backup sync as same as the backup CR. Also fix similar problem with DataUploadResult for data mover restore. (#6533, @Lyndon-Li)
-* Fix issue #6519. Restrict the client manager of node-agent server to include only Velero resources from the server's namespace, otherwise, the controllers will try to reconcile CRs from all the installed Velero namespaces. (#6523, @Lyndon-Li)
-* Track the skipped PVC and print the summary in backup log  (#6496, @reasonerjt)
-* Add restore finalizer to clean up external resources (#6479, @allenxu404)
-* fix: Typos and add more spell checking rules to CI (#6415, @mateusoliveira43)
-* Add missing CompletionTimestamp and metrics when restore moved into terminal phase in restoreOperationsReconciler (#6397, @Nutrymaco)
-* Add support for resource Modifications in the restore flow. Also known as JSON Substitutions. (#6452, @anshulahuja98)
-* Remove dependency of the legacy client code from pkg/cmd directory part 2 (#6497, @blackpiglet)
-* Add data upload and download metrics (#6493, @allenxu404)
-* Fix issue 6490, If a backup/restore has multiple async operations and one operation fails while others are still in-progress, when all the operations finish, the backup/restore will be set as Completed falsely (#6491, @Lyndon-Li)
-* Velero Plugins no longer need kopia indirect dependency in their go.mod (#6484, @kaovilai)
-* Remove dependency of the legacy client code from pkg/cmd directory (#6469, @blackpiglet)
-* Add support for OpenStack CSI drivers topology keys (#6464, @openstack-csi-topology-keys)
-* Add exit code log and possible memory shortage warning log for Restic command failure. (#6459, @blackpiglet)
-* Modify DownloadRequest controller logic (#6433, @blackpiglet)
-* Add data download controller for data mover (#6436, @qiuming-best)
-* Fix hook filter display issue for backup describer (#6434, @allenxu404)
-* Retrieve DataUpload into backup result ConfigMap during volume snapshot restore. (#6410, @blackpiglet)
-* Design to add support for Multiple VolumeSnapshotClasses in CSI Plugin. (#5774, @anshulahuja98)
-* Clarify the deletion frequency for gc controller (#6414, @allenxu404)
-* Add unit tests for pkg/archive (#6396, @allenxu404)
-* Add UT for pkg/discovery (#6394, @qiuming-best)
-* Add UT for pkg/util (#6368, @Lyndon-Li)
-* Add the code for data mover restore expose (#6357, @Lyndon-Li)
-* Restore Endpoints before Services (#6315, @ywk253100)
-* Add warning message for volume snapshotter in data mover case. (#6377, @blackpiglet)
-* Add unit test for pkg/uploader (#6374, @qiuming-best)
-* Change kopia as the default path of PVB (#6370, @Lyndon-Li)
-* Do not persist VolumeSnapshot and VolumeSnapshotContent for snapshot DataMover case. (#6366, @blackpiglet)
-* Add data mover related options in CLI (#6365, @ywk253100)
-* Add dataupload controller (#6337, @qiuming-best)
-* Add UT cases for pkg/podvolume (#6336, @Lyndon-Li)
-* Remove Wait VolumeSnapshot to ReadyToUse logic. (#6327, @blackpiglet)
-* Enhance the code because of #6297, the return value of GetBucketRegion is not recorded, as a result, when it fails, we have no way to get the cause (#6326, @Lyndon-Li)
-* Skip updating status when CRDs are restored (#6325, @reasonerjt)
-* Include namespaces needed by namespaced-scope resources in backup. (#6320, @blackpiglet)
-* Update metrics when backup failed with validation error (#6318, @ywk253100)
-* Add the code for data mover backup expose (#6308, @Lyndon-Li)
-* Fix a PVR issue for generic data path -- the namespace remap was not honored, and enhance the code for better error handling (#6303, @Lyndon-Li)
-* Add default values for defaultItemOperationTimeout and itemOperationSyncFrequency in velero CLI  (#6298, @shubham-pampattiwar)
-* Add UT cases for pkg/repository (#6296, @Lyndon-Li)
-* Fix issue #5875. Since Kopia has supported IAM, Velero should not require static credentials all the time (#6283, @Lyndon-Li)
-* Fixed a bug where status.progress is not getting updated for backups. (#6276, @kkothule)
-* Add code change for async generic data path that is used by both PVB/PVR and data mover (#6226, @Lyndon-Li)
-* Add data mover CRD under v2alpha1, include DataUpload CRD and DataDownload CRD (#6176, @Lyndon-Li)
-* Remove any dataSource or dataSourceRef fields from PVCs in PVC BIA for cases of
-prior PVC restores with CSI (#6111, @eemcmullan)
-* Add the design for Volume Snapshot Data Movement (#5968, @Lyndon-Li)
-* Fix issue #5123, Kopia repository supports self-cert CA for S3 compatible storage. (#6268, @Lyndon-Li)
-* Bump up Kopia to v0.13 (#6248, @Lyndon-Li)
-* log volumes to backup to help debug why `IsPodRunning` is called. (#6232, @kaovilai)
-* Enable errcheck linter and resolve found issues (#6208, @blackpiglet)
-* Enable more linters, and remove mal-functioned milestoned issue action. (#6194, @blackpiglet)
-* Enable stylecheck linter and resolve found issues. (#6185, @blackpiglet)
-* Fix issue #6182. If pod is not running, don't treat it as an error, let it go and leave a warning. (#6184, @Lyndon-Li)
-* Enable staticcheck and resolve found issues (#6183, @blackpiglet)
-* Enable linter revive and resolve found errors: part 2 (#6177, @blackpiglet)
-* Enable linter revive and resolve found errors: part 1 (#6173, @blackpiglet)
-* Fix usestdlibvars and whitespace linters issues. (#6162, @blackpiglet)
-* Update Golang to v1.20 for main. (#6158, @blackpiglet)
-* Make GetPluginConfig accessible from other packages. (#6151, @tkaovila)
-* Ignore not found error during patching managedFields (#6136, @ywk253100)
-* Fix the goreleaser issues and add a new goreleaser action (#6109, @blackpiglet)

changelogs/CHANGELOG-1.13.md

@@ -1,166 +0,0 @@
-## v1.13
-### 2024-01-10
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.13.0
-
-### Container Image
-`velero/velero:v1.13.0`
-
-### Documentation
-https://velero.io/docs/v1.13/
-
-### Upgrading
-https://velero.io/docs/v1.13/upgrade-to-1.13/
-
-### Highlights
-
-#### Resource Modifier Enhancement
-Velero introduced the Resource Modifiers in v1.12.0. This feature allows users to specify a ConfigMap with a set of rules to modify the resources during restoration. However, only the JSON Patch is supported when creating the rules, and JSON Patch has some limitations, which cannot cover all use cases. In v1.13.0, Velero adds new support for JSON Merge Patch and Strategic Merge Patch, which provide more power and flexibility and allow users to use the same ConfigMap to apply patches on the resources. More design details can be found in [Support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/merge-patch-and-strategic-in-resource-modifier.md) design. For instructions on how to use the feature, please refer to the [Resource Modifiers](https://velero.io/docs/v1.13/restore-resource-modifiers/) doc.
-
-#### Node-Agent Concurrency
-Velero data movement activities from fs-backups and CSI snapshot data movements run in Velero node-agent, so may be hosted by every node in the cluster and consume resources (i.e. CPU, memory, network bandwidth) from there. With v1.13, users are allowed to configure how many data movement activities (a.k.a, loads) run in each node globally or by node, so that users can better leverage the performance of Velero data movement activities and the resource consumption in the cluster. For more information, check the [Node-Agent Concurrency](https://velero.io/docs/v1.13/node-agent-concurrency/) document. 
-
-#### Parallel Files Upload Options
-Velero now supports configurable options for parallel files upload when using Kopia uploader to do fs-backups or CSI snapshot data movements which makes speed up backup possible.
-For more information, please check [Here](https://velero.io/docs/v1.13/backup-reference/#parallel-files-upload).
-
-#### Write Sparse Files Options
-If using fs-restore or CSI snapshot data movements, it’s supported to write sparse files during restore. For more information, please check [Here](https://velero.io/docs/v1.13/restore-reference/#write-sparse-files).
-
-#### Backup Describe
-In v1.13, the Backup Volume section is added to the velero backup describe command output. The backup Volumes section describes information for all the volumes included in the backup of various backup types, i.e. native snapshot, fs-backup, CSI snapshot, and CSI snapshot data movement. Particularly, the velero backup description now supports showing the information of CSI snapshot data movements, which is not supported in v1.12.
-
-Additionally, backup describe command will not check EnableCSI feature gate from client side, so if a backup has volumes with CSI snapshot or CSI snapshot data movement, backup describe command always shows the corresponding information in its output.
-
-#### Backup's new VolumeInfo metadata
-Create a new metadata file in the backup repository's backup name sub-directory to store the backup-including PVC and PV information. The information includes the backing-up method of the PVC and PV data, snapshot information, and status. The VolumeInfo metadata file determines how the PV resource should be restored. The Velero downstream software can also use this metadata file to get a summary of the backup's volume data information.
-
-#### Enhancement for CSI Snapshot Data Movements when Velero Pod Restart
-When performing backup and restore operations, enhancements have been implemented for Velero server pods or node agents to ensure that the current backup or restore process is not stuck or interrupted after restart due to certain exceptional circumstances.
-
-#### New status fields added to show hook execution details
-Hook execution status is now included in the backup/restore CR status and displayed in the backup/restore describe command output. Specifically, it will show the number of hooks which attempted to execute under the HooksAttempted  field and the number of hooks which failed to execute under the HooksFailed  field. 
-
-#### AWS SDK Bump Up
-Bump up AWS SDK for Go to version 2, which offers significant performance improvements in CPU and memory utilization over version 1.
-
-#### Azure AD/Workload Identity Support
-Azure AD/Workload Identity is the recommended approach to do the authentication with Azure services/AKS, Velero has introduced support for Azure AD/Workload Identity on the Velero Azure plugin side in previous releases, and in v1.13.0 Velero adds new support for Kopia operations(file system backup/data mover/etc.) with Azure AD/Workload Identity.
-
-#### Runtime and dependencies
-To fix CVEs and keep pace with Golang, Velero made changes as follows:
-* Bump Golang runtime to v1.21.6.
-* Bump several dependent libraries to new versions.
-* Bump Kopia to v0.15.0.
-
-
-### Breaking changes
-* Backup describe command: due to the backup describe output enhancement, some existing information (i.e. the output for native snapshot, CSI snapshot, and fs-backup) has been moved to the Backup Volumes section with some format changes.
-* API type changes: changes the field [DataMoverConfig](https://github.com/vmware-tanzu/velero/blob/v1.13.0/pkg/apis/velero/v2alpha1/data_upload_types.go#L54) in DataUploadSpec from `*map[string][string]`` to `map[string]string`
-* Velero install command: due to the issue [#7264](https://github.com/vmware-tanzu/velero/issues/7264), v1.13.0 introduces a break change that make the informer cache enabled by default to keep the actual behavior consistent with the helper message(the informer cache is disabled by default before the change).
-
-
-### Limitations/Known issues
-* The backup's VolumeInfo metadata doesn't have the information updated in the async operations. This function could be supported in v1.14 release. 
-
-### Note
-* Velero introduces the informer cache which is enabled by default. The informer cache improves the restore performance but may cause higher memory consumption. Increase the memory limit of the Velero pod or disable the informer cache by specifying the `--disable-informer-cache` option when installing Velero if you get the OOM error.
-
-### Deprecation announcement
-* The generated k8s clients, informers, and listers are deprecated in the Velero v1.13 release. They are put in the Velero repository's pkg/generated directory. According to the n+2 supporting policy, the deprecated are kept for two more releases. The pkg/generated directory should be deleted in the v1.15 release.
-* After the backup VolumeInfo metadata file is added to the backup, Velero decides how to restore the PV resource according to the VolumeInfo content. To support the backup generated by the older version of Velero, the old logic is also kept. The support for the backup without the VolumeInfo metadata file will be kept for two releases. The support logic will be deleted in the v1.15 release.
-
-### All Changes
-  * Make "disable-informer-cache" option false(enabled) by default to keep it consistent with the help message (#7294, @ywk253100)
-  * Fix issue #6928, remove snapshot deletion timeout for PVB (#7282, @Lyndon-Li)
-  * Do not set "targetNamespace" to namespace items (#7274, @reasonerjt)
-  * Fix issue #7244. By the end of the upload, check the outstanding incomplete snapshots and delete them by calling ApplyRetentionPolicy (#7245, @Lyndon-Li)
-  * Adjust the newline output of resource list in restore describer (#7238, @allenxu404)
-  * Remove the redundant newline in backup describe output (#7229, @allenxu404)
-  * Fix issue #7189, data mover generic restore - don't assume the first volume as the restore volume (#7201, @Lyndon-Li)
-  * Update CSIVolumeSnapshotsCompleted in backup's status and the metric
-during backup finalize stage according to async operations content. (#7184, @blackpiglet)
-  * Refactor DownloadRequest Stream function (#7175, @blackpiglet)
-  * Add `--skip-immediately` flag to schedule commands; `--schedule-skip-immediately` server and install (#7169, @kaovilai)
-  * Add node-agent concurrency doc and change the config name from dataPathConcurrency to loadCocurrency (#7161, @Lyndon-Li)
-  * Enhance hooks tracker by adding a returned error to record function (#7153, @allenxu404)
-  * Track the skipped PV when SnapshotVolumes set as false (#7152, @reasonerjt)
-  * Add more linters part 2. (#7151, @blackpiglet)
-  * Fix issue #7135, check pod status before checking node-agent pod status (#7150, @Lyndon-Li)
-  * Treat namespace as a regular restorable item (#7143, @reasonerjt)
-  * Allow sparse option for Kopia & Restic restore  (#7141, @qiuming-best)
-  * Use VolumeInfo to help restore the PV. (#7138, @blackpiglet)
-  * Node agent restart enhancement (#7130, @qiuming-best)
-  * Fix issue #6695, add describe for data mover backups (#7125, @Lyndon-Li)
-  * Add hooks status to backup/restore CR (#7117, @allenxu404)
-  * Include plugin name in the error message by operations (#7115, @reasonerjt)
-  * Fix issue #7068, due to a behavior of CSI external snapshotter, manipulations of VS and VSC may not be handled in the same order inside external snapshotter as the API is called. So add a protection finalizer to ensure the order (#7102, @Lyndon-Li)
-  * Generate VolumeInfo for backup. (#7100, @blackpiglet)
-  * Fix issue #7094, fallback to full backup if previous snapshot is not found (#7096, @Lyndon-Li)
-  * Fix issue #7068, due to an behavior of CSI external snapshotter, manipulations of VS and VSC may not be handled in the same order inside external snapshotter as the API is called. So add a protection finalizer to ensure the order (#7095, @Lyndon-Li)
-  * Skip syncing the backup which doesn't contain backup metadata (#7081, @ywk253100)
-  * Fix issue #6693, partially fail restore if CSI snapshot is involved but CSI feature is not ready, i.e., CSI feature gate is not enabled or CSI plugin is not installed. (#7077, @Lyndon-Li)
-  * Truncate the credential file to avoid the change of secret content messing it up (#7072, @ywk253100)
-  * Add VolumeInfo metadata structures. (#7070, @blackpiglet)
-  * improve discoveryHelper.Refresh() in restore (#7069, @27149chen)
-  * Add DataUpload Result and CSI VolumeSnapshot check for restore PV. (#7061, @blackpiglet)
-  * Add the implementation for design #6950, configurable data path concurrency (#7059, @Lyndon-Li)
-  * Make data mover fail early (#7052, @qiuming-best)
-  * Remove dependency of generated client part 3. (#7051, @blackpiglet)
-  * Update Backup.Status.CSIVolumeSnapshotsCompleted during finalize (#7046, @kaovilai)
-  * Remove the Velero generated client. (#7041, @blackpiglet)
-  * Fix issue #7027, data mover backup exposer should not assume the first volume as the backup volume in backup pod (#7038, @Lyndon-Li)
-  * Read information from the credential specified by BSL (#7034, @ywk253100)
-  * Fix #6857. Added check for matching Owner References when synchronizing backups, removing references that are not found/have mismatched uid. (#7032, @deefdragon)
-  * Add description markers for dataupload and datadownload CRDs (#7028, @shubham-pampattiwar)
-  * Add HealthCheckNodePort deletion logic for Service restore. (#7026, @blackpiglet)
-  * Fix inconsistent behavior of Backup and Restore hook execution (#7022, @allenxu404)
-  * Fix #6964. Don't use csiSnapshotTimeout (10 min) for waiting snapshot to readyToUse for data mover, so as to make the behavior complied with CSI snapshot backup (#7011, @Lyndon-Li)
-  * restore: Use warning when Create IsAlreadyExist and Get error (#7004, @kaovilai)
-  * Bump kopia to 0.15.0 (#7001, @Lyndon-Li)
-  * Make Kopia file parallelism configurable (#7000, @qiuming-best)
-  * Fix unified repository (kopia) s3 credentials profile selection (#6995, @kaovilai)
-  * Fix #6988, always get region from BSL if it is not empty (#6990, @Lyndon-Li)
-  * Limit PVC block mode logic to non-Windows platform. (#6989, @blackpiglet)
-  * It is a valid case that the Status.RestoreSize field in VolumeSnapshot is not set, if so, get the volume size from the source PVC to create the backup PVC (#6976, @Lyndon-Li)
-  * Check whether the action is a CSI action and whether CSI feature is enabled, before executing the action. (#6968, @blackpiglet)
-  * Add the PV backup information design document. (#6962, @blackpiglet)
-  * Change controller-runtime List option from MatchingFields to ListOptions (#6958, @blackpiglet)
-  * Add the design for node-agent concurrency (#6950, @Lyndon-Li)
-  * Import auth provider plugins (#6947, @0x113)
-  * Fix #6668, add a limitation for file system restore parallelism with other types of restores (CSI snapshot restore, CSI snapshot movement restore) (#6946, @Lyndon-Li)
-  * Add MSI Support for Azure plugin. (#6938, @yanggangtony)
-  * Partially fix #6734, guide Kubernetes' scheduler to spread backup pods evenly across nodes as much as possible, so that data mover backup could achieve better parallelism (#6926, @Lyndon-Li)
-  * Bump up aws sdk to aws-sdk-go-v2 (#6923, @reasonerjt)
-  * Optional check if targeted container is ready before executing a hook (#6918, @Ripolin)
-  * Support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers (#6917, @27149chen)
-  * Fix issue 6913: Velero Built-in Datamover: Backup stucks in phase WaitingForPluginOperations when Node Agent pod gets restarted (#6914, @shubham-pampattiwar)
-  * Set ParallelUploadAboveSize as MaxInt64 and flush repo after setting up policy so that policy is retrieved correctly by TreeForSource (#6885, @Lyndon-Li)
-  * Replace the base image with paketobuildpacks image (#6883, @ywk253100)
-  * Fix issue #6859, move plugin depending podvolume functions to util pkg, so as to remove the dependencies to unnecessary repository packages like kopia, azure, etc. (#6875, @Lyndon-Li)
-  * Fix #6861. Only Restic path requires repoIdentifier, so for non-restic path, set the repoIdentifier fields as empty in PVB and PVR and also remove the RepoIdentifier column in the get output of PVBs and PVRs (#6872, @Lyndon-Li)
-  * Add volume types filter in resource policies (#6863, @qiuming-best)
-  * change the metrics backup_attempt_total default value to 1. (#6838, @yanggangtony)
-  * Bump kopia to v0.14 (#6833, @Lyndon-Li)
-  * Retry failed create when using generateName (#6830, @sseago)
-  * Fix issue #6786, always delete VSC regardless of the deletion policy (#6827, @Lyndon-Li)
-  * Proposal to support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers (#6797, @27149chen)
-  * Fix the node-agent missing metrics-address defines. (#6784, @yanggangtony)
-  * Fix default BSL setting not work (#6771, @qiuming-best)
-  * Update restore controller logic for restore deletion (#6770, @ywk253100)
-  * Fix #6752: add namespace exclude check. (#6760, @blackpiglet)
-  * Fix issue #6753, remove the check for read-only BSL in restore async operation controller since Velero cannot fully support read-only mode BSL in restore at present (#6757, @Lyndon-Li)
-  * Fix issue #6647, add the --default-snapshot-move-data parameter to Velero install, so that users don't need to specify --snapshot-move-data per backup when they want to move snapshot data for all backups (#6751, @Lyndon-Li)
-  * Use old(origin) namespace in resource modifier conditions in case namespace may change during restore (#6724, @27149chen)
-  * Perf improvements for existing resource restore (#6723, @sseago)
-  * Remove schedule-related metrics on schedule delete (#6715, @nilesh-akhade)
-  * Kubernetes 1.27 new job label batch.kubernetes.io/controller-uid are deleted during restore per https://github.com/kubernetes/kubernetes/pull/114930 (#6712, @kaovilai)
-  * This pr made some improvements in Resource Modifiers: 1. add label selector 2. change the field name from groupKind to groupResource (#6704, @27149chen)
-  * Make Kopia support Azure AD (#6686, @ywk253100)
-  * Add support for block volumes with Kopia (#6680, @dzaninovic)
-  * Delete PartiallyFailed orphaned backups as well as Completed ones (#6649, @sseago)
-  * Add CSI snapshot data movement doc (#6637, @Lyndon-Li)
-  * Fixes #6636, skip subresource in resource discovery (#6635, @27149chen)
-  * Add `orLabelSelectors` for backup, restore commands (#6475, @nilesh-akhade)
-  * fix run preHook and postHook on completed pods (#5211, @cleverhu)

changelogs/CHANGELOG-1.14.md

@@ -1,131 +0,0 @@
-## v1.14.1
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.14.1
-
-### Container Image
-`velero/velero:v1.14.1`
-
-### Documentation
-https://velero.io/docs/v1.14/
-
-### Upgrading
-https://velero.io/docs/v1.14/upgrade-to-1.14/
-
-### All Changes
-  * Avoid wrapping failed PVB status with empty message. (#8037, @mrnold)
-  * Make PVPatchMaximumDuration timeout configurable (#8035, @shubham-pampattiwar)
-  * Reuse existing plugin manager for get/put volume info (#8016, @sseago)
-  * Skip PV patch step in Restoe workflow for WaitForFirstConsumer VolumeBindingMode Pending state PVCs (#8006, @shubham-pampattiwar)
-  * Check whether the namespaces specified in namespace filter exist. (#7998, @blackpiglet)
-  * Check whether the volume's source is PVC before fetching its PV. (#7976, @blackpiglet)
-  * Fix issue #7904, add the limitation clarification for change PVC selected-node feature (#7949, @Lyndon-Li)
-  * Expose the VolumeHelper to third-party plugins. (#7944, @blackpiglet)
-  * Don't consider unschedulable pods unrecoverable (#7926, @sseago)
-
-
-## v1.14
-
-### Download
-https://github.com/vmware-tanzu/velero/releases/tag/v1.14.0
-
-### Container Image
-`velero/velero:v1.14.0`
-
-### Documentation
-https://velero.io/docs/v1.14/
-
-### Upgrading
-https://velero.io/docs/v1.14/upgrade-to-1.14/
-
-### Highlights
-
-#### The maintenance work for kopia/restic backup repositories is run in jobs
-Since velero started using kopia as the approach for filesystem-level backup/restore, we've noticed an issue when velero connects to the kopia backup repositories and performs maintenance, it sometimes consumes excessive memory that can cause the velero pod to get OOM Killed.  To mitigate this issue, the maintenance work will be moved out of velero pod to a separate kubernetes job, and the user will be able to specify the resource request in "velero install".
-#### Volume Policies are extended to support more actions to handle volumes
-In an earlier release, a flexible volume policy was introduced to skip certain volumes from a backup.  In v1.14 we've made enhancement to this policy to allow the user to set how the volumes should be backed up.  The user will be able to set "fs-backup" or "snapshot" as value of “action" in the policy and velero will backup the volumes accordingly.  This enhancement allows the user to achieve a fine-grained control like "opt-in/out" without having to update the target workload.  For more details please refer to https://velero.io/docs/v1.14/resource-filtering/#supported-volumepolicy-actions
-#### Node Selection for Data Movement Backup
-In velero the data movement flow relies on datamover pods, and these pods may take substantial resources and keep running for a long time.  In v1.14, the user will be able to create a configmap to define the eligible nodes on which the datamover pods are launched.  For more details refer to https://velero.io/docs/v1.14/data-movement-backup-node-selection/ 
-#### VolumeInfo metadata for restored volumes
-In v1.13, we introduced volumeinfo metadata for backup to help velero CLI and downstream adopter understand how velero handles each volume during backup.  In v1.14, similar metadata will be persisted for each restore. velero CLI is also updated to bring more info in the output of "velero restore describe".
-#### "Finalizing" phase is introduced to restores
-The "Finalizing" phase is added to the state transition flow to restore, which helps us fix several issues: The labels added to PVs will be restored after the data in the PV is restored via volumesnapshotter.  The post restore hook will be executed after datamovement is finished.
-#### Certificate-based authentication support for Azure
-Besides the service principal with secret(password)-based authentication, Velero introduces the new support for service principal with certificate-based authentication in v1.14.0. This approach enables you to adopt a phishing resistant authentication by using conditional access policies, which better protects Azure resources and is the recommended way by Azure.
-
-### Runtime and dependencies
-* Golang runtime: v1.22.2
-* kopia: v0.17.0
-
-### Limitations/Known issues
-* For the external BackupItemAction plugins that take snapshots for PVs, such as vsphere plugin.  If the plugin checks the value of the field "snapshotVolumes" in the backup spec as a criteria for snapshot, the settings in the volume policy will not take effect.  For example, if the "snapshotVolumes" is set to False in the backup spec, but a volume meets the condition in the volume policy for "snapshot" action, because the plugin will not check the settings in the volume policy, the plugin will not take snapshot for the volume.  For more details please refer to #7818
-
-### Breaking changes
-* CSI plugin has been merged into velero repo in v1.14 release.  It will be installed by default as an internal plugin, and should not be installed via "–plugins " parameter in "velero install" command.
-* The default resource requests and limitations for node agent are removed in v1.14, to make the node agent pods have the QoS class of "BestEffort", more details please refer to #7391
-* There's a change in namespace filtering behavior during backup:  In v1.14, when the includedNamespaces/excludedNamespaces fields are not set and the labelSelector/OrLabelSelectors are set in the backup spec, the backup will only include the namespaces which contain the resources that match the label selectors, while in previous releases all namespaces will be included in the backup with such settings.  More details refer to #7105
-* Patching the PV in the "Finalizing" state may cause the restore to be in "PartiallyFailed" state when the PV is blocked in "Pending" state, while in the previous release the restore may end up being in "Complete" state. For more details refer to #7866
-
-### All Changes
-* Fix backup log to show error string, not index (#7805, @piny940)
-* Modify the volume helper logic. (#7794, @blackpiglet)
-* Add documentation for extension of volume policy feature (#7779, @shubham-pampattiwar)
-* Surface errors when waiting for backupRepository and timeout occurs (#7762, @kaovilai)
-* Add existingResourcePolicy restore CR validation to controller (#7757, @kaovilai)
-* Fix condition matching in resource modifier when there are multiple rules (#7715, @27149chen)
-* Bump up the version of KinD and k8s in github actions (#7702, @reasonerjt)
-* Implementation for Extending VolumePolicies to support more actions (#7664, @shubham-pampattiwar)
-* Migrate from `github.com/Azure/azure-storage-blob-go` to `github.com/Azure/azure-sdk-for-go/sdk/storage/azblob` (#7598, @mmorel-35)
-* When Included/ExcludedNamespaces are omitted, and LabelSelector or OrLabelSelector is used, namespaces without selected items are excluded from backup. (#7697, @blackpiglet)
-* Display CSI snapshot restores in restore describe (#7687, @reasonerjt)
-* Use specific credential rather than the credential chain for Azure (#7680, @ywk253100)
-* Modify hook docs for clarity on displaying hook execution results (#7679, @allenxu404)
-* Wait for results of restore exec hook executions in Finalizing phase instead of InProgress phase (#7619, @allenxu404)
-* migrating to `sdk/resourcemanager/**/arm**` from `services/**/mgmt/**` (#7596, @mmorel-35)
-* Bump up to go1.22 (#7666, @reasonerjt)
-* Fix issue #7648. Adjust the exposing logic to avoid exposing failure and snapshot leak when expose fails (#7662, @Lyndon-Li)
-* Track and persist restore volume info (#7630, @reasonerjt)
-* Check the existence of the namespaces provided in the "--include-namespaces" option (#7569, @ywk253100)
-* Add the finalization phase to the restore workflow (#7377, @allenxu404)
-* Upgrade the version of go plugin related libs/tools (#7373, @ywk253100)
-* Check resource Group Version and Kind is available in cluster before attempting restore to prevent being stuck. (#7322, @kaovilai)
-* Merge CSI plugin code into Velero. (#7609, @blackpiglet)
-* Fix issue #7391, remove the default constraint for node-agent pods (#7488, @Lyndon-Li)
-* Fix DataDownload fails during restore for empty PVC workload (#7521, @qiuming-best)
-* Add repository maintenance job (#7451, @qiuming-best)
-* Check whether the VolumeSnapshot's source PVC is nil before using it.
-  Skip populate VolumeInfo for data-moved PV when CSI is not enabled. (#7515, @blackpiglet)
-* Fix issue #7308, change the data path requeue time to 5 second for data mover backup/restore, PVB and PVR. (#7458, @Lyndon-Li)
-*  Patch newly dynamically provisioned PV with volume info to restore custom setting of PV (#7504, @allenxu404)
-* Adjust the logic for the backup_last_status metrics to stop incorrectly incrementing over time (#7445, @allenxu404)
-* dependabot: support github-actions updates (#7594, @mmorel-35)
-* Include the design for adding the finalization phase to the restore workflow (#7317, @allenxu404)
-* Fix issue #7211. Enable advanced feature capability and add support to concatenate objects for unified repo. (#7452, @Lyndon-Li)
-* Add design to introduce restore volume info (#7610, @reasonerjt)
-* Increase the k8s client QPS/burst to avoid throttling request errors (#7311, @ywk253100)
-* Support update the backup VolumeInfos by the Async ops result. (#7554, @blackpiglet)
-* FS backup create PodVolumeBackup when the backup excluded PVC,
-  so I added logic to skip PVC volume type when PVC is not included in the backup resources to be backed up. (#7472, @sbahar619)
-* Respect and use `credentialsFile` specified in BSL.spec.config when IRSA is configured over Velero Pod Environment credentials (#7374, @reasonerjt)
-* Move the native snapshot definition code into internal directory (#7544, @blackpiglet)
-* Fix issue #7036. Add the implementation of node selection for data mover backups (#7437, @Lyndon-Li)
-* Fix issue #7535, add the MustHave resource check during item collection and item filter for restore (#7585, @Lyndon-Li)
-* build(deps): bump json-patch to v5.8.0 (#7584, @mmorel-35)
-* Add confirm flag to velero plugin add (#7566, @kaovilai)
-* do not skip unknown gvr at the beginning and get new gr when kind is changed (#7523, @27149chen)
-* Fix snapshot leak for backup (#7558, @qiuming-best)
-* For issue #7036, add the document for data mover node selection (#7640, @Lyndon-Li)
-* Add design for Extending VolumePolicies to support more actions (#6956, @shubham-pampattiwar)
-* BackupRepositories associated with a BSL are invalidated when BSL is (re-)created. (#7380, @kaovilai)
-* Improve the concurrency for PVBs in different pods  (#7571, @ywk253100)
-* Bump up Kopia to v0.16.0 and open kopia repo with no index change (#7559, @Lyndon-Li)
-* Bump up the versions of several Kubernetes-related libs (#7489, @ywk253100)
-* Make parallel restore configurable (#7512, @qiuming-best)
-* Support certificate-based authentication for Azure (#7549, @ywk253100)
-* Fix issue #7281, batch delete snapshots in the same repo (#7438, @Lyndon-Li)
-* Add CRD name to error message when it is not ready to use (#7295, @josemarevalo)
-* Add the design for node selection for data mover backup (#7383, @Lyndon-Li)
-* Bump up aws-sdk to latest version to leverage Pod Identity credentials. (#7307, @guikcd)
-* Fix issue #7246. Document the behavior for repo snapshot deletion (#7622, @Lyndon-Li)
-* Fix issue #7583, set backupName optional for Restore CRD (#7617, @Lyndon-Li)
-

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 optimize 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 cohabiting (#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,104 +0,0 @@
-## 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)

changelogs/unreleased/4058-danfengliu

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

changelogs/unreleased/4126-sseago

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

changelogs/unreleased/4141-danfengliu

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

changelogs/unreleased/4185-reasonerjt

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

changelogs/unreleased/4274-ywk253100

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

changelogs/unreleased/4281-ywk253100

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

changelogs/unreleased/8304-shubham-pampattiwar

@@ -1 +0,0 @@
-Remove multiple single quotes from Velero backup.status.validationErrors field

cmd/velero-helper/velero-helper.go

@@ -1,43 +0,0 @@
-/*
-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.
-*/
-
-package main
-
-import (
-	"fmt"
-	"os"
-	"time"
-)
-
-const (
-	// workingModePause indicates it is for general purpose to hold the pod under running state
-	workingModePause = "pause"
-)
-
-func main() {
-	if len(os.Args) < 2 {
-		fmt.Fprintln(os.Stderr, "ERROR: at least one argument must be provided, the working mode")
-		os.Exit(1)
-	}
-
-	switch os.Args[1] {
-	case workingModePause:
-		time.Sleep(time.Duration(1<<63 - 1))
-	default:
-		fmt.Fprintln(os.Stderr, "ERROR: wrong working mode provided")
-		os.Exit(1)
-	}
-}

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

@@ -18,6 +18,7 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"time"
@@ -33,16 +34,12 @@ func main() {
 	defer ticker.Stop()
 
 	for {
-		<-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")
+		select {
+		case <-ticker.C:
+			if done() {
+				fmt.Println("All restic restores are done")
+				return
 			}
-			return
 		}
 	}
 }
@@ -51,7 +48,7 @@ func main() {
 // within the .velero/ subdirectory whose name is equal to os.Args[1], or
 // false otherwise
 func done() bool {
-	children, err := os.ReadDir("/restores")
+	children, err := ioutil.ReadDir("/restores")
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "ERROR reading /restores directory: %s\n", err)
 		return false
@@ -66,40 +63,15 @@ func done() bool {
 		doneFile := filepath.Join("/restores", child.Name(), ".velero", os.Args[1])
 
 		if _, err := os.Stat(doneFile); os.IsNotExist(err) {
-			fmt.Printf("The filesystem restore done file %s is not found yet. Retry later.\n", doneFile)
+			fmt.Printf("Not found: %s\n", doneFile)
 			return false
 		} else if err != nil {
-			fmt.Fprintf(os.Stderr, "ERROR looking filesystem restore done file %s: %s\n", doneFile, err)
+			fmt.Fprintf(os.Stderr, "ERROR looking for %s: %s\n", doneFile, err)
 			return false
 		}
 
-		fmt.Printf("Found the done file %s\n", doneFile)
+		fmt.Printf("Found %s", doneFile)
 	}
 
 	return true
 }
-
-// remove .velero folder
-func removeFolder() error {
-	children, err := os.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
-}

cmd/velero/main.go

@@ -20,7 +20,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"k8s.io/klog/v2"
+	"k8s.io/klog"
 
 	"github.com/vmware-tanzu/velero/pkg/cmd"
 	"github.com/vmware-tanzu/velero/pkg/cmd/velero"

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

@@ -1,104 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
-  name: backuprepositories.velero.io
-spec:
-  group: velero.io
-  names:
-    kind: BackupRepository
-    listKind: BackupRepositoryList
-    plural: backuprepositories
-    singular: backuprepository
-  scope: Namespaced
-  versions:
-  - additionalPrinterColumns:
-    - jsonPath: .metadata.creationTimestamp
-      name: Age
-      type: date
-    - jsonPath: .spec.repositoryType
-      name: Repository Type
-      type: string
-    name: v1
-    schema:
-      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: BackupRepositorySpec is the specification for a BackupRepository.
-            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
-              repositoryType:
-                description: RepositoryType indicates the type of the backend repository
-                enum:
-                - kopia
-                - restic
-                - ""
-                type: string
-              resticIdentifier:
-                description: |-
-                  ResticIdentifier is the full restic-compatible string for identifying
-                  this repository.
-                type: string
-              volumeNamespace:
-                description: |-
-                  VolumeNamespace is the namespace this backup repository contains
-                  pod volume backups for.
-                type: string
-            required:
-            - backupStorageLocation
-            - maintenanceFrequency
-            - resticIdentifier
-            - volumeNamespace
-            type: object
-          status:
-            description: BackupRepositoryStatus is the current status of a BackupRepository.
-            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
-                  BackupRepository.
-                type: string
-              phase:
-                description: Phase is the current state of the BackupRepository.
-                enum:
-                - New
-                - Ready
-                - NotReady
-                type: string
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources: {}

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

@@ -1,9 +1,11 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
   name: backups.velero.io
 spec:
   group: velero.io
@@ -17,88 +19,38 @@ spec:
   - name: v1
     schema:
       openAPIV3Schema:
-        description: |-
-          Backup is a Velero resource that represents the capture of Kubernetes
+        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
+            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
+            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:
-              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
-              datamover:
-                description: |-
-                  DataMover specifies the data mover to be used by the backup.
-                  If DataMover is "" or "velero", the built-in data mover will be used.
-                type: string
-              defaultVolumesToFsBackup:
-                description: |-
-                  DefaultVolumesToFsBackup specifies whether pod volume file system backup should be used
-                  for all volumes by default.
-                nullable: true
-                type: boolean
               defaultVolumesToRestic:
-                description: |-
-                  DefaultVolumesToRestic specifies whether restic should be used to take a
-                  backup of all pod volumes by default.
-
-
-                  Deprecated: this field is no longer used and will be removed entirely in future. Use DefaultVolumesToFsBackup instead.
-                nullable: true
+                description: DefaultVolumesToRestic specifies whether restic should
+                  be used to take a backup of all pod volumes by default.
                 type: boolean
-              excludedClusterScopedResources:
-                description: |-
-                  ExcludedClusterScopedResources is a slice of cluster-scoped
-                  resource type names to exclude from the backup.
-                  If set to "*", all cluster-scoped resource types are excluded.
-                  The default value is empty.
-                items:
-                  type: string
-                nullable: true
-                type: array
-              excludedNamespaceScopedResources:
-                description: |-
-                  ExcludedNamespaceScopedResources is a slice of namespace-scoped
-                  resource type names to exclude from the backup.
-                  If set to "*", all namespace-scoped resource types are excluded.
-                  The default value is empty.
-                items:
-                  type: string
-                nullable: true
-                type: array
               excludedNamespaces:
-                description: |-
-                  ExcludedNamespaces contains a list of namespaces that are not
-                  included in the backup.
+                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.
+                description: ExcludedResources is a slice of resource names that are
+                  not included in the backup.
                 items:
                   type: string
                 nullable: true
@@ -111,9 +63,9 @@ spec:
                     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.
+                      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
@@ -130,17 +82,17 @@ spec:
                           nullable: true
                           type: array
                         includedNamespaces:
-                          description: |-
-                            IncludedNamespaces specifies the namespaces to which this hook spec applies. If empty, it applies
+                          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.
+                          description: IncludedResources specifies the resources to
+                            which this hook spec applies. If empty, it applies to
+                            all resources.
                           items:
                             type: string
                           nullable: true
@@ -154,8 +106,8 @@ spec:
                               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
+                                description: A label selector requirement is a selector
+                                  that contains values, a key, and an operator that
                                   relates the key and values.
                                 properties:
                                   key:
@@ -163,16 +115,17 @@ spec:
                                       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.
+                                    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.
+                                    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
@@ -184,20 +137,21 @@ spec:
                             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.
+                              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
-                          x-kubernetes-map-type: atomic
                         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.
+                          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:
@@ -212,9 +166,10 @@ spec:
                                     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.
+                                    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
@@ -225,9 +180,9 @@ spec:
                                     - 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.
+                                    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
@@ -237,9 +192,10 @@ spec:
                             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.
+                          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:
@@ -254,9 +210,10 @@ spec:
                                     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.
+                                    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
@@ -267,9 +224,9 @@ spec:
                                     - 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.
+                                    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
@@ -285,81 +242,52 @@ spec:
                     type: array
                 type: object
               includeClusterResources:
-                description: |-
-                  IncludeClusterResources specifies whether cluster-scoped resources
-                  should be included for consideration in the backup.
+                description: IncludeClusterResources specifies whether cluster-scoped
+                  resources should be included for consideration in the backup.
                 nullable: true
                 type: boolean
-              includedClusterScopedResources:
-                description: |-
-                  IncludedClusterScopedResources is a slice of cluster-scoped
-                  resource type names to include in the backup.
-                  If set to "*", all cluster-scoped resource types are included.
-                  The default value is empty, which means only related
-                  cluster-scoped resources are included.
-                items:
-                  type: string
-                nullable: true
-                type: array
-              includedNamespaceScopedResources:
-                description: |-
-                  IncludedNamespaceScopedResources is a slice of namespace-scoped
-                  resource type names to include in the backup.
-                  The default value is "*".
-                items:
-                  type: string
-                nullable: true
-                type: array
               includedNamespaces:
-                description: |-
-                  IncludedNamespaces is a slice of namespace names to include objects
-                  from. If empty, all namespaces are included.
+                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
+                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
-              itemOperationTimeout:
-                description: |-
-                  ItemOperationTimeout specifies the time used to wait for asynchronous BackupItemAction operations
-                  The default value is 4 hour.
-                type: string
               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.
+                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.
+                      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.
+                          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
+                          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
@@ -372,13 +300,13 @@ spec:
                   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.
+                    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
-                x-kubernetes-map-type: atomic
               metadata:
                 properties:
                   labels:
@@ -386,102 +314,18 @@ spec:
                       type: string
                     type: object
                 type: object
-              orLabelSelectors:
-                description: |-
-                  OrLabelSelectors is list of metav1.LabelSelector to filter with
-                  when adding individual objects to the backup. If multiple provided
-                  they will be joined by the OR operator. LabelSelector as well as
-                  OrLabelSelectors cannot co-exist in backup request, only one of them
-                  can be used.
-                items:
-                  description: |-
-                    A label selector is a label query over a set of resources. The result of matchLabels and
-                    matchExpressions are ANDed. An empty label selector matches all objects. A null
-                    label selector matches no objects.
-                  properties:
-                    matchExpressions:
-                      description: matchExpressions is a list of label selector requirements.
-                        The requirements are ANDed.
-                      items:
-                        description: |-
-                          A label selector requirement is a selector that contains values, a key, and an operator that
-                          relates the key and values.
-                        properties:
-                          key:
-                            description: key is the label key that the selector applies
-                              to.
-                            type: string
-                          operator:
-                            description: |-
-                              operator represents a key's relationship to a set of values.
-                              Valid operators are In, NotIn, Exists and DoesNotExist.
-                            type: string
-                          values:
-                            description: |-
-                              values is an array of string values. If the operator is In or NotIn,
-                              the values array must be non-empty. If the operator is Exists or DoesNotExist,
-                              the values array must be empty. This array is replaced during a strategic
-                              merge patch.
-                            items:
-                              type: string
-                            type: array
-                        required:
-                        - key
-                        - operator
-                        type: object
-                      type: array
-                    matchLabels:
-                      additionalProperties:
-                        type: string
-                      description: |-
-                        matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
-                        map is equivalent to an element of matchExpressions, whose key field is "key", the
-                        operator is "In", and the values array contains only "value". The requirements are ANDed.
-                      type: object
-                  type: object
-                  x-kubernetes-map-type: atomic
-                nullable: true
-                type: array
               orderedResources:
                 additionalProperties:
                   type: string
-                description: |-
-                  OrderedResources specifies the backup order of resources of specific Kind.
-                  The map key is the resource name and value is a list of object names separated by commas.
-                  Each resource name has format "namespace/objectname".  For cluster resources, simply use "objectname".
+                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
-              resourcePolicy:
-                description: ResourcePolicy specifies the referenced resource policies
-                  that backup should follow
-                properties:
-                  apiGroup:
-                    description: |-
-                      APIGroup is the group for the resource being referenced.
-                      If APIGroup is not specified, the specified Kind must be in the core API group.
-                      For any other third-party types, APIGroup is required.
-                    type: string
-                  kind:
-                    description: Kind is the type of resource being referenced
-                    type: string
-                  name:
-                    description: Name is the name of resource being referenced
-                    type: string
-                required:
-                - kind
-                - name
-                type: object
-                x-kubernetes-map-type: atomic
-              snapshotMoveData:
-                description: SnapshotMoveData specifies whether snapshot data should
-                  be moved
-                nullable: true
-                type: boolean
               snapshotVolumes:
-                description: |-
-                  SnapshotVolumes specifies whether to take snapshots
-                  of any PV's referenced in the set of objects included
-                  in the Backup.
+                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:
@@ -489,19 +333,9 @@ spec:
                   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.
+                description: TTL is a time.Duration-parseable string describing how
+                  long the Backup should be retained for.
                 type: string
-              uploaderConfig:
-                description: UploaderConfig specifies the configuration for the uploader.
-                nullable: true
-                properties:
-                  parallelFilesUpload:
-                    description: ParallelFilesUpload is the number of files parallel
-                      uploads to perform when using the uploader.
-                    type: integer
-                type: object
               volumeSnapshotLocations:
                 description: VolumeSnapshotLocations is a list containing names of
                   VolumeSnapshotLocations associated with this backup.
@@ -512,149 +346,95 @@ spec:
           status:
             description: BackupStatus captures the current status of a Velero backup.
             properties:
-              backupItemOperationsAttempted:
-                description: |-
-                  BackupItemOperationsAttempted is the total number of attempted
-                  async BackupItemAction operations for this backup.
-                type: integer
-              backupItemOperationsCompleted:
-                description: |-
-                  BackupItemOperationsCompleted is the total number of successfully completed
-                  async BackupItemAction operations for this backup.
-                type: integer
-              backupItemOperationsFailed:
-                description: |-
-                  BackupItemOperationsFailed is the total number of async
-                  BackupItemAction operations for this backup which ended with an error.
-                type: integer
               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
+                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
-              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 log
-                  file in object storage.
+                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
-              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.
                 type: string
-              hookStatus:
-                description: HookStatus contains information about the status of the
-                  hooks.
-                nullable: true
-                properties:
-                  hooksAttempted:
-                    description: |-
-                      HooksAttempted is the total number of attempted hooks
-                      Specifically, HooksAttempted represents the number of hooks that failed to execute
-                      and the number of hooks that executed successfully.
-                    type: integer
-                  hooksFailed:
-                    description: HooksFailed is the total number of hooks which ended
-                      with an error
-                    type: integer
-                type: object
               phase:
                 description: Phase is the current state of the Backup.
                 enum:
                 - New
                 - FailedValidation
                 - InProgress
-                - WaitingForPluginOperations
-                - WaitingForPluginOperationsPartiallyFailed
-                - Finalizing
-                - FinalizingPartiallyFailed
                 - 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.
+                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.
+                    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
+                    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.
+                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).
+                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
+                description: 'Version is the backup format major version. Deprecated:
+                  Please see FormatVersion'
                 type: integer
               volumeSnapshotsAttempted:
-                description: |-
-                  VolumeSnapshotsAttempted is the total number of attempted
+                description: VolumeSnapshotsAttempted is the total number of attempted
                   volume snapshots for this backup.
                 type: integer
               volumeSnapshotsCompleted:
-                description: |-
-                  VolumeSnapshotsCompleted is the total number of successfully
+                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.
+                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
     served: true
     storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,11 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
   name: backupstoragelocations.velero.io
 spec:
   group: velero.io
@@ -40,19 +42,14 @@ spec:
           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
+            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
+            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
@@ -86,10 +83,8 @@ spec:
                       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?
+                    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
@@ -97,7 +92,6 @@ spec:
                 required:
                 - key
                 type: object
-                x-kubernetes-map-type: atomic
               default:
                 description: Default indicates this location is the default backup
                   storage location.
@@ -138,43 +132,32 @@ spec:
               BackupStorageLocation
             properties:
               accessMode:
-                description: |-
-                  AccessMode is an unused field.
-
-
-                  Deprecated: there is now an AccessMode field on the Spec and this field
-                  will be removed entirely as of v2.0.
+                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.
-
-
-                  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.
+                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.
+                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.
+                description: LastValidationTime is the last time the backup store
+                  location was validated the cluster.
                 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:
@@ -185,4 +168,11 @@ spec:
         type: object
     served: true
     storage: true
-    subresources: {}
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,11 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
   name: deletebackuprequests.velero.io
 spec:
   group: velero.io
@@ -14,34 +16,20 @@ 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.
         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
+            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
+            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
@@ -75,4 +63,9 @@ spec:
         type: object
     served: true
     storage: true
-    subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,11 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
   name: downloadrequests.velero.io
 spec:
   group: velero.io
@@ -17,24 +19,18 @@ spec:
   - name: v1
     schema:
       openAPIV3Schema:
-        description: |-
-          DownloadRequest is a request to download an artifact from backup object storage, such as a backup
-          log file.
+        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
+            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
+            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
@@ -50,20 +46,12 @@ spec:
                     - BackupLog
                     - BackupContents
                     - BackupVolumeSnapshots
-                    - BackupItemOperations
                     - BackupResourceList
-                    - BackupResults
                     - RestoreLog
                     - RestoreResults
-                    - RestoreResourceList
-                    - RestoreItemOperations
-                    - CSIBackupVolumeSnapshots
-                    - CSIBackupVolumeSnapshotContents
-                    - BackupVolumeInfos
-                    - RestoreVolumeInfo
                     type: string
                   name:
-                    description: Name is the name of the Kubernetes resource with
+                    description: Name is the name of the kubernetes resource with
                       which the file is associated.
                     type: string
                 required:
@@ -96,3 +84,11 @@ spec:
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,11 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
   name: podvolumebackups.velero.io
 spec:
   group: velero.io
@@ -14,57 +16,19 @@ 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: The type of the uploader to handle data transfer
-      jsonPath: .spec.uploaderType
-      name: Uploader Type
-      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:
           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
+            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
+            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
@@ -72,9 +36,8 @@ spec:
             description: PodVolumeBackupSpec is the specification for a PodVolumeBackup.
             properties:
               backupStorageLocation:
-                description: |-
-                  BackupStorageLocation is the name of the backup storage location
-                  where the backup repository is stored.
+                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
@@ -88,73 +51,47 @@ spec:
                     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.
+                    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
+                    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
+                    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/
+                    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
+                    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
+                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                     type: string
                 type: object
-                x-kubernetes-map-type: atomic
               repoIdentifier:
-                description: RepoIdentifier is the backup repository identifier.
+                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.
+                description: Tags are a map of key-value pairs that should be applied
+                  to the volume backup as tags.
                 type: object
-              uploaderSettings:
-                additionalProperties:
-                  type: string
-                description: |-
-                  UploaderSettings are a map of key-value pairs that should be applied to the
-                  uploader configuration.
-                nullable: true
-                type: object
-              uploaderType:
-                description: UploaderType is the type of the uploader to handle the
-                  data transfer.
-                enum:
-                - kopia
-                - restic
-                - ""
-                type: string
               volume:
-                description: |-
-                  Volume is the name of the volume within the Pod to be backed
-                  up.
+                description: Volume is the name of the volume within the Pod to be
+                  backed up.
                 type: string
             required:
             - backupStorageLocation
@@ -167,11 +104,10 @@ spec:
             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
+                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
@@ -191,10 +127,9 @@ spec:
                 - 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.
+                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
@@ -208,10 +143,8 @@ spec:
                   pod volume.
                 type: string
               startTimestamp:
-                description: |-
-                  StartTimestamp records the time a backup was started.
-                  Separate from CreationTimestamp, since that value changes
-                  on restores.
+                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
@@ -220,4 +153,9 @@ spec:
         type: object
     served: true
     storage: true
-    subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,11 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
   name: podvolumerestores.velero.io
 spec:
   group: velero.io
@@ -14,58 +16,19 @@ 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: The type of the uploader to handle data transfer
-      jsonPath: .spec.uploaderType
-      name: Uploader Type
-      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:
           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
+            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
+            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
@@ -73,9 +36,8 @@ spec:
             description: PodVolumeRestoreSpec is the specification for a PodVolumeRestore.
             properties:
               backupStorageLocation:
-                description: |-
-                  BackupStorageLocation is the name of the backup storage location
-                  where the backup repository is stored.
+                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
@@ -85,69 +47,41 @@ spec:
                     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.
+                    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
+                    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
+                    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/
+                    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
+                    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
+                    description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                     type: string
                 type: object
-                x-kubernetes-map-type: atomic
               repoIdentifier:
-                description: RepoIdentifier is the backup repository identifier.
+                description: RepoIdentifier is the restic repository identifier.
                 type: string
               snapshotID:
                 description: SnapshotID is the ID of the volume snapshot to be restored.
                 type: string
-              sourceNamespace:
-                description: SourceNamespace is the original namespace for namaspace
-                  mapping.
-                type: string
-              uploaderSettings:
-                additionalProperties:
-                  type: string
-                description: |-
-                  UploaderSettings are a map of key-value pairs that should be applied to the
-                  uploader configuration.
-                nullable: true
-                type: object
-              uploaderType:
-                description: UploaderType is the type of the uploader to handle the
-                  data transfer.
-                enum:
-                - kopia
-                - restic
-                - ""
-                type: string
               volume:
                 description: Volume is the name of the volume within the Pod to be
                   restored.
@@ -157,17 +91,15 @@ spec:
             - pod
             - repoIdentifier
             - snapshotID
-            - sourceNamespace
             - 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
+                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
@@ -183,10 +115,9 @@ spec:
                 - 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.
+                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
@@ -196,8 +127,7 @@ spec:
                     type: integer
                 type: object
               startTimestamp:
-                description: |-
-                  StartTimestamp records the time a restore was started.
+                description: StartTimestamp records the time a restore was started.
                   The server's time is used for StartTimestamps
                 format: date-time
                 nullable: true
@@ -206,4 +136,9 @@ spec:
         type: object
     served: true
     storage: true
-    subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -0,0 +1,89 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+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
+  scope: Namespaced
+  versions:
+  - name: v1
+    schema:
+      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
+    served: true
+    storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,11 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
   name: schedules.velero.io
 spec:
   group: velero.io
@@ -14,130 +16,49 @@ 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
-    - jsonPath: .spec.paused
-      name: Paused
-      type: boolean
-    name: v1
+  - name: v1
     schema:
       openAPIV3Schema:
-        description: |-
-          Schedule is a Velero resource that represents a pre-scheduled or
-          periodic Backup that should be run.
+        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
+            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
+            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:
-              paused:
-                description: Paused specifies whether the schedule is paused or not
-                type: boolean
               schedule:
-                description: |-
-                  Schedule is a Cron expression defining when to run
-                  the Backup.
+                description: Schedule is a Cron expression defining when to run the
+                  Backup.
                 type: string
-              skipImmediately:
-                description: |-
-                  SkipImmediately specifies whether to skip backup if schedule is due immediately from `schedule.status.lastBackup` timestamp when schedule is unpaused or if schedule is new.
-                  If true, backup will be skipped immediately when schedule is unpaused if it is due based on .Status.LastBackupTimestamp or schedule is new, and will run at next schedule time.
-                  If false, backup will not be skipped immediately when schedule is unpaused, but will run at next schedule time.
-                  If empty, will follow server configuration (default: false).
-                type: boolean
               template:
-                description: |-
-                  Template is the definition of the Backup to be run
-                  on the provided schedule
+                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
-                  datamover:
-                    description: |-
-                      DataMover specifies the data mover to be used by the backup.
-                      If DataMover is "" or "velero", the built-in data mover will be used.
-                    type: string
-                  defaultVolumesToFsBackup:
-                    description: |-
-                      DefaultVolumesToFsBackup specifies whether pod volume file system backup should be used
-                      for all volumes by default.
-                    nullable: true
-                    type: boolean
                   defaultVolumesToRestic:
-                    description: |-
-                      DefaultVolumesToRestic specifies whether restic should be used to take a
-                      backup of all pod volumes by default.
-
-
-                      Deprecated: this field is no longer used and will be removed entirely in future. Use DefaultVolumesToFsBackup instead.
-                    nullable: true
+                    description: DefaultVolumesToRestic specifies whether restic should
+                      be used to take a backup of all pod volumes by default.
                     type: boolean
-                  excludedClusterScopedResources:
-                    description: |-
-                      ExcludedClusterScopedResources is a slice of cluster-scoped
-                      resource type names to exclude from the backup.
-                      If set to "*", all cluster-scoped resource types are excluded.
-                      The default value is empty.
-                    items:
-                      type: string
-                    nullable: true
-                    type: array
-                  excludedNamespaceScopedResources:
-                    description: |-
-                      ExcludedNamespaceScopedResources is a slice of namespace-scoped
-                      resource type names to exclude from the backup.
-                      If set to "*", all namespace-scoped resource types are excluded.
-                      The default value is empty.
-                    items:
-                      type: string
-                    nullable: true
-                    type: array
                   excludedNamespaces:
-                    description: |-
-                      ExcludedNamespaces contains a list of namespaces that are not
-                      included in the backup.
+                    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.
+                    description: ExcludedResources is a slice of resource names that
+                      are not included in the backup.
                     items:
                       type: string
                     nullable: true
@@ -150,9 +71,9 @@ spec:
                         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.
+                          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
@@ -169,16 +90,16 @@ spec:
                               nullable: true
                               type: array
                             includedNamespaces:
-                              description: |-
-                                IncludedNamespaces specifies the namespaces to which this hook spec applies. If empty, it applies
+                              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
+                              description: IncludedResources specifies the resources
+                                to which this hook spec applies. If empty, it applies
                                 to all resources.
                               items:
                                 type: string
@@ -193,25 +114,26 @@ spec:
                                   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.
+                                    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.
+                                        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.
+                                        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
@@ -223,20 +145,22 @@ spec:
                                 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.
+                                  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
-                              x-kubernetes-map-type: atomic
                             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.
+                              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.
@@ -252,9 +176,10 @@ spec:
                                         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.
+                                        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
@@ -265,9 +190,10 @@ spec:
                                         - 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.
+                                        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
@@ -277,9 +203,10 @@ spec:
                                 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.
+                              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.
@@ -295,9 +222,10 @@ spec:
                                         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.
+                                        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
@@ -308,9 +236,10 @@ spec:
                                         - 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.
+                                        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
@@ -326,56 +255,27 @@ spec:
                         type: array
                     type: object
                   includeClusterResources:
-                    description: |-
-                      IncludeClusterResources specifies whether cluster-scoped resources
-                      should be included for consideration in the backup.
+                    description: IncludeClusterResources specifies whether cluster-scoped
+                      resources should be included for consideration in the backup.
                     nullable: true
                     type: boolean
-                  includedClusterScopedResources:
-                    description: |-
-                      IncludedClusterScopedResources is a slice of cluster-scoped
-                      resource type names to include in the backup.
-                      If set to "*", all cluster-scoped resource types are included.
-                      The default value is empty, which means only related
-                      cluster-scoped resources are included.
-                    items:
-                      type: string
-                    nullable: true
-                    type: array
-                  includedNamespaceScopedResources:
-                    description: |-
-                      IncludedNamespaceScopedResources is a slice of namespace-scoped
-                      resource type names to include in the backup.
-                      The default value is "*".
-                    items:
-                      type: string
-                    nullable: true
-                    type: array
                   includedNamespaces:
-                    description: |-
-                      IncludedNamespaces is a slice of namespace names to include objects
-                      from. If empty, all namespaces are included.
+                    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.
+                    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
-                  itemOperationTimeout:
-                    description: |-
-                      ItemOperationTimeout specifies the time used to wait for asynchronous BackupItemAction operations
-                      The default value is 4 hour.
-                    type: string
                   labelSelector:
-                    description: |-
-                      LabelSelector is a metav1.LabelSelector to filter with
-                      when adding individual objects to the backup. If empty
+                    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:
@@ -383,25 +283,25 @@ spec:
                         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.
+                          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.
+                              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.
+                              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
@@ -413,13 +313,13 @@ spec:
                       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.
+                        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
-                    x-kubernetes-map-type: atomic
                   metadata:
                     properties:
                       labels:
@@ -427,102 +327,20 @@ spec:
                           type: string
                         type: object
                     type: object
-                  orLabelSelectors:
-                    description: |-
-                      OrLabelSelectors is list of metav1.LabelSelector to filter with
-                      when adding individual objects to the backup. If multiple provided
-                      they will be joined by the OR operator. LabelSelector as well as
-                      OrLabelSelectors cannot co-exist in backup request, only one of them
-                      can be used.
-                    items:
-                      description: |-
-                        A label selector is a label query over a set of resources. The result of matchLabels and
-                        matchExpressions are ANDed. An empty label selector matches all objects. A null
-                        label selector matches no objects.
-                      properties:
-                        matchExpressions:
-                          description: matchExpressions is a list of label selector
-                            requirements. The requirements are ANDed.
-                          items:
-                            description: |-
-                              A label selector requirement is a selector that contains values, a key, and an operator that
-                              relates the key and values.
-                            properties:
-                              key:
-                                description: key is the label key that the selector
-                                  applies to.
-                                type: string
-                              operator:
-                                description: |-
-                                  operator represents a key's relationship to a set of values.
-                                  Valid operators are In, NotIn, Exists and DoesNotExist.
-                                type: string
-                              values:
-                                description: |-
-                                  values is an array of string values. If the operator is In or NotIn,
-                                  the values array must be non-empty. If the operator is Exists or DoesNotExist,
-                                  the values array must be empty. This array is replaced during a strategic
-                                  merge patch.
-                                items:
-                                  type: string
-                                type: array
-                            required:
-                            - key
-                            - operator
-                            type: object
-                          type: array
-                        matchLabels:
-                          additionalProperties:
-                            type: string
-                          description: |-
-                            matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
-                            map is equivalent to an element of matchExpressions, whose key field is "key", the
-                            operator is "In", and the values array contains only "value". The requirements are ANDed.
-                          type: object
-                      type: object
-                      x-kubernetes-map-type: atomic
-                    nullable: true
-                    type: array
                   orderedResources:
                     additionalProperties:
                       type: string
-                    description: |-
-                      OrderedResources specifies the backup order of resources of specific Kind.
-                      The map key is the resource name and value is a list of object names separated by commas.
-                      Each resource name has format "namespace/objectname".  For cluster resources, simply use "objectname".
+                    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
-                  resourcePolicy:
-                    description: ResourcePolicy specifies the referenced resource
-                      policies that backup should follow
-                    properties:
-                      apiGroup:
-                        description: |-
-                          APIGroup is the group for the resource being referenced.
-                          If APIGroup is not specified, the specified Kind must be in the core API group.
-                          For any other third-party types, APIGroup is required.
-                        type: string
-                      kind:
-                        description: Kind is the type of resource being referenced
-                        type: string
-                      name:
-                        description: Name is the name of resource being referenced
-                        type: string
-                    required:
-                    - kind
-                    - name
-                    type: object
-                    x-kubernetes-map-type: atomic
-                  snapshotMoveData:
-                    description: SnapshotMoveData specifies whether snapshot data
-                      should be moved
-                    nullable: true
-                    type: boolean
                   snapshotVolumes:
-                    description: |-
-                      SnapshotVolumes specifies whether to take snapshots
-                      of any PV's referenced in the set of objects included
-                      in the Backup.
+                    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:
@@ -530,20 +348,9 @@ spec:
                       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.
+                    description: TTL is a time.Duration-parseable string describing
+                      how long the Backup should be retained for.
                     type: string
-                  uploaderConfig:
-                    description: UploaderConfig specifies the configuration for the
-                      uploader.
-                    nullable: true
-                    properties:
-                      parallelFilesUpload:
-                        description: ParallelFilesUpload is the number of files parallel
-                          uploads to perform when using the uploader.
-                        type: integer
-                    type: object
                   volumeSnapshotLocations:
                     description: VolumeSnapshotLocations is a list containing names
                       of VolumeSnapshotLocations associated with this backup.
@@ -552,9 +359,8 @@ spec:
                     type: array
                 type: object
               useOwnerReferencesInBackup:
-                description: |-
-                  UseOwnerReferencesBackup specifies whether to use
-                  OwnerReferences on backups created by this Schedule.
+                description: UseOwnerReferencesBackup specifies whether to use OwnerReferences
+                  on backups created by this Schedule.
                 nullable: true
                 type: boolean
             required:
@@ -565,17 +371,11 @@ spec:
             description: ScheduleStatus captures the current state of a Velero schedule
             properties:
               lastBackup:
-                description: |-
-                  LastBackup is the last time a Backup was run for this
+                description: LastBackup is the last time a Backup was run for this
                   Schedule schedule
                 format: date-time
                 nullable: true
                 type: string
-              lastSkipped:
-                description: LastSkipped is the last time a Schedule was skipped
-                format: date-time
-                nullable: true
-                type: string
               phase:
                 description: Phase is the current phase of the Schedule
                 enum:
@@ -584,9 +384,8 @@ spec:
                 - FailedValidation
                 type: string
               validationErrors:
-                description: |-
-                  ValidationErrors is a slice of all validation errors (if
-                  applicable)
+                description: ValidationErrors is a slice of all validation errors
+                  (if applicable)
                 items:
                   type: string
                 type: array
@@ -594,4 +393,9 @@ spec:
         type: object
     served: true
     storage: true
-    subresources: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,11 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
   name: serverstatusrequests.velero.io
 spec:
   group: velero.io
@@ -19,24 +21,18 @@ spec:
   - name: v1
     schema:
       openAPIV3Schema:
-        description: |-
-          ServerStatusRequest is a request to access current status information about
-          the Velero server.
+        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
+            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
+            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
@@ -69,9 +65,8 @@ spec:
                 nullable: true
                 type: array
               processedTimestamp:
-                description: |-
-                  ProcessedTimestamp is when the ServerStatusRequest was processed
-                  by the ServerStatusRequestController.
+                description: ProcessedTimestamp is when the ServerStatusRequest was
+                  processed by the ServerStatusRequestController.
                 format: date-time
                 nullable: true
                 type: string
@@ -82,3 +77,11 @@ spec:
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

@@ -1,9 +1,11 @@
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.3.0
+  creationTimestamp: null
   name: volumesnapshotlocations.velero.io
 spec:
   group: velero.io
@@ -11,8 +13,6 @@ spec:
     kind: VolumeSnapshotLocation
     listKind: VolumeSnapshotLocationList
     plural: volumesnapshotlocations
-    shortNames:
-    - vsl
     singular: volumesnapshotlocation
   scope: Namespaced
   versions:
@@ -23,19 +23,14 @@ spec:
           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
+            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
+            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
@@ -48,27 +43,6 @@ spec:
                   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
-                x-kubernetes-map-type: atomic
               provider:
                 description: Provider is the provider of the volume storage.
                 type: string
@@ -90,3 +64,9 @@ spec:
         type: object
     served: true
     storage: true
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

config/crd/v1beta1/crds/doc.go

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

config/crd/v2alpha1/bases/velero.io_datadownloads.yaml

@@ -1,189 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
-  name: datadownloads.velero.io
-spec:
-  group: velero.io
-  names:
-    kind: DataDownload
-    listKind: DataDownloadList
-    plural: datadownloads
-    singular: datadownload
-  scope: Namespaced
-  versions:
-  - additionalPrinterColumns:
-    - description: DataDownload status such as New/InProgress
-      jsonPath: .status.phase
-      name: Status
-      type: string
-    - description: Time duration since this DataDownload was started
-      jsonPath: .status.startTimestamp
-      name: Started
-      type: date
-    - description: Completed bytes
-      format: int64
-      jsonPath: .status.progress.bytesDone
-      name: Bytes Done
-      type: integer
-    - description: Total bytes
-      format: int64
-      jsonPath: .status.progress.totalBytes
-      name: Total Bytes
-      type: integer
-    - description: Name of the Backup Storage Location where the backup data is stored
-      jsonPath: .spec.backupStorageLocation
-      name: Storage Location
-      type: string
-    - description: Time duration since this DataDownload was created
-      jsonPath: .metadata.creationTimestamp
-      name: Age
-      type: date
-    - description: Name of the node where the DataDownload is processed
-      jsonPath: .status.node
-      name: Node
-      type: string
-    name: v2alpha1
-    schema:
-      openAPIV3Schema:
-        description: DataDownload acts as the protocol between data mover plugins
-          and data mover controller for the datamover restore operation
-        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: DataDownloadSpec is the specification for a DataDownload.
-            properties:
-              backupStorageLocation:
-                description: |-
-                  BackupStorageLocation is the name of the backup storage location
-                  where the backup repository is stored.
-                type: string
-              cancel:
-                description: |-
-                  Cancel indicates request to cancel the ongoing DataDownload. It can be set
-                  when the DataDownload is in InProgress phase
-                type: boolean
-              dataMoverConfig:
-                additionalProperties:
-                  type: string
-                description: DataMoverConfig is for data-mover-specific configuration
-                  fields.
-                type: object
-              datamover:
-                description: |-
-                  DataMover specifies the data mover to be used by the backup.
-                  If DataMover is "" or "velero", the built-in data mover will be used.
-                type: string
-              operationTimeout:
-                description: |-
-                  OperationTimeout specifies the time used to wait internal operations,
-                  before returning error as timeout.
-                type: string
-              snapshotID:
-                description: SnapshotID is the ID of the Velero backup snapshot to
-                  be restored from.
-                type: string
-              sourceNamespace:
-                description: |-
-                  SourceNamespace is the original namespace where the volume is backed up from.
-                  It may be different from SourcePVC's namespace if namespace is remapped during restore.
-                type: string
-              targetVolume:
-                description: TargetVolume is the information of the target PVC and
-                  PV.
-                properties:
-                  namespace:
-                    description: Namespace is the target namespace
-                    type: string
-                  pv:
-                    description: PV is the name of the target PV that is created by
-                      Velero restore
-                    type: string
-                  pvc:
-                    description: PVC is the name of the target PVC that is created
-                      by Velero restore
-                    type: string
-                required:
-                - namespace
-                - pv
-                - pvc
-                type: object
-            required:
-            - backupStorageLocation
-            - operationTimeout
-            - snapshotID
-            - sourceNamespace
-            - targetVolume
-            type: object
-          status:
-            description: DataDownloadStatus is the current status of a DataDownload.
-            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 DataDownload's status.
-                type: string
-              node:
-                description: Node is name of the node where the DataDownload is processed.
-                type: string
-              phase:
-                description: Phase is the current state of the DataDownload.
-                enum:
-                - New
-                - Accepted
-                - Prepared
-                - InProgress
-                - Canceling
-                - Canceled
-                - 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
-    served: true
-    storage: true
-    subresources: {}

config/crd/v2alpha1/bases/velero.io_datauploads.yaml

@@ -1,214 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
-  name: datauploads.velero.io
-spec:
-  group: velero.io
-  names:
-    kind: DataUpload
-    listKind: DataUploadList
-    plural: datauploads
-    singular: dataupload
-  scope: Namespaced
-  versions:
-  - additionalPrinterColumns:
-    - description: DataUpload status such as New/InProgress
-      jsonPath: .status.phase
-      name: Status
-      type: string
-    - description: Time duration since this DataUpload was started
-      jsonPath: .status.startTimestamp
-      name: Started
-      type: date
-    - description: Completed bytes
-      format: int64
-      jsonPath: .status.progress.bytesDone
-      name: Bytes Done
-      type: integer
-    - description: Total bytes
-      format: int64
-      jsonPath: .status.progress.totalBytes
-      name: Total Bytes
-      type: integer
-    - description: Name of the Backup Storage Location where this backup should be
-        stored
-      jsonPath: .spec.backupStorageLocation
-      name: Storage Location
-      type: string
-    - description: Time duration since this DataUpload was created
-      jsonPath: .metadata.creationTimestamp
-      name: Age
-      type: date
-    - description: Name of the node where the DataUpload is processed
-      jsonPath: .status.node
-      name: Node
-      type: string
-    name: v2alpha1
-    schema:
-      openAPIV3Schema:
-        description: DataUpload acts as the protocol between data mover plugins and
-          data mover controller for the datamover backup operation
-        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: DataUploadSpec is the specification for a DataUpload.
-            properties:
-              backupStorageLocation:
-                description: |-
-                  BackupStorageLocation is the name of the backup storage location
-                  where the backup repository is stored.
-                type: string
-              cancel:
-                description: |-
-                  Cancel indicates request to cancel the ongoing DataUpload. It can be set
-                  when the DataUpload is in InProgress phase
-                type: boolean
-              csiSnapshot:
-                description: If SnapshotType is CSI, CSISnapshot provides the information
-                  of the CSI snapshot.
-                nullable: true
-                properties:
-                  snapshotClass:
-                    description: SnapshotClass is the name of the snapshot class that
-                      the volume snapshot is created with
-                    type: string
-                  storageClass:
-                    description: StorageClass is the name of the storage class of
-                      the PVC that the volume snapshot is created from
-                    type: string
-                  volumeSnapshot:
-                    description: VolumeSnapshot is the name of the volume snapshot
-                      to be backed up
-                    type: string
-                required:
-                - storageClass
-                - volumeSnapshot
-                type: object
-              dataMoverConfig:
-                additionalProperties:
-                  type: string
-                description: DataMoverConfig is for data-mover-specific configuration
-                  fields.
-                nullable: true
-                type: object
-              datamover:
-                description: |-
-                  DataMover specifies the data mover to be used by the backup.
-                  If DataMover is "" or "velero", the built-in data mover will be used.
-                type: string
-              operationTimeout:
-                description: |-
-                  OperationTimeout specifies the time used to wait internal operations,
-                  before returning error as timeout.
-                type: string
-              snapshotType:
-                description: SnapshotType is the type of the snapshot to be backed
-                  up.
-                type: string
-              sourceNamespace:
-                description: |-
-                  SourceNamespace is the original namespace where the volume is backed up from.
-                  It is the same namespace for SourcePVC and CSI namespaced objects.
-                type: string
-              sourcePVC:
-                description: SourcePVC is the name of the PVC which the snapshot is
-                  taken for.
-                type: string
-            required:
-            - backupStorageLocation
-            - operationTimeout
-            - snapshotType
-            - sourceNamespace
-            - sourcePVC
-            type: object
-          status:
-            description: DataUploadStatus is the current status of a DataUpload.
-            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
-              dataMoverResult:
-                additionalProperties:
-                  type: string
-                description: DataMoverResult stores data-mover-specific information
-                  as a result of the DataUpload.
-                nullable: true
-                type: object
-              message:
-                description: Message is a message about the DataUpload's status.
-                type: string
-              node:
-                description: Node is name of the node where the DataUpload is processed.
-                type: string
-              path:
-                description: Path is the full path of the snapshot volume being backed
-                  up.
-                type: string
-              phase:
-                description: Phase is the current state of the DataUpload.
-                enum:
-                - New
-                - Accepted
-                - Prepared
-                - InProgress
-                - Canceling
-                - Canceled
-                - 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 in the
-                  backup repository.
-                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
-    served: true
-    storage: true
-    subresources: {}

config/rbac/role.yaml

@@ -1,67 +1,11 @@
+
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: velero-perms
+  creationTimestamp: null
+  name: manager-role
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumerclaims
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumes
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - get
-- apiGroups:
-  - velero.io
-  resources:
-  - backuprepositories
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - velero.io
-  resources:
-  - backuprepositories/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - velero.io
-  resources:
-  - backups
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - velero.io
-  resources:
-  - backups/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - velero.io
   resources:
@@ -82,66 +26,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - velero.io
-  resources:
-  - datadownloads
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - velero.io
-  resources:
-  - datadownloads/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - velero.io
-  resources:
-  - datauploads
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - velero.io
-  resources:
-  - datauploads/status
-  verbs:
-  - 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:
@@ -162,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:
-  - restores
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - velero.io
-  resources:
-  - restores/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:
@@ -262,15 +66,3 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - velero.io
-  resources:
-  - volumesnapshotlocations
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch

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,11 +505,9 @@ spec:
                       - BackupResourceList
                       - RestoreLog
                       - RestoreResults
-                      - CSIBackupVolumeSnapshots
-                      - CSIBackupVolumeSnapshotContents
                   type: string
                 name:
-                  description: Name is the name of the Kubernetes resource with
+                  description: Name is the name of the kubernetes resource with
                     which the file is associated.
                   type: string
               required:

design/CLI/PoC/base/deployment.yaml

@@ -57,7 +57,7 @@ spec:
         - emptyDir: {}
           name: scratch
 ---
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   labels:

design/CLI/PoC/overlays/plugins/restic.yaml

@@ -5,22 +5,22 @@ metadata:
   creationTimestamp: null
   labels:
     component: velero
-  name: node-agent
+  name: restic
   namespace: velero
 spec:
   selector:
     matchLabels:
-      name: node-agent
+      name: restic
   template:
     metadata:
       creationTimestamp: null
       labels:
         component: velero
-        name: node-agent
+        name: restic
     spec:
       containers:
         - args:
-            - node-agent
+            - restic
             - server
           command:
             - /velero
@@ -43,15 +43,12 @@ spec:
               value: /credentials/cloud
           image: velero/velero:latest
           imagePullPolicy: Always
-          name: node-agent
+          name: restic
           resources: {}
           volumeMounts:
             - mountPath: /host_pods
               mountPropagation: HostToContainer
               name: host-pods
-            - mountPath: /var/lib/kubelet/plugins
-              mountPropagation: HostToContainer
-              name: host-plugins
             - mountPath: /scratch
               name: scratch
             - mountPath: /credentials
@@ -63,9 +60,6 @@ spec:
         - hostPath:
             path: /var/lib/kubelet/pods
           name: host-pods
-        - hostPath:
-            path: /var/lib/kubelet/plugins
-          name: host-plugins
         - emptyDir: {}
           name: scratch
         - name: cloud-credentials

design/Implemented/Extend-VolumePolicies-to-support-more-actions.md

@@ -1,344 +0,0 @@
-# Extend VolumePolicies to support more actions
-
-## Abstract
-
-Currently, the [VolumePolicies feature](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/handle-backup-of-volumes-by-resources-filters.md) which can be used to filter/handle volumes during backup only supports the skip action on matching conditions. Users need more actions to be supported.
-
-## Background
-
-The `VolumePolicies` feature was introduced in Velero 1.11 as a flexible way to handle volumes. The main agenda of
-introducing the VolumePolicies feature was to improve the overall user experience when performing backup operations
-for volume resources, the feature enables users to group volumes according the `conditions` (criteria) specified and
-also lets you specify the `action` that velero needs to take for these grouped volumes during the backup operation.
-The limitation being that currently `VolumePolicies` only supports `skip` as an action, We want to extend the `action`
-functionality to support more usable options like `fs-backup` (File system backup) and `snapshot` (VolumeSnapshots).
-
-## Goals
-- Extending the VolumePolicies to support more actions like `fs-backup` (File system backup) and `snapshot` (VolumeSnapshots).
-- Improve user experience when backing up Volumes via Velero
-
-## Non-Goals
-- No changes to existing approaches to opt-in/opt-out annotations for volumes
-- No changes to existing `VolumePolicies` functionalities
-- No additions or implementations to support more granular actions like `snapshot-csi` and `snapshot-datamover`. These actions can be implemented as a future enhancement
-
-
-## Use-cases/Scenarios
-
-**Use-case 1:**
-- A user wants to use `snapshot` (volumesnapshots) backup option for all the csi supported volumes and `fs-backup` for the rest of the volumes.
-- Currently, velero supports this use-case but the user experience is not that great.
-- The user will have to individually annotate the volume mounting pod with the annotation "backup.velero.io/backup-volumes" for `fs-backup`
-- This becomes cumbersome at scale.
-- Using `VolumePolicies`, the user can just specify 2 simple `VolumePolicies` like for csi supported volumes as `snapshot` action and rest can be backed up`fs-backup` action:
-```yaml
-version: v1
-volumePolicies:
-  - conditions:
-      storageClass:
-        - gp2
-    action:
-      type: snapshot
-  - conditions: {}
-    action:
-      type: fs-backup
-```
-
-**Use-case 2:**
-- A user wants to use `fs-backup` for nfs volumes pertaining to a particular server
-- In such a scenario the user can just specify a `VolumePolicy` like:
-```yaml
-version: v1
-volumePolicies:
-- conditions:
-    nfs:
-      server: 192.168.200.90
-  action:
-    type: fs-backup
-```
-## High-Level Design
-- When the VolumePolicy action is set as `fs-backup` the backup workflow modifications would be:
-  - We call [backupItem() -> backupItemInternal()](https://github.com/vmware-tanzu/velero/blob/main/pkg/backup/item_backupper.go#L95) on all the items that are to be backed up
-  - Here when we encounter [Pod as an item ](https://github.com/vmware-tanzu/velero/blob/main/pkg/backup/item_backupper.go#L195)
-  - We will have to modify the backup workflow to account for the `fs-backup` VolumePolicy action
-
-
-- When the VolumePolicy action is set as `snapshot` the backup workflow modifications would be:
-  - Once again, We call [backupItem() -> backupItemInternal()](https://github.com/vmware-tanzu/velero/blob/main/pkg/backup/item_backupper.go#L95) on all the items that are to be backed up
-  - Here when we encounter [Persistent Volume as an item](https://github.com/vmware-tanzu/velero/blob/d4128542590470b204a642ee43311921c11db880/pkg/backup/item_backupper.go#L253)
-  - And we call the [takePVSnapshot func](https://github.com/vmware-tanzu/velero/blob/d4128542590470b204a642ee43311921c11db880/pkg/backup/item_backupper.go#L508)
-  - We need to modify the takePVSnapshot function to account for the `snapshot` VolumePolicy action.
-  - In case of csi snapshots for PVC objects, these snapshot actions are taken by the velero-plugin-for-csi, we need to modify the [executeActions()](https://github.com/vmware-tanzu/velero/blob/512fe0dabdcb3bbf1ca68a9089056ae549663bcf/pkg/backup/item_backupper.go#L232) function to account for the `snapshot` VolumePolicy action.
-
-**Note:** `Snapshot` action can either be a native snapshot or a csi snapshot, as is the case with the current flow where velero itself makes the decision based on the backup CR.
-
-## Detailed Design
-- Update VolumePolicy action type validation to account for `fs-backup` and `snapshot` as valid VolumePolicy actions.
-- Modifications needed for `fs-backup` action:
-  - Now based on the specification of volume policy on backup request we will decide whether to go via legacy pod annotations approach or the newer volume policy based fs-backup action approach.
-  - If there is a presence of volume policy(fs-backup/snapshot) on the backup request that matches as an action for a volume we use the newer volume policy approach to get the list of the volumes for `fs-backup` action
-  - Else continue with the annotation based legacy approach workflow.
-
-- Modifications needed for `snapshot` action:
-  - In the [takePVSnapshot function](https://github.com/vmware-tanzu/velero/blob/d4128542590470b204a642ee43311921c11db880/pkg/backup/item_backupper.go#L508) we will check the PV fits the volume policy criteria and see if the associated action is `snapshot`
-  - If it is not snapshot then we skip the further workflow and avoid taking the snapshot of the PV
-  - Similarly, For csi snapshot of PVC object, we need to do similar changes in [executeAction() function](https://github.com/vmware-tanzu/velero/blob/512fe0dabdcb3bbf1ca68a9089056ae549663bcf/pkg/backup/item_backupper.go#L348). we will check the PVC fits the volume policy criteria and see if the associated action is `snapshot` via csi plugin
-  - If it is not snapshot then we skip the csi BIA execute action and avoid taking the snapshot of the PVC by not invoking the csi plugin action for the PVC
-
-**Note:**
-- When we are using the `VolumePolicy` approach for backing up the volumes then the volume policy criteria and action need to be specific and explicit, there is no default behavior, if a volume matches `fs-backup` action then `fs-backup` method will be used for that volume and similarly if the volume matches the criteria for `snapshot` action then the snapshot workflow will be used for the volume backup.
-- Another thing to note is the workflow proposed in this design uses the legacy `opt-in/opt-out` approach as a fallback option. For instance, the user specifies a VolumePolicy but for a particular volume included in the backup there are no actions(fs-backup/snapshot) matching in the volume policy for that volume, in such a scenario the legacy approach will be used for backing up the particular volume.
-- The relation between the `VolumePolicy` and the backup's legacy parameter `SnapshotVolumes`: 
-  - The `VolumePolicy`'s `snapshot` action matching for volume has higher priority. When there is a `snapshot` action matching for the selected volume, it will be backed by the snapshot way, no matter of the `backup.Spec.SnapshotVolumes` setting.
-  - If there is no `snapshot` action matching the selected volume in the `VolumePolicy`, then the volume will be backed up by `snapshot` way, if the `backup.Spec.SnapshotVolumes` is not set to false.
-- The relation between the `VolumePolicy` and the backup's legacy filesystem `opt-in/opt-out` approach:
-  - The `VolumePolicy`'s `fs-backup` action matching for volume has higher priority. When there is a `fs-backup` action matching for the selected volume, it will be backed by the fs-backup way, no matter of the `backup.Spec.DefaultVolumesToFsBackup` setting and the pod's `opt-in/opt-out` annotation setting.
-  - If there is no `fs-backup` action matching the selected volume in the `VolumePolicy`, then the volume will be backed up by the legacy `opt-in/opt-out` way.
-
-## Implementation
-
-- The implementation should be included in velero 1.14
-
-- We will introduce a `VolumeHelper` interface. It will consist of two methods:
-```go
-type VolumeHelper interface {
-	ShouldPerformSnapshot(obj runtime.Unstructured, groupResource schema.GroupResource) (bool, error)
-	ShouldPerformFSBackup(volume corev1api.Volume, pod corev1api.Pod) (bool, error)
-}
-```
--  The `VolumeHelperImpl` struct will implement the `VolumeHelper` interface and will consist of the functions that we will use through the backup workflow to accommodate volume policies for PVs and PVCs.
-```go
-type volumeHelperImpl struct {
-	volumePolicy             *resourcepolicies.Policies
-	snapshotVolumes          *bool
-	logger                   logrus.FieldLogger
-	client                   crclient.Client
-	defaultVolumesToFSBackup bool
-	backupExcludePVC         bool
-}
-
-```
-
-- We will create an instance of the structure `volumeHelperImpl` in `item_backupper.go`
-```go
-	itemBackupper := &itemBackupper{
-		...
-		volumeHelperImpl: volumehelper.NewVolumeHelperImpl(
-			resourcePolicy,
-			backupRequest.Spec.SnapshotVolumes,
-			log,
-			kb.kbClient,
-			boolptr.IsSetToTrue(backupRequest.Spec.DefaultVolumesToFsBackup),
-			!backupRequest.ResourceIncludesExcludes.ShouldInclude(kuberesource.PersistentVolumeClaims.String()),
-		),
-	}
-```
-
-
-#### FS-Backup
-- Regarding `fs-backup` action to decide whether to use legacy annotation based approach or volume policy based approach:
-  - We will use the `vh.ShouldPerformFSBackup()` function from the `volumehelper` package
-  - Functions involved in processing `fs-backup` volume policy action will somewhat look like:
-
-```go
-func (v volumeHelperImpl) ShouldPerformFSBackup(volume corev1api.Volume, pod corev1api.Pod) (bool, error) {
-	if !v.shouldIncludeVolumeInBackup(volume) {
-		v.logger.Debugf("skip fs-backup action for pod %s's volume %s, due to not pass volume check.", pod.Namespace+"/"+pod.Name, volume.Name)
-		return false, nil
-	}
-
-	if v.volumePolicy != nil {
-		pvc, err := kubeutil.GetPVCForPodVolume(&volume, &pod, v.client)
-		if err != nil {
-			v.logger.WithError(err).Errorf("fail to get PVC for pod %s", pod.Namespace+"/"+pod.Name)
-			return false, err
-		}
-		pv, err := kubeutil.GetPVForPVC(pvc, v.client)
-		if err != nil {
-			v.logger.WithError(err).Errorf("fail to get PV for PVC %s", pvc.Namespace+"/"+pvc.Name)
-			return false, err
-		}
-
-		action, err := v.volumePolicy.GetMatchAction(pv)
-		if err != nil {
-			v.logger.WithError(err).Errorf("fail to get VolumePolicy match action for PV %s", pv.Name)
-			return false, err
-		}
-
-		if action != nil {
-			if action.Type == resourcepolicies.FSBackup {
-				v.logger.Infof("Perform fs-backup action for volume %s of pod %s due to volume policy match",
-					volume.Name, pod.Namespace+"/"+pod.Name)
-				return true, nil
-			} else {
-				v.logger.Infof("Skip fs-backup action for volume %s for pod %s because the action type is %s",
-					volume.Name, pod.Namespace+"/"+pod.Name, action.Type)
-				return false, nil
-			}
-		}
-	}
-
-	if v.shouldPerformFSBackupLegacy(volume, pod) {
-		v.logger.Infof("Perform fs-backup action for volume %s of pod %s due to opt-in/out way",
-			volume.Name, pod.Namespace+"/"+pod.Name)
-		return true, nil
-	} else {
-		v.logger.Infof("Skip fs-backup action for volume %s of pod %s due to opt-in/out way",
-			volume.Name, pod.Namespace+"/"+pod.Name)
-		return false, nil
-	}
-}
-```
-
-- The main function from the above will be called when we encounter Pods during the backup workflow:
-```go
-			for _, volume := range pod.Spec.Volumes {
-				shouldDoFSBackup, err := ib.volumeHelperImpl.ShouldPerformFSBackup(volume, *pod)
-				if err != nil {
-					backupErrs = append(backupErrs, errors.WithStack(err))
-				}
-				...
-			}
-```
-
-#### Snapshot (PV)
-
-- Making sure that `snapshot` action is skipped for PVs that do not fit the volume policy criteria, for this we will use the `vh.ShouldPerformSnapshot` from the `VolumeHelperImpl(vh)` receiver.
-```go
-func (v *volumeHelperImpl) ShouldPerformSnapshot(obj runtime.Unstructured, groupResource schema.GroupResource) (bool, error) {
-	// check if volume policy exists and also check if the object(pv/pvc) fits a volume policy criteria and see if the associated action is snapshot
-	// if it is not snapshot then skip the code path for snapshotting the PV/PVC
-	pvc := new(corev1api.PersistentVolumeClaim)
-	pv := new(corev1api.PersistentVolume)
-	var err error
-
-	if groupResource == kuberesource.PersistentVolumeClaims {
-		if err = runtime.DefaultUnstructuredConverter.FromUnstructured(obj.UnstructuredContent(), &pvc); err != nil {
-			return false, err
-		}
-
-		pv, err = kubeutil.GetPVForPVC(pvc, v.client)
-		if err != nil {
-			return false, err
-		}
-	}
-
-	if groupResource == kuberesource.PersistentVolumes {
-		if err = runtime.DefaultUnstructuredConverter.FromUnstructured(obj.UnstructuredContent(), &pv); err != nil {
-			return false, err
-		}
-	}
-
-	if v.volumePolicy != nil {
-		action, err := v.volumePolicy.GetMatchAction(pv)
-		if err != nil {
-			return false, err
-		}
-
-		// If there is a match action, and the action type is snapshot, return true,
-		// or the action type is not snapshot, then return false.
-		// If there is no match action, go on to the next check.
-		if action != nil {
-			if action.Type == resourcepolicies.Snapshot {
-				v.logger.Infof(fmt.Sprintf("performing snapshot action for pv %s", pv.Name))
-				return true, nil
-			} else {
-				v.logger.Infof("Skip snapshot action for pv %s as the action type is %s", pv.Name, action.Type)
-				return false, nil
-			}
-		}
-	}
-
-		// If this PV is claimed, see if we've already taken a (pod volume backup)
-	// snapshot of the contents of this PV. If so, don't take a snapshot.
-	if pv.Spec.ClaimRef != nil {
-		pods, err := podvolumeutil.GetPodsUsingPVC(
-			pv.Spec.ClaimRef.Namespace,
-			pv.Spec.ClaimRef.Name,
-			v.client,
-		)
-		if err != nil {
-			v.logger.WithError(err).Errorf("fail to get pod for PV %s", pv.Name)
-			return false, err
-		}
-
-		for _, pod := range pods {
-			for _, vol := range pod.Spec.Volumes {
-				if vol.PersistentVolumeClaim != nil &&
-					vol.PersistentVolumeClaim.ClaimName == pv.Spec.ClaimRef.Name &&
-					v.shouldPerformFSBackupLegacy(vol, pod) {
-					v.logger.Infof("Skipping snapshot of pv %s because it is backed up with PodVolumeBackup.", pv.Name)
-					return false, nil
-				}
-			}
-		}
-	}
-
-	if !boolptr.IsSetToFalse(v.snapshotVolumes) {
-		// If the backup.Spec.SnapshotVolumes is not set, or set to true, then should take the snapshot.
-		v.logger.Infof("performing snapshot action for pv %s as the snapshotVolumes is not set to false")
-		return true, nil
-	}
-
-	v.logger.Infof(fmt.Sprintf("skipping snapshot action for pv %s possibly due to no volume policy setting or snapshotVolumes is false", pv.Name))
-	return false, nil
-}
-```
-
-- The function `ShouldPerformSnapshot` will be used as follows in `takePVSnapshot` function of the backup workflow:
-```go
-	snapshotVolume, err := ib.volumeHelperImpl.ShouldPerformSnapshot(obj, kuberesource.PersistentVolumes)
-	if err != nil {
-		return err
-	}
-
-	if !snapshotVolume {
-		log.Info(fmt.Sprintf("skipping volume snapshot for PV %s as it does not fit the volume policy criteria specified by the user for snapshot action", pv.Name))
-		ib.trackSkippedPV(obj, kuberesource.PersistentVolumes, volumeSnapshotApproach, "does not satisfy the criteria for volume policy based snapshot action", log)
-		return nil
-	}
-```
-
-#### Snapshot (PVC)
-
-- Making sure that `snapshot` action is skipped for PVCs that do not fit the volume policy criteria, for this we will again use the `vh.ShouldPerformSnapshot` from the `VolumeHelperImpl(vh)` receiver.
-- We will pass the `VolumeHelperImpl(vh)` instance in `executeActions` method so that it is available to use.
-```go
-
-```
-- The above function will be used as follows in the `executeActions` function of backup workflow.
-- Considering the vSphere plugin doesn't support the VolumePolicy yet, don't use the VolumePolicy for vSphere plugin by now.
-```go
-		if groupResource == kuberesource.PersistentVolumeClaims {
-			if actionName == csiBIAPluginName {
-				snapshotVolume, err := ib.volumeHelperImpl.ShouldPerformSnapshot(obj, kuberesource.PersistentVolumeClaims)
-				if err != nil {
-					return nil, itemFiles, errors.WithStack(err)
-				}
-
-				if !snapshotVolume {
-					log.Info(fmt.Sprintf("skipping csi volume snapshot for PVC %s as it does not fit the volume policy criteria specified by the user for snapshot action", namespace+"/"+name))
-					ib.trackSkippedPV(obj, kuberesource.PersistentVolumeClaims, volumeSnapshotApproach, "does not satisfy the criteria for volume policy based snapshot action", log)
-					continue
-				}
-			}
-		}
-```
-
-
-## Future Implementation
-It makes sense to add more specific actions in the future, once we deprecate the legacy opt-in/opt-out approach to keep things simple. Another point of note is, csi related action can be
-easier to implement once we decide to merge the csi plugin into main velero code flow.
-In the future, we envision the following actions that can be implemented:
-- `snapshot-native`: only use volume snapshotter (native cloud provider snapshots), do nothing if not present/not compatible
-- `snapshot-csi`: only use csi-plugin, don't use volume snapshotter(native cloud provider snapshots), don't use datamover even if snapshotMoveData is true
-- `snapshot-datamover`: only use csi with datamover, don't use volume snapshotter (native cloud provider snapshots), use datamover even if snapshotMoveData is false
-
-**Note:** The above actions are just suggestions for future scope, we may not use/implement them as is. We could definitely merge these suggested actions as `Snapshot` actions and use volume policy parameters and criteria to segregate them instead of making the user explicitly supply the action names to such granular levels.
-
-## Related to Design
-
-[Handle backup of volumes by resources filters](https://github.com/vmware-tanzu/velero/blob/main/design/Implemented/handle-backup-of-volumes-by-resources-filters.md)
-
-## Alternatives Considered
-Same as the earlier design as this is an extension of the original VolumePolicies design

design/Implemented/backup-resources-order.md

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

design/Implemented/biav2-design.md

@@ -1,103 +0,0 @@
-# Design for BackupItemAction v2 API
-
-## Abstract
-This design includes the changes to the BackupItemAction (BIA) api design as required by the [Item Action Progress Monitoring](general-progress-monitoring.md) feature.
-The BIA v2 interface will have two new methods, and the Execute() return signature will be modified.
-If there are any additional BIA API changes that are needed in the same Velero release cycle as this change, those can be added here as well.
-
-## Background
-This API change is needed to facilitate long-running plugin actions that may not be complete when the Execute() method returns.
-It is an optional feature, so plugins which don't need this feature can simply return an empty operation ID and the new methods can be no-ops.
-This will allow long-running plugin actions to continue in the background while Velero moves on to the next plugin, the next item, etc.
-
-## Goals
-- Allow for BIA Execute() to optionally initiate a long-running operation and report on operation status.
-
-## Non Goals
-- Allowing velero control over when the long-running operation begins.
-
-
-## High-Level Design
-As per the [Plugin Versioning](plugin-versioning.md) design, a new BIAv2 plugin `.proto` file will be created to define the GRPC interface.
-v2 go files will also be created in `plugin/clientmgmt/backupitemaction` and `plugin/framework/backupitemaction`, and a new PluginKind will be created.
-The velero Backup process will be modified to reference v2 plugins instead of v1 plugins.
-An adapter will be created so that any existing BIA v1 plugin can be executed as a v2 plugin when executing a backup.
-
-## Detailed Design
-
-### proto changes (compiled into golang by protoc)
-
-The v2 BackupItemAction.proto will be like the current v1 version with the following changes:
-ExecuteResponse gets a new field:
-```
-message ExecuteResponse {
-    bytes item = 1;
-    repeated generated.ResourceIdentifier additionalItems = 2;
-    string operationID = 3;
-    repeated generated.ResourceIdentifier itemsToUpdate = 4;
-}
-```
-The BackupItemAction service gets two new rpc methods:
-```
-service BackupItemAction {
-    rpc AppliesTo(BackupItemActionAppliesToRequest) returns (BackupItemActionAppliesToResponse);
-    rpc Execute(ExecuteRequest) returns (ExecuteResponse);
-    rpc Progress(BackupItemActionProgressRequest) returns (BackupItemActionProgressResponse);
-    rpc Cancel(BackupItemActionCancelRequest) returns (google.protobuf.Empty);
-}
-```
-To support these new rpc methods, we define new request/response message types:
-```
-message BackupItemActionProgressRequest {
-    string plugin = 1;
-    string operationID = 2;
-    bytes backup = 3;
-}
-
-message BackupItemActionProgressResponse {
-    generated.OperationProgress progress = 1;
-}
-
-message BackupItemActionCancelRequest {
-    string plugin = 1;
-    string operationID = 2;
-    bytes backup = 3;
-}
-
-```
-One new shared message type will be added, as this will also be needed for v2 RestoreItemAction and VolmeSnapshotter:
-```
-message OperationProgress {
-    bool completed = 1;
-    string err = 2;
-    int64 nCompleted = 3;
-    int64 nTotal = 4;
-    string operationUnits = 5;
-    string description = 6;
-    google.protobuf.Timestamp started = 7;
-    google.protobuf.Timestamp updated = 8;
-}
-```
-
-In addition to the two new rpc methods added to the BackupItemAction interface, there is also a new `Name()` method. This one is only actually used internally by Velero to get the name that the plugin was registered with, but it still must be defined in a plugin which implements BackupItemActionV2 in order to implement the interface. It doesn't really matter what it returns, though, as this particular method is not delegated to the plugin via RPC calls. The new (and modified) interface methods for `BackupItemAction` are as follows:
-```
-type BackupItemAction interface {
-...
-	Name() string
-...
-	Execute(item runtime.Unstructured, backup *api.Backup) (runtime.Unstructured, []velero.ResourceIdentifier, string, []velero.ResourceIdentifier, error)
-	Progress(operationID string, backup *api.Backup) (velero.OperationProgress, error)
-	Cancel(operationID string, backup *api.Backup) error
-...
-}
-```
-
-A new PluginKind, `BackupItemActionV2`, will be created, and the backup process will be modified to use this plugin kind.
-See [Plugin Versioning](plugin-versioning.md) for more details on implementation plans, including v1 adapters, etc.
-
-
-## Compatibility
-The included v1 adapter will allow any existing BackupItemAction plugin to work as expected, with an empty operation ID returned from Execute() and no-op Progress() and Cancel() methods.
-
-## Implementation
-This will be implemented during the Velero 1.11 development cycle.

design/Implemented/cluster-scope-resource-filter.md

@@ -1,402 +0,0 @@
-# Proposal to add resource filters for backup can distinguish whether resource is cluster-scoped or namespace-scoped.
-
-- [Proposal to add resource filters for backup can distinguish whether resource is cluster-scoped or namespace-scoped.](#proposal-to-add-resource-filters-for-backup-can-distinguish-whether-resource-is-cluster-scoped-or-namespace-scoped)
-	- [Abstract](#abstract)
-	- [Background](#background)
-	- [Goals](#goals)
-	- [Non Goals](#non-goals)
-	- [High-Level Design](#high-level-design)
-		- [Parameters Rules](#parameters-rules)
-		- [Using scenarios:](#using-scenarios)
-			- [no namespace-scoped resources + some cluster-scoped resources](#no-namespace-scoped-resources--some-cluster-scoped-resources)
-			- [no namespace-scoped resources + all cluster-scoped resources](#no-namespace-scoped-resources--all-cluster-scoped-resources)
-			- [some namespace-scoped resources + no cluster-scoped resources](#some-namespace-scoped-resources--no-cluster-scoped-resources)
-				- [scenario 1](#scenario-1)
-				- [scenario 2](#scenario-2)
-				- [scenario 3](#scenario-3)
-				- [scenario 4](#scenario-4)
-			- [some namespace-scoped resources + only related cluster-scoped resources](#some-namespace-scoped-resources--only-related-cluster-scoped-resources)
-				- [scenario 1](#scenario-1-1)
-				- [scenario 2](#scenario-2-1)
-				- [scenario 3](#scenario-3-1)
-			- [some namespace-scoped resources + some additional cluster-scoped resources](#some-namespace-scoped-resources--some-additional-cluster-scoped-resources)
-				- [scenario 1](#scenario-1-2)
-				- [scenario 2](#scenario-2-2)
-				- [scenario 3](#scenario-3-2)
-				- [scenario 4](#scenario-4-1)
-			- [some namespace-scoped resources + all cluster-scoped resources](#some-namespace-scoped-resources--all-cluster-scoped-resources)
-				- [scenario 1](#scenario-1-3)
-				- [scenario 2](#scenario-2-3)
-				- [scenario 3](#scenario-3-3)
-			- [all namespace-scoped resources + no cluster-scoped resources](#all-namespace-scoped-resources--no-cluster-scoped-resources)
-			- [all namespace-scoped resources + some additional cluster-scoped resources](#all-namespace-scoped-resources--some-additional-cluster-scoped-resources)
-			- [all namespace-scoped resources + all cluster-scoped resources](#all-namespace-scoped-resources--all-cluster-scoped-resources)
-			- [describe command change](#describe-command-change)
-	- [Detailed Design](#detailed-design)
-	- [Alternatives Considered](#alternatives-considered)
-	- [Security Considerations](#security-considerations)
-	- [Compatibility](#compatibility)
-	- [Implementation](#implementation)
-	- [Open Issues](#open-issues)
-
-## Abstract
-The current filter (IncludedResources/ExcludedResources + IncludeClusterResources flag) is not enough for some special cases, e.g. all namespace-scoped resources + some kind of cluster-scoped resource and all namespace-scoped resources + cluster-scoped resource excludes.
-Propose to add a new group of resource filtering parameters, which can distinguish cluster-scoped and namespace-scoped resources.
-
-## Background
-There are two sets of resource filters for Velero: `IncludedNamespaces/ExcludedNamespaces` and `IncludedResources/ExcludedResources`. 
-`IncludedResources` means only including the resource types specified in the parameter. Both cluster-scoped and namespace-scoped resources are handled in this parameter by now.
-The k8s resources are separated into cluster-scoped and namespace-scoped.
-As a result, it's hard to include all resources in one group and only including specified resource in the other group.
-
-## Goals
-- Make Velero can support more complicated namespace-scoped and cluster-scoped resources filtering scenarios in backup.
-
-## Non Goals
-- Enrich the resource filtering rules, for example, advanced PV filtering and filtering by resource names.
-
-
-## High-Level Design
-Four new parameters are added into command `velero backup create`: `--include-cluster-scoped-resources`, `--exclude-cluster-scoped-resources`, `--include-namespace-scoped-resources` and `--exclude-namespace-scoped-resources`. 
-`--include-cluster-scoped-resources` and `--exclude-cluster-scoped-resources` are used to filter cluster-scoped resources included or excluded in backup per resource type.
-`--include-namespace-scoped-resources` and `--exclude-namespace-scoped-resources` are used to filter namespace-scoped resources included or excluded in backup per resource type.
-Restore and other code pieces also use resource filtering will be handled in future releases.
-
-### Parameters Rules
-
-* `--include-cluster-scoped-resources`, `--include-namespace-scoped-resources`, `--exclude-cluster-scoped-resources` and `--exclude-namespace-scoped-resources` valid value include `*` and comma separated string. Each element of the CSV string should a k8s resource name. The format should be `resource.group`, such as `storageclasses.storage.k8s.io.`.
-
-* `--include-cluster-scoped-resources`, `--include-namespace-scoped-resources`, `--exclude-cluster-scoped-resources` and `--exclude-namespace-scoped-resources` parameters are mutual exclusive with `--include-cluster-resources`, `--include-resources` and `--exclude-resources` parameters. If both sets of parameters are provisioned, validation failure should be returned.
-
-* `--include-cluster-scoped-resources` and `--exclude-cluster-scoped-resources` should only contain cluster-scoped resource type names. If namespace-scoped resource type names are included, they are ignored.
-
-* If there are conflicts between `--include-cluster-scoped-resources` and `--exclude-cluster-scoped-resources` specified resources type lists, `--exclude-cluster-scoped-resources` parameter has higher priority.
-
-* `--include-namespace-scoped-resources` and `--exclude-namespace-scoped-resources` should only contain namespace-scoped resource type names. If cluster-scoped resource type names are included, they are ignored.
-
-* If there are conflicts between `--include-namespace-scoped-resources` and `--exclude-namespace-scoped-resources` specified resources type lists, `--exclude-namespace-scoped-resources` parameter has higher priority.
-
-* If  `--include-namespace-scoped-resources` is not present, it means all namespace-scoped resources are included per resource type.
-
-* If both `--include-cluster-scoped-resources` and `--exclude-cluster-scoped-resources` are not present, it means no additional cluster-scoped resource is included per resource type, just as the existing `--include-cluster-resources` parameter not setting value. Cluster-scoped resources are related to the namespace-scoped resources, which means those are returned in the namespace-scoped resources' BackupItemAction's result AdditionalItems array, are still included in backup by default. Taking backing up PVC scenario as an example, PVC is namespace-scoped, PV is cluster-scoped. PVC's BIA will include PVC related PV into backup too.
-
-### Using scenarios:
-Please notice, if the scenario give the example of using old filtering parameters (`--include-cluster-resources`, `--include-resources` and `--exclude-resources`), that means the old parameters also work for this case. If old parameters example is not given, that means they don't work for this scenario, only new parameters (`--include-cluster-scoped-resources`, `--include-namespace-scoped-resources`, `--exclude-cluster-scoped-resources` and `--exclude-namespace-scoped-resources`) work.
-
-#### no namespace-scoped resources + some cluster-scoped resources
-The following command means backup no namespace-scoped resources and some cluster-scoped resources.
-
-``` bash
-velero backup create <backup-name>
-	--exclude-namespace-scoped-resources=*
-	--include-cluster-scoped-resources=storageclass
-```
-
-#### no namespace-scoped resources + all cluster-scoped resources
-The following command means backup no namespace-scoped resources and all cluster-scoped resources.
-
-``` bash
-velero backup create <backup-name>
-	--exclude-namespace-scoped-resources=*
-	--include-cluster-scoped-resources=*
-```
-
-#### some namespace-scoped resources + no cluster-scoped resources
-##### scenario 1
-The following commands mean backup all resources in namespaces default and kube-system, and no cluster-scoped resources.
-
-Example of new parameters:
-``` bash
-velero backup create <backup-name>
-	--include-namespaces=default,kube-system
-	--exclude-cluster-scoped-resources=*
-```
-
-Example of old parameters:
-``` bash
-velero backup create <backup-name>
-	--include-namespaces=default,kube-system
-	--include-cluster-resources=false
-```
-##### scenario 2
-The following commands mean backup PVC, Deployment, Service, Endpoint, Pod and ReplicaSet resources in all namespaces, and no cluster-scoped resources. Although PVC's related PV should be included, due to no cluster-scoped resources are included, so they are ruled out too.
-
-Example of new parameters:
-``` bash
-velero backup create <backup-name>
-	--include-namespace-scoped-resources=persistentvolumeclaim,deployment,service,endpoint,pod,replicaset
-	--exclude-cluster-scope-resources=*
-```
-
-Example of old parameters:
-``` bash
-velero backup create <backup-name>
-	--include-resources=persistentvolumeclaim,deployment,service,endpoint,pod,replicaset
-	--include-cluster-resources=false
-```
-##### scenario 3
-The following commands mean backup PVC, Deployment, Service, Endpoint, Pod and ReplicaSet resources in namespace default and kube-system, and no cluster-scoped resources. Although PVC's related PV should be included, due to no cluster-scoped resources are included, so they are ruled out too.
-
-Example of new parameters:
-``` bash
-velero backup create <backup-name>
-	--include-namespaces=default,kube-system
-	--include-namespace-scoped-resources=persistentvolumeclaim,deployment,service,endpoint,pod,replicaset
-	--exclude-cluster-scope-resources=*
-```
-
-Example of old parameters:
-``` bash
-velero backup create <backup-name>
-	--include-namespaces=default,kube-system
-	--include-resources=persistentvolumeclaim,deployment,service,endpoint,pod,replicaset
-	--include-cluster-resources=false
-```
-##### scenario 4
-The following commands mean backup all resources except Ingress type resources in all namespaces, and no cluster-scoped resources.
-
-Example of new parameters:
-``` bash
-velero backup create <backup-name>
-	--exclude-namespace-scoped-resources=ingress
-	--exclude-cluster-scoped-resources=*
-```
-
-Example of old parameters:
-``` bash
-velero backup create <backup-name>
-	--exclude-resources=ingress
-	--include-cluster-resources=false
-```
-
-#### some namespace-scoped resources + only related cluster-scoped resources
-##### scenario 1
-This means backup all resources in namespaces default and kube-system, and related cluster-scoped resources.
-``` bash
-velero backup create <backup-name>
-	--include-namespaces=default,kube-system
-```
-
-##### scenario 2
-This means backup pods and configmaps in namespaces default and kube-system, and related cluster-scoped resources.
-``` bash
-velero backup create <backup-name>
-	--include-namespaces=default,kube-system
-	--include-namespace-scoped-resources=pods,configmaps
-```
-
-##### scenario 3
-This means backup all resources except Ingress type resources in all namespaces, and related cluster-scoped resources.
-
-Example of new parameters:
-``` bash
-velero backup create <backup-name>
-	--exclude-namespace-scoped-resources=ingress
-```
-
-Example of old parameters:
-``` bash
-velero backup create <backup-name>
-	--exclude-resources=ingress
-```
-
-#### some namespace-scoped resources + some additional cluster-scoped resources
-##### scenario 1
-This means backup all resources in namespace in default, kube-system, and related cluster-scoped resources, plus all StorageClass resources.
-``` bash
-velero backup create <backup-name>
-	--include-namespaces=default,kube-system
-	--include-cluster-scoped-resources=storageclass
-```
-
-##### scenario 2
-This means backup PVC, Deployment, Service, Endpoint, Pod and ReplicaSet resources in all namespaces, and related cluster-scoped resources, plus all StorageClass resources, and PVC related PV.
-``` bash
-velero backup create <backup-name>
-	--include-namespace-scoped-resources=persistentvolumeclaim,deployment,service,endpoint,pod,replicaset
-	--include-cluster-scoped-resources=storageclass
-```
-
-##### scenario 3
-This means backup PVC, Deployment, Service, Endpoint, Pod and ReplicaSet resources in default and kube-system namespaces, and related cluster-scoped resources, plus all StorageClass resources, and PVC related PV.
-``` bash
-velero backup create <backup-name>
-	--include-namespace-scoped-resources=persistentvolumeclaim,deployment,service,endpoint,pod,replicaset
-	--include-namespaces=default,kube-system
-	--include-cluster-scoped-resources=storageclass
-```
-
-##### scenario 4
-This means backup PVC, Deployment, Service, Endpoint, Pod and ReplicaSet resources in default and kube-system namespaces, and related cluster-scoped resources, plus all cluster-scoped resources except StorageClass type resources.
-``` bash
-velero backup create <backup-name>
-	--include-namespace-scoped-resources=persistentvolumeclaim,deployment,service,endpoint,pod,replicaset
-	--include-namespaces=default,kube-system
-	--exclude-cluster-scoped-resources=storageclass
-```
-
-#### some namespace-scoped resources + all cluster-scoped resources
-##### scenario 1
-The following commands mean backup all resources in namespace in default, kube-system, and all cluster-scoped resources.
-
-Example of new parameters:
-``` bash
-velero backup create <backup-name>
-	--include-namespaces=default,kube-system
-	--include-cluster-scoped-resources=*
-```
-
-Example of old parameters:
-``` bash
-velero backup create <backup-name>
-	--include-namespaces=default,kube-system
-	--include-cluster-resources=true
-```
-
-##### scenario 2
-This means backup Deployment, Service, Endpoint, Pod and ReplicaSet resources in all namespaces, and all cluster-scoped resources.
-``` bash
-velero backup create <backup-name>
-	--include-namespace-scoped-resources=deployment,service,endpoint,pod,replicaset
-	--include-cluster-scoped-resources=*
-```
-
-##### scenario 3
-This means backup Deployment, Service, Endpoint, Pod and ReplicaSet resources in default and kube-system namespaces, and all cluster-scoped resources.
-``` bash
-velero backup create <backup-name>
-	--include-namespaces=default,kube-system
-	--include-namespace-scoped-resources=deployment,service,endpoint,pod,replicaset
-	--include-cluster-scoped-resources=*
-```
-
-#### all namespace-scoped resources + no cluster-scoped resources
-The following commands all mean backup all namespace-scoped resources and no cluster-scoped resources.
-
-Example of new parameters:
-``` bash
-velero backup create <backup-name>
-	--exclude-cluster-scoped-resources=*
-```
-
-Example of old parameters:
-``` bash
-velero backup create <backup-name>
-	--include-cluster-resources=false
-```
-
-#### all namespace-scoped resources + some additional cluster-scoped resources
-This command means backup all namespace-scoped resources, and related cluster-scoped resources, plus all PersistentVolume resources.
-``` bash
-velero backup create <backup-name>
-	--include-namespaces=*
-	--include-cluster-scoped-resources=persistentvolume
-```
-
-#### all namespace-scoped resources + all cluster-scoped resources
-The following commands have the same meaning: backup all namespace-scoped resources, and all cluster-scoped resources.
-``` bash
-velero backup create <backup-name>
-	--include-cluster-scoped-resources=*
-```
-
-``` bash
-velero backup create <backup-name>
-	--include-cluster-resources=true
-```
-
-#### describe command change
-In `velero backup describe` command, the four new parameters should be outputted too.
-``` bash
- velero backup describe <backup-name>
-......
-
-Namespaces:
-  Included:  ns2
-  Excluded:  <none>
-
-Resources:
-  Included cluster-scoped:    StorageClass,PersistentVolume
-  Excluded cluster-scoped:    <none>
-  Included namespace-scoped:  default
-  Excluded namespace-scoped:  <none>
-......
-```
-
-**Note:** `velero restore` command doesn't support those four new parameter in Velero v1.11, but `velero schedule` supports the four new parameters through backup specification.
-
-## Detailed Design
-With adding `IncludedNamespaceScopedResources`, `ExcludedNamespaceScopedResources`, `IncludedClusterScopedResources` and `ExcludedClusterScopedResources`, the `BackupSpec` looks like:
-``` go
-type BackupSpec struct {
-    ......
-	// IncludedResources is a slice of resource names to include
-	// in the backup. If empty, all resources are included.
-	// +optional
-	// +nullable
-	IncludedResources []string `json:"includedResources,omitempty"`
-
-	// ExcludedResources is a slice of resource names that are not
-	// included in the backup.
-	// +optional
-	// +nullable
-	ExcludedResources []string `json:"excludedResources,omitempty"`
-
-	// IncludeClusterResources specifies whether cluster-scoped resources
-	// should be included for consideration in the backup.
-	// +optional
-	// +nullable
-	IncludeClusterResources *bool `json:"includeClusterResources,omitempty"`
-
-	// IncludedClusterScopedResources is a slice of cluster-scoped
-	// resource type names to include in the backup.
-	// If set to "*", all cluster scope resource types are included.
-	// The default value is empty, which means only related cluster 
-	// scope resources are included.
-	// +optional
-	// +nullable
-	IncludedClusterScopedResources []string `json:"includedClusterScopedResources,omitempty"`
-
-	// ExcludedClusterScopedResources is a slice of cluster-scoped 
-	// resource type names to exclude from the backup.
-	// If set to "*", all cluster scope resource types are excluded.
-	// +optional
-	// +nullable
-	ExcludedClusterScopedResources []string `json:"excludedClusterScopedResources,omitempty"`
-
-	// IncludedNamespaceScopedResources is a slice of namespace-scoped
-	// resource type names to include in the backup.
-	// The default value is "*".
-	// +optional
-	// +nullable
-	IncludedNamespaceScopedResources []string `json:"includedNamespaceScopedResources,omitempty"`
-
-	// ExcludedNamespaceScopedResources is a slice of namespace-scoped
-	// resource type names to exclude from the backup.
-	// If set to "*", all namespace scope resource types are excluded.
-	// +optional
-	// +nullable
-	ExcludedNamespaceScopedResources []string `json:"excludedNamespaceScopedResources,omitempty"`
-    ......
-}
-```
-
-## Alternatives Considered
-Proposal from Jibu Data [Issue 5120](https://github.com/vmware-tanzu/velero/issues/5120#issue-1304534563)
-
-## Security Considerations
-No security impact.
-
-## Compatibility
-The four new parameters cannot be mixed with existing resource filter parameters: `IncludedResources`, `ExcludedResources` and `IncludeClusterResources`.
-If the new parameters and old parameters both appears in command line, or are specified in backup spec, the command line and the backup should fail.
-
-## Implementation
-This change should be included into Velero v1.11.
-New parameters will coexist with `IncludedResources`, `ExcludedResources` and `IncludeClusterResources`.
-Plan to deprecate `IncludedResources`, `ExcludedResources` and `IncludeClusterResources` in future releases, but also open to the community's feedback.
-
-## Open Issues
-`LabelSelector/OrLabelSelectors` apply to namespace-scoped resources.
-It may be reasonable to make them also working on cluster-scoped resources.
-An issue is created to trace this topic [resource label selector not work for cluster-scoped resources](https://github.com/vmware-tanzu/velero/issues/5787)