updated velero CRDs to velero 1.8.0, fix common.go quay image tags (#593

)
openshift · Mar 14, 2022 · ce1d1fe · ce1d1fe
1 parent 726af63
commit ce1d1fe
Show file tree

Hide file tree

Showing 24 changed files with 65 additions and 41 deletions.
diff --git a/bundle/manifests/velero.io_backups.yaml b/bundle/manifests/velero.io_backups.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: backups.velero.io
 spec:

diff --git a/bundle/manifests/velero.io_backupstoragelocations.yaml b/bundle/manifests/velero.io_backupstoragelocations.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: backupstoragelocations.velero.io
 spec:

diff --git a/bundle/manifests/velero.io_deletebackuprequests.yaml b/bundle/manifests/velero.io_deletebackuprequests.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: deletebackuprequests.velero.io
 spec:

diff --git a/bundle/manifests/velero.io_downloadrequests.yaml b/bundle/manifests/velero.io_downloadrequests.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: downloadrequests.velero.io
 spec:
@@ -44,6 +44,7 @@ spec:
                     - BackupLog
                     - BackupContents
                     - BackupVolumeSnapshots
+                    - BackupItemSnapshots
                     - BackupResourceList
                     - RestoreLog
                     - RestoreResults

diff --git a/bundle/manifests/velero.io_podvolumebackups.yaml b/bundle/manifests/velero.io_podvolumebackups.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: podvolumebackups.velero.io
 spec:

diff --git a/bundle/manifests/velero.io_podvolumerestores.yaml b/bundle/manifests/velero.io_podvolumerestores.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: podvolumerestores.velero.io
 spec:

diff --git a/bundle/manifests/velero.io_resticrepositories.yaml b/bundle/manifests/velero.io_resticrepositories.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: resticrepositories.velero.io
 spec:

diff --git a/bundle/manifests/velero.io_restores.yaml b/bundle/manifests/velero.io_restores.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: restores.velero.io
 spec:
@@ -892,6 +892,7 @@ spec:
                                                   by services.
                                                 type: string
                                               protocol:
+                                                default: TCP
                                                 description: Protocol for port. Must
                                                   be UDP, TCP, or SCTP. Defaults to
                                                   "TCP".

diff --git a/bundle/manifests/velero.io_schedules.yaml b/bundle/manifests/velero.io_schedules.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: schedules.velero.io
 spec:

diff --git a/bundle/manifests/velero.io_serverstatusrequests.yaml b/bundle/manifests/velero.io_serverstatusrequests.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: serverstatusrequests.velero.io
 spec:

diff --git a/bundle/manifests/velero.io_volumesnapshotlocations.yaml b/bundle/manifests/velero.io_volumesnapshotlocations.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: volumesnapshotlocations.velero.io
 spec:

diff --git a/config/crd/bases/backup.crd.yaml → config/crd/bases/velero.io_backups.yaml b/config/crd/bases/backup.crd.yaml → config/crd/bases/velero.io_backups.yaml
@@ -1,8 +1,10 @@
+
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: backups.velero.io
 spec:
@@ -435,4 +437,4 @@ status:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []
diff --git a/.../crd/bases/backupstoragelocation.crd.yaml → ...ses/velero.io_backupstoragelocations.yaml b/.../crd/bases/backupstoragelocation.crd.yaml → ...ses/velero.io_backupstoragelocations.yaml
@@ -1,8 +1,10 @@
+
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: backupstoragelocations.velero.io
 spec:

diff --git a/...ig/crd/bases/deletebackuprequest.crd.yaml → ...bases/velero.io_deletebackuprequests.yaml b/...ig/crd/bases/deletebackuprequest.crd.yaml → ...bases/velero.io_deletebackuprequests.yaml
@@ -1,8 +1,10 @@
+
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: deletebackuprequests.velero.io
 spec:

diff --git a/config/crd/bases/downloadrequest.crd.yaml → ...crd/bases/velero.io_downloadrequests.yaml b/config/crd/bases/downloadrequest.crd.yaml → ...crd/bases/velero.io_downloadrequests.yaml
@@ -1,8 +1,10 @@
+
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: downloadrequests.velero.io
 spec:
@@ -44,6 +46,7 @@ spec:
                     - BackupLog
                     - BackupContents
                     - BackupVolumeSnapshots
+                    - BackupItemSnapshots
                     - BackupResourceList
                     - RestoreLog
                     - RestoreResults

diff --git a/config/crd/bases/podvolumebackup.crd.yaml → ...crd/bases/velero.io_podvolumebackups.yaml b/config/crd/bases/podvolumebackup.crd.yaml → ...crd/bases/velero.io_podvolumebackups.yaml
@@ -1,8 +1,10 @@
+
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: podvolumebackups.velero.io
 spec:

diff --git a/config/crd/bases/podvolumerestore.crd.yaml → ...rd/bases/velero.io_podvolumerestores.yaml b/config/crd/bases/podvolumerestore.crd.yaml → ...rd/bases/velero.io_podvolumerestores.yaml
@@ -1,8 +1,10 @@
+
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: podvolumerestores.velero.io
 spec:

