Merge branch 'main' into 5048-CSI-snapshot-timeout-configurable

.github/auto-assignees.yml

@@ -16,6 +16,7 @@ reviewers:
       - blackpiglet
       - qiuming-best
       - shubham-pampattiwar
+      - Lyndon-Li
 
     tech-writer:
       - a-mccarthy

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

@@ -1,5 +1,9 @@
 name: Pull Request Changelog Check
-on: [pull_request]
+# 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]
 jobs:
 
   build:

MAINTAINERS.md

@@ -13,6 +13,7 @@
 | 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/) |
 
 ## Emeritus Maintainers
 * Adnan Abdulhussein ([prydonius](https://github.com/prydonius))

Makefile

@@ -163,6 +163,7 @@ shell: build-dirs build-env
 	@# under $GOPATH).
 	@docker run \
 		-e GOFLAGS \
+		-e GOPROXY \
 		-i $(TTY) \
 		--rm \
 		-u $$(id -u):$$(id -g) \

Tiltfile

@@ -7,7 +7,7 @@ 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_resticrepositories.yaml',
+    'config/crd/v1/bases/velero.io_backuprepositories.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',

changelogs/unreleased/4926-lyndon

@@ -0,0 +1 @@
+Unified Repository Design

changelogs/unreleased/5051-niulechuan

@@ -0,0 +1 @@
+Fix typo in doc, in https://velero.io/docs/main/restore-reference/ "Restore order" section, "Mamespace" should be "Namespace".

changelogs/unreleased/5053-niulechuan

@@ -0,0 +1 @@
+Move 'velero.io/exclude-from-backup' label string to const

changelogs/unreleased/5101-ywk253100

@@ -0,0 +1 @@
+ Fix bsl validation bug: the BSL is validated continually and doesn't respect the validation period configured

changelogs/unreleased/5110-reasonerjt

@@ -0,0 +1 @@
+Dump stack trace when the plugin server handles panic

changelogs/unreleased/5122-sseago

@@ -0,0 +1 @@
+Modify BackupStoreGetter to avoid BSL spec changes

changelogs/unreleased/5128-reasonerjt

@@ -0,0 +1 @@
+Let "make shell xxx" respect GOPROXY

changelogs/unreleased/5135-reasonerjt

@@ -0,0 +1 @@
+Update the CRD for kopia integration

changelogs/unreleased/5142-lyndon

@@ -0,0 +1,4 @@
+Kopia Integration: Add the Unified Repository Interface definition.
+Kopia Integration: Add the changes for Unified Repository storage config.
+
+Related Issues; #5076, #5080

changelogs/unreleased/5143-ywk253100

@@ -0,0 +1 @@
+This commit splits the pkg/restic package into several packages to support Kopia integration works

changelogs/unreleased/5145-jxun

@@ -0,0 +1 @@
+Delay CA file deletion in PVB controller.

changelogs/unreleased/5148-jxun

@@ -0,0 +1 @@
+VolumeSnapshotLocation refactor with kubebuilder.

changelogs/unreleased/5157-jxun

@@ -0,0 +1 @@
+Add labeled and unlabeled events for PR changelog check action.

changelogs/unreleased/5165-reasonerjt

@@ -0,0 +1 @@
+Skip registering "crd-remap-version" plugin when feature flag "EnableAPIGroupVersions" is set

changelogs/unreleased/5167-lyndon

@@ -0,0 +1 @@
+Add changes for Kopia Integration: Unified Repository Provider - Repo Password

changelogs/unreleased/5172-qiuming-best

@@ -0,0 +1 @@
+Fix restic backups to multiple backup storage locations bug

changelogs/unreleased/5174-jxun

@@ -0,0 +1 @@
+Reduce CRD size.

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

@@ -6,20 +6,23 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
-  name: resticrepositories.velero.io
+  name: backuprepositories.velero.io
 spec:
   group: velero.io
   names:
-    kind: ResticRepository
-    listKind: ResticRepositoryList
-    plural: resticrepositories
-    singular: resticrepository
+    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:
@@ -37,7 +40,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: ResticRepositorySpec is the specification for a ResticRepository.
+            description: BackupRepositorySpec is the specification for a BackupRepository.
             properties:
               backupStorageLocation:
                 description: BackupStorageLocation is the name of the BackupStorageLocation
@@ -47,12 +50,19 @@ spec:
                 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 restic repository
+                description: VolumeNamespace is the namespace this backup repository
                   contains pod volume backups for.
                 type: string
             required:
@@ -62,7 +72,7 @@ spec:
             - volumeNamespace
             type: object
           status:
-            description: ResticRepositoryStatus is the current status of a ResticRepository.
+            description: BackupRepositoryStatus is the current status of a BackupRepository.
             properties:
               lastMaintenanceTime:
                 description: LastMaintenanceTime is the last time maintenance was
@@ -72,10 +82,10 @@ spec:
                 type: string
               message:
                 description: Message is a message about the current status of the
-                  ResticRepository.
+                  BackupRepository.
                 type: string
               phase:
-                description: Phase is the current state of the ResticRepository.
+                description: Phase is the current state of the BackupRepository.
                 enum:
                 - New
                 - Ready

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

@@ -37,9 +37,13 @@ spec:
       jsonPath: .spec.volume
       name: Volume
       type: string
-    - description: Restic repository identifier for this backup
+    - description: Backup repository identifier for this backup
       jsonPath: .spec.repoIdentifier
-      name: Restic Repo
+      name: Repository ID
+      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
@@ -70,7 +74,7 @@ spec:
             properties:
               backupStorageLocation:
                 description: BackupStorageLocation is the name of the backup storage
-                  location where the restic repository is stored.
+                  location where the backup repository is stored.
                 type: string
               node:
                 description: Node is the name of the node that the Pod is running
@@ -114,14 +118,22 @@ spec:
                     type: string
                 type: object
               repoIdentifier:
-                description: RepoIdentifier is the restic repository identifier.
+                description: RepoIdentifier is the backup 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
+              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.

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

@@ -25,6 +25,10 @@ spec:
       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
@@ -67,7 +71,7 @@ spec:
             properties:
               backupStorageLocation:
                 description: BackupStorageLocation is the name of the backup storage
-                  location where the restic repository is stored.
+                  location where the backup repository is stored.
                 type: string
               pod:
                 description: Pod is a reference to the pod containing the volume to
@@ -107,11 +111,19 @@ spec:
                     type: string
                 type: object
               repoIdentifier:
-                description: RepoIdentifier is the restic repository identifier.
+                description: RepoIdentifier is the backup repository identifier.
                 type: string
               snapshotID:
                 description: SnapshotID is the ID of the volume snapshot to be restored.
                 type: string
+              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.