Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Mar 14, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundle/manifests/velero.io_backups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/velero.io_backupstoragelocations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/velero.io_deletebackuprequests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion bundle/manifests/velero.io_downloadrequests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -44,6 +44,7 @@ spec:
- BackupLog
- BackupContents
- BackupVolumeSnapshots
- BackupItemSnapshots
- BackupResourceList
- RestoreLog
- RestoreResults
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/velero.io_podvolumebackups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/velero.io_podvolumerestores.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/velero.io_resticrepositories.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion bundle/manifests/velero.io_restores.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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".
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/velero.io_schedules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/velero.io_serverstatusrequests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/velero.io_volumesnapshotlocations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 4 additions & 2 deletions config/crd/bases/backup.crd.yaml → config/crd/bases/velero.io_backups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -435,4 +437,4 @@ status:
kind: ""
plural: ""
conditions: []
storedVersions: []
storedVersions: []
4 changes: 3 additions & 1 deletion .../crd/bases/backupstoragelocation.crd.yaml → ...ses/velero.io_backupstoragelocations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 3 additions & 1 deletion ...ig/crd/bases/deletebackuprequest.crd.yaml → ...bases/velero.io_deletebackuprequests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
5 changes: 4 additions & 1 deletion config/crd/bases/downloadrequest.crd.yaml → ...crd/bases/velero.io_downloadrequests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -44,6 +46,7 @@ spec:
- BackupLog
- BackupContents
- BackupVolumeSnapshots
- BackupItemSnapshots
- BackupResourceList
- RestoreLog
- RestoreResults
Expand Down
4 changes: 3 additions & 1 deletion config/crd/bases/podvolumebackup.crd.yaml → ...crd/bases/velero.io_podvolumebackups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 3 additions & 1 deletion config/crd/bases/podvolumerestore.crd.yaml → ...rd/bases/velero.io_podvolumerestores.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 3 additions & 1 deletion config/crd/bases/resticrepository.crd.yaml → ...d/bases/velero.io_resticrepositories.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
3 changes: 2 additions & 1 deletion config/crd/bases/restore.crd.yaml → config/crd/bases/velero.io_restores.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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".
Expand Down
4 changes: 3 additions & 1 deletion config/crd/bases/schedule.crd.yaml → config/crd/bases/velero.io_schedules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 3 additions & 1 deletion ...ig/crd/bases/serverstatusrequest.crd.yaml → ...bases/velero.io_serverstatusrequests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 3 additions & 1 deletion ...crd/bases/volumesnapshotlocation.crd.yaml → ...es/velero.io_volumesnapshotlocations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@

---
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming make bundle worked, but just wanted to confirm operator-sdk was happy with this

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:
Expand Down
22 changes: 11 additions & 11 deletions config/crd/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 7 additions & 7 deletions pkg/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down