diff --git a/config/crd/bases/resticrepository.crd.yaml → ...d/bases/velero.io_resticrepositories.yaml b/config/crd/bases/resticrepository.crd.yaml → ...d/bases/velero.io_resticrepositories.yaml
@@ -1,8 +1,10 @@
+
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: resticrepositories.velero.io
 spec:

diff --git a/config/crd/bases/restore.crd.yaml → config/crd/bases/velero.io_restores.yaml b/config/crd/bases/restore.crd.yaml → config/crd/bases/velero.io_restores.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: restores.velero.io
 spec:
@@ -892,6 +892,7 @@ spec:
                                                   by services.
                                                 type: string
                                               protocol:
+                                                default: TCP
                                                 description: Protocol for port. Must
                                                   be UDP, TCP, or SCTP. Defaults to
                                                   "TCP".

diff --git a/config/crd/bases/schedule.crd.yaml → config/crd/bases/velero.io_schedules.yaml b/config/crd/bases/schedule.crd.yaml → config/crd/bases/velero.io_schedules.yaml
@@ -1,8 +1,10 @@
+
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: schedules.velero.io
 spec:

diff --git a/...ig/crd/bases/serverstatusrequest.crd.yaml → ...bases/velero.io_serverstatusrequests.yaml b/...ig/crd/bases/serverstatusrequest.crd.yaml → ...bases/velero.io_serverstatusrequests.yaml
@@ -1,8 +1,10 @@
+
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: serverstatusrequests.velero.io
 spec:

diff --git a/...crd/bases/volumesnapshotlocation.crd.yaml → ...es/velero.io_volumesnapshotlocations.yaml b/...crd/bases/volumesnapshotlocation.crd.yaml → ...es/velero.io_volumesnapshotlocations.yaml
@@ -1,8 +1,10 @@
+
+---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.3.0
+    controller-gen.kubebuilder.io/version: v0.7.0
   creationTimestamp: null
   name: volumesnapshotlocations.velero.io
 spec:

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -4,17 +4,17 @@
 resources:
 - bases/oadp.openshift.io_dataprotectionapplications.yaml
 - bases/oadp.openshift.io_cloudstorages.yaml
-- bases/backup.crd.yaml
-- bases/backupstoragelocation.crd.yaml
-- bases/deletebackuprequest.crd.yaml
-- bases/downloadrequest.crd.yaml
-- bases/podvolumebackup.crd.yaml
-- bases/podvolumerestore.crd.yaml
-- bases/resticrepository.crd.yaml
-- bases/restore.crd.yaml
-- bases/schedule.crd.yaml
-- bases/serverstatusrequest.crd.yaml
-- bases/volumesnapshotlocation.crd.yaml
+- bases/velero.io_backups.yaml
+- bases/velero.io_backupstoragelocations.yaml
+- bases/velero.io_deletebackuprequests.yaml
+- bases/velero.io_downloadrequests.yaml
+- bases/velero.io_podvolumebackups.yaml
+- bases/velero.io_podvolumerestores.yaml
+- bases/velero.io_resticrepositories.yaml
+- bases/velero.io_restores.yaml
+- bases/velero.io_schedules.yaml
+- bases/velero.io_serverstatusrequests.yaml
+- bases/velero.io_volumesnapshotlocations.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

diff --git a/pkg/common/common.go b/pkg/common/common.go
@@ -10,13 +10,13 @@ const (
 
 // Images
 const (
-	VeleroImage          = "quay.io/konveyor/velero:konveyor-1.7.0"
-	OpenshiftPluginImage = "quay.io/konveyor/openshift-velero-plugin:oadp-0.3.0"
-	AWSPluginImage       = "quay.io/konveyor/velero-plugin-for-aws:konveyor-1.3.0"
-	AzurePluginImage     = "quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.3.0"
-	GCPPluginImage       = "quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.3.0"
-	CSIPluginImage       = "quay.io/konveyor/velero-plugin-for-csi:konveyor-0.2.0"
-	RegistryImage        = "quay.io/konveyor/registry:oadp-0.3.0"
+	VeleroImage          = "quay.io/konveyor/velero:latest"
+	OpenshiftPluginImage = "quay.io/konveyor/openshift-velero-plugin:latest"
+	AWSPluginImage       = "quay.io/konveyor/velero-plugin-for-aws:latest"
+	AzurePluginImage     = "quay.io/konveyor/velero-plugin-for-microsoft-azure:latest"
+	GCPPluginImage       = "quay.io/konveyor/velero-plugin-for-gcp:latest"
+	CSIPluginImage       = "quay.io/konveyor/velero-plugin-for-csi:latest"
+	RegistryImage        = "quay.io/konveyor/registry:latest"
 	KubeVirtPluginImage  = "quay.io/konveyor/kubevirt-velero-plugin:v0.2.0"
 )