Merge https://github.com/openshift/oadp-operator:oadp-dev (513180a) into oadp-dev (#1990)

oadp-rebasebot-app[bot] · oadp-maintainers · web-flow · commit 5048a8f99938 · 2025-11-05T09:13:59.000-05:00
* UPSTREAM: &lt;drop&gt;: Updating go modules

* UPSTREAM: &lt;drop&gt;: update Velero CRDs @ oadp-dev

* UPSTREAM: &lt;drop&gt;: make bundle update

---------

Co-authored-by: oadp-team-rebase-bot &lt;oadp-maintainers@redhat.com&gt;
diff --git a/bundle/manifests/velero.io_datadownloads.yaml b/bundle/manifests/velero.io_datadownloads.yaml
@@ -108,6 +108,10 @@ spec:
                 description: SnapshotID is the ID of the Velero backup snapshot to
                   be restored from.
                 type: string
+              snapshotSize:
+                description: SnapshotSize is the logical size in Bytes of the snapshot.
+                format: int64
+                type: integer
               sourceNamespace:
                 description: |-
                   SourceNamespace is the original namespace where the volume is backed up from.
diff --git a/bundle/manifests/velero.io_datauploads.yaml b/bundle/manifests/velero.io_datauploads.yaml
@@ -33,6 +33,12 @@ spec:
       jsonPath: .status.progress.totalBytes
       name: Total Bytes
       type: integer
+    - description: Incremental bytes
+      format: int64
+      jsonPath: .status.incrementalBytes
+      name: Incremental Bytes
+      priority: 10
+      type: integer
     - description: Name of the Backup Storage Location where this backup should be
         stored
       jsonPath: .spec.backupStorageLocation
@@ -173,6 +179,11 @@ spec:
                   as a result of the DataUpload.
                 nullable: true
                 type: object
+              incrementalBytes:
+                description: IncrementalBytes holds the number of bytes new or changed
+                  since the last backup
+                format: int64
+                type: integer
               message:
                 description: Message is a message about the DataUpload's status.
                 type: string
diff --git a/bundle/manifests/velero.io_podvolumebackups.yaml b/bundle/manifests/velero.io_podvolumebackups.yaml
@@ -33,6 +33,12 @@ spec:
       jsonPath: .status.progress.totalBytes
       name: Total Bytes
       type: integer
+    - description: Incremental bytes
+      format: int64
+      jsonPath: .status.incrementalBytes
+      name: Incremental Bytes
+      priority: 10
+      type: integer
     - description: Name of the Backup Storage Location where this backup should be
         stored
       jsonPath: .spec.backupStorageLocation
@@ -189,6 +195,11 @@ spec:
                 format: date-time
                 nullable: true
                 type: string
+              incrementalBytes:
+                description: IncrementalBytes holds the number of bytes new or changed
+                  since the last backup
+                format: int64
+                type: integer
               message:
                 description: Message is a message about the pod volume backup's status.
                 type: string
diff --git a/bundle/manifests/velero.io_podvolumerestores.yaml b/bundle/manifests/velero.io_podvolumerestores.yaml
@@ -133,6 +133,10 @@ spec:
               snapshotID:
                 description: SnapshotID is the ID of the volume snapshot to be restored.
                 type: string
+              snapshotSize:
+                description: SnapshotSize is the logical size in Bytes of the snapshot.
+                format: int64
+                type: integer
               sourceNamespace:
                 description: SourceNamespace is the original namespace for namaspace
                   mapping.
diff --git a/config/crd/bases/velero.io_datadownloads.yaml b/config/crd/bases/velero.io_datadownloads.yaml
@@ -108,6 +108,10 @@ spec:
                 description: SnapshotID is the ID of the Velero backup snapshot to
                   be restored from.
                 type: string
+              snapshotSize:
+                description: SnapshotSize is the logical size in Bytes of the snapshot.
+                format: int64
+                type: integer
               sourceNamespace:
                 description: |-
                   SourceNamespace is the original namespace where the volume is backed up from.
diff --git a/config/crd/bases/velero.io_datauploads.yaml b/config/crd/bases/velero.io_datauploads.yaml
@@ -33,6 +33,12 @@ spec:
       jsonPath: .status.progress.totalBytes
       name: Total Bytes
       type: integer
+    - description: Incremental bytes
+      format: int64
+      jsonPath: .status.incrementalBytes
+      name: Incremental Bytes
+      priority: 10
+      type: integer
     - description: Name of the Backup Storage Location where this backup should be
         stored
       jsonPath: .spec.backupStorageLocation
@@ -173,6 +179,11 @@ spec:
                   as a result of the DataUpload.
                 nullable: true
                 type: object
+              incrementalBytes:
+                description: IncrementalBytes holds the number of bytes new or changed
+                  since the last backup
+                format: int64
+                type: integer
               message:
                 description: Message is a message about the DataUpload's status.
                 type: string
diff --git a/config/crd/bases/velero.io_podvolumebackups.yaml b/config/crd/bases/velero.io_podvolumebackups.yaml
@@ -33,6 +33,12 @@ spec:
       jsonPath: .status.progress.totalBytes
       name: Total Bytes
       type: integer
+    - description: Incremental bytes
+      format: int64
+      jsonPath: .status.incrementalBytes
+      name: Incremental Bytes
+      priority: 10
+      type: integer
     - description: Name of the Backup Storage Location where this backup should be
         stored
       jsonPath: .spec.backupStorageLocation
@@ -189,6 +195,11 @@ spec:
                 format: date-time
                 nullable: true
                 type: string
+              incrementalBytes:
+                description: IncrementalBytes holds the number of bytes new or changed
+                  since the last backup
+                format: int64
+                type: integer
               message:
                 description: Message is a message about the pod volume backup's status.
                 type: string
diff --git a/config/crd/bases/velero.io_podvolumerestores.yaml b/config/crd/bases/velero.io_podvolumerestores.yaml
@@ -133,6 +133,10 @@ spec:
               snapshotID:
                 description: SnapshotID is the ID of the volume snapshot to be restored.
                 type: string
+              snapshotSize:
+                description: SnapshotSize is the logical size in Bytes of the snapshot.
+                format: int64
+                type: integer
               sourceNamespace:
                 description: SourceNamespace is the original namespace for namaspace
                   mapping.
diff --git a/go.mod b/go.mod
@@ -203,6 +203,6 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20250930182219-b6ee44947ba4
+replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20251104165357-37b2d9ec3f2a
 
 replace github.com/kopia/kopia => github.com/migtools/kopia v0.0.0-20250814081930-848859b500ac
diff --git a/go.sum b/go.sum
@@ -756,8 +756,8 @@ github.com/openshift/api v0.0.0-20240524162738-d899f8877d22 h1:AW8KUN4k7qR2egrCC
 github.com/openshift/api v0.0.0-20240524162738-d899f8877d22/go.mod h1:7Hm1kLJGxWT6eysOpD2zUztdn+w91eiERn6KtI5o9aw=
 github.com/openshift/hypershift/api v0.0.0-20241128081537-8326d865eaf5 h1:z8AkPjlJ/CPqED/EPtlgQKYEt8+Edc30ZR8eQWOEigA=
 github.com/openshift/hypershift/api v0.0.0-20241128081537-8326d865eaf5/go.mod h1:3UlUlywmXBCEMF3GACTvMAOvv2lU5qzUDvTYFXeGbKU=
-github.com/openshift/velero v0.10.2-0.20250930182219-b6ee44947ba4 h1:0+uBuDbZLCtYKbJGnO9Gq5L5u2MV9l2lmRs3BKnlA7k=
-github.com/openshift/velero v0.10.2-0.20250930182219-b6ee44947ba4/go.mod h1:siVJMfpO/iw1mX0wAiAJ8m4uKRzXtiA0eXNQPZIZYmI=
+github.com/openshift/velero v0.10.2-0.20251104165357-37b2d9ec3f2a h1:LRjh0JV00Nmjpp4jPHOn6IKgpPR2U+nPoqhJU2ByFRE=
+github.com/openshift/velero v0.10.2-0.20251104165357-37b2d9ec3f2a/go.mod h1:siVJMfpO/iw1mX0wAiAJ8m4uKRzXtiA0eXNQPZIZYmI=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/operator-framework/api v0.10.0/go.mod h1:tV0BUNvly7szq28ZPBXhjp1Sqg5yHCOeX19ui9K4vjI=
 github.com/operator-framework/api v0.10.7 h1:GlZJ6m+0WSVdSsSjTbhKKAvHXamWJXhwXHUhVwL8LBE=
diff --git a/must-gather/go.sum b/must-gather/go.sum
@@ -198,8 +198,6 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
 github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
 github.com/openshift/api v0.0.0-20240912201240-0a8800162826 h1:A8D9SN/hJUwAbdO0rPCVTqmuBOctdgurr53gK701SYo=
 github.com/openshift/api v0.0.0-20240912201240-0a8800162826/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
-github.com/openshift/oadp-operator v1.0.2-0.20250327225822-5cc21cec9653 h1:p6t+nVTJsrT1FQSaL/n/sf9begEoLXfX08OVxfjdLYM=
-github.com/openshift/oadp-operator v1.0.2-0.20250327225822-5cc21cec9653/go.mod h1:tzlEfI5g4gomtv5dZ4qgEQSNSiwiOrsBj2P5nTqawPY=
 github.com/openshift/oadp-operator v1.0.2-0.20250506010707-2a52b7a20c4b h1:rz8ccMAPeFaFvxVfiD0k/GshGzU/uA10q/mJSLg6xWg=
 github.com/openshift/oadp-operator v1.0.2-0.20250506010707-2a52b7a20c4b/go.mod h1:IvBUP2qVUBst49SSzVhxajq4Bs1n/lm9K/kguhTltqI=
 github.com/openshift/oc v0.0.0-alpha.0.0.20250108103617-ae1bd9e4a75b h1:dBEu456jnnhr7KH1T+Mrna1DvFadk1qN+NEtLb8Nn8U=

Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,6 @@ require (`
`203`	`203`	`sigs.k8s.io/yaml v1.4.0 // indirect`
`204`	`204`	`)`
`205`	`205`
`206`		`-replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20250930182219-b6ee44947ba4`
	`206`	`+replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20251104165357-37b2d9ec3f2a`
`207`	`207`
`208`	`208`	`replace github.com/kopia/kopia => github.com/migtools/kopia v0.0.0-20250814081930-848859b500ac`