Skip to content

Commit 01da3f2

Browse files
sseagosseago
committed
updating references to velero fork as of 1.9.2-rc.1
1 parent 2b11fe1 commit 01da3f2

File tree

9 files changed

+47
-42
lines changed

9 files changed

+47
-42
lines changed

‎bundle/manifests/oadp-operator.clusterserviceversion.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -727,21 +727,21 @@ spec:
727727
fieldRef:
728728
fieldPath: metadata.annotations['olm.targetNamespaces']
729729
- name: RELATED_IMAGE_VELERO
730-
value: quay.io/konveyor/velero:konveyor-1.9
730+
value: quay.io/konveyor/velero:oadp-1.1
731731
- name: RELATED_IMAGE_VELERO_RESTIC_RESTORE_HELPER
732-
value: quay.io/konveyor/velero-restic-restore-helper:konveyor-1.9
732+
value: quay.io/konveyor/velero-restic-restore-helper:oadp-1.1
733733
- name: RELATED_IMAGE_OPENSHIFT_VELERO_PLUGIN
734-
value: quay.io/konveyor/openshift-velero-plugin:latest
734+
value: quay.io/konveyor/openshift-velero-plugin:oadp-1.1
735735
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_AWS
736-
value: quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5
736+
value: quay.io/konveyor/velero-plugin-for-aws:oadp-1.1
737737
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_MICROSOFT_AZURE
738-
value: quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.5
738+
value: quay.io/konveyor/velero-plugin-for-microsoft-azure:oadp-1.1
739739
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_GCP
740-
value: quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.5
740+
value: quay.io/konveyor/velero-plugin-for-gcp:oadp-1.1
741741
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_CSI
742-
value: quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3
742+
value: quay.io/konveyor/velero-plugin-for-csi:oadp-1.1
743743
- name: RELATED_IMAGE_VOLUME_SNAPSHOT_MOVER
744-
value: quay.io/konveyor/volume-snapshot-mover:latest
744+
value: quay.io/konveyor/volume-snapshot-mover:oadp-1.1
745745
- name: RELATED_IMAGE_KUBEVIRT_VELERO_PLUGIN
746746
value: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
747747
image: quay.io/konveyor/oadp-operator:latest
@@ -850,21 +850,21 @@ spec:
850850
provider:
851851
name: Red Hat
852852
relatedImages:
853-
- image: quay.io/konveyor/velero:konveyor-1.9
853+
- image: quay.io/konveyor/velero:oadp-1.1
854854
name: velero
855-
- image: quay.io/konveyor/velero-restic-restore-helper:konveyor-1.9
855+
- image: quay.io/konveyor/velero-restic-restore-helper:oadp-1.1
856856
name: velero-restic-restore-helper
857-
- image: quay.io/konveyor/openshift-velero-plugin:latest
857+
- image: quay.io/konveyor/openshift-velero-plugin:oadp-1.1
858858
name: openshift-velero-plugin
859-
- image: quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5
859+
- image: quay.io/konveyor/velero-plugin-for-aws:oadp-1.1
860860
name: velero-plugin-for-aws
861-
- image: quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.5
861+
- image: quay.io/konveyor/velero-plugin-for-microsoft-azure:oadp-1.1
862862
name: velero-plugin-for-microsoft-azure
863-
- image: quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.5
863+
- image: quay.io/konveyor/velero-plugin-for-gcp:oadp-1.1
864864
name: velero-plugin-for-gcp
865-
- image: quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3
865+
- image: quay.io/konveyor/velero-plugin-for-csi:oadp-1.1
866866
name: velero-plugin-for-csi
867-
- image: quay.io/konveyor/volume-snapshot-mover:latest
867+
- image: quay.io/konveyor/volume-snapshot-mover:oadp-1.1
868868
name: volume-snapshot-mover
869869
- image: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
870870
name: kubevirt-velero-plugin

‎bundle/manifests/velero.io_downloadrequests.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ spec:
4848
- BackupResourceList
4949
- RestoreLog
5050
- RestoreResults
51+
- CSIBackupVolumeSnapshots
52+
- CSIBackupVolumeSnapshotContents
5153
type: string
5254
name:
5355
description: Name is the name of the kubernetes resource with

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ spec:
5050
- BackupResourceList
5151
- RestoreLog
5252
- RestoreResults
53+
- CSIBackupVolumeSnapshots
54+
- CSIBackupVolumeSnapshotContents
5355
type: string
5456
name:
5557
description: Name is the name of the kubernetes resource with

‎config/manager/manager.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ spec:
3838
fieldRef:
3939
fieldPath: metadata.namespace
4040
- name: RELATED_IMAGE_VELERO
41-
value: quay.io/konveyor/velero:konveyor-1.9
41+
value: quay.io/konveyor/velero:oadp-1.1
4242
- name: RELATED_IMAGE_VELERO_RESTIC_RESTORE_HELPER
43-
value: quay.io/konveyor/velero-restic-restore-helper:konveyor-1.9
43+
value: quay.io/konveyor/velero-restic-restore-helper:oadp-1.1
4444
- name: RELATED_IMAGE_OPENSHIFT_VELERO_PLUGIN
45-
value: quay.io/konveyor/openshift-velero-plugin:latest
45+
value: quay.io/konveyor/openshift-velero-plugin:oadp-1.1
4646
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_AWS
47-
value: quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5
47+
value: quay.io/konveyor/velero-plugin-for-aws:oadp-1.1
4848
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_MICROSOFT_AZURE
49-
value: quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.5
49+
value: quay.io/konveyor/velero-plugin-for-microsoft-azure:oadp-1.1
5050
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_GCP
51-
value: quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.5
51+
value: quay.io/konveyor/velero-plugin-for-gcp:oadp-1.1
5252
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_CSI
53-
value: quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3
53+
value: quay.io/konveyor/velero-plugin-for-csi:oadp-1.1
5454
- name: RELATED_IMAGE_VOLUME_SNAPSHOT_MOVER
55-
value: quay.io/konveyor/volume-snapshot-mover:latest
55+
value: quay.io/konveyor/volume-snapshot-mover:oadp-1.1
5656
- name: RELATED_IMAGE_KUBEVIRT_VELERO_PLUGIN
5757
value: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
5858
args:

‎config/velero/velero.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
restartPolicy: Always
2727
initContainers:
2828
- name: openshift-velero-plugin
29-
image: 'quay.io/konveyor/openshift-velero-plugin:latest'
29+
image: 'quay.io/konveyor/openshift-velero-plugin:oadp-1.1'
3030
resources: {}
3131
volumeMounts:
3232
- name: plugins
@@ -35,7 +35,7 @@ spec:
3535
terminationMessagePolicy: File
3636
imagePullPolicy: Always
3737
- name: velero-plugin-for-aws
38-
image: 'quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5'
38+
image: 'quay.io/konveyor/velero-plugin-for-aws:oadp-1.1'
3939
resources: {}
4040
volumeMounts:
4141
- name: plugins
@@ -44,7 +44,7 @@ spec:
4444
terminationMessagePolicy: File
4545
imagePullPolicy: Always
4646
- name: velero-plugin-for-csi
47-
image: 'quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3'
47+
image: 'quay.io/konveyor/velero-plugin-for-csi:oadp-1.1'
4848
resources: {}
4949
volumeMounts:
5050
- name: plugins
@@ -95,7 +95,7 @@ spec:
9595
- name: cloud-credentials
9696
mountPath: /credentials
9797
terminationMessagePolicy: File
98-
image: 'quay.io/konveyor/velero:konveyor-1.9'
98+
image: 'quay.io/konveyor/velero:oadp-1.1'
9999
args:
100100
- server
101101
serviceAccount: velero
@@ -117,4 +117,4 @@ spec:
117117
maxUnavailable: 25%
118118
maxSurge: 25%
119119
revisionHistoryLimit: 10
120-
progressDeadlineSeconds: 600
120+
progressDeadlineSeconds: 600

‎controllers/velero_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3669,12 +3669,12 @@ func TestDPAReconciler_getVeleroImage(t *testing.T) {
36693669
},
36703670
},
36713671
pluginName: common.Velero,
3672-
wantImage: "quay.io/konveyor/velero:konveyor-1.9",
3672+
wantImage: "quay.io/konveyor/velero:oadp-1.1",
36733673
setEnvVars: map[string]string{
36743674
"REGISTRY": "quay.io",
36753675
"PROJECT": "konveyor",
36763676
"VELERO_REPO": "velero",
3677-
"VELERO_TAG": "konveyor-1.9",
3677+
"VELERO_TAG": "oadp-1.1",
36783678
},
36793679
},
36803680
}

‎go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ require (
2424
sigs.k8s.io/controller-runtime v0.11.0
2525
)
2626

27+
require github.com/google/go-cmp v0.5.6
28+
2729
require (
2830
cloud.google.com/go v0.93.3 // indirect
2931
github.com/Azure/azure-sdk-for-go v61.4.0+incompatible // indirect
@@ -52,7 +54,6 @@ require (
5254
github.com/gogo/protobuf v1.3.2 // indirect
5355
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5456
github.com/golang/protobuf v1.5.2 // indirect
55-
github.com/google/go-cmp v0.5.6 // indirect
5657
github.com/google/gofuzz v1.2.0 // indirect
5758
github.com/googleapis/gnostic v0.5.5 // indirect
5859
github.com/hashicorp/go-hclog v0.14.1 // indirect
@@ -110,4 +111,4 @@ require (
110111
sigs.k8s.io/yaml v1.3.0 // indirect
111112
)
112113

113-
replace github.com/vmware-tanzu/velero => github.com/konveyor/velero v0.10.2-0.20220811171855-13e54ebbefce
114+
replace github.com/vmware-tanzu/velero => github.com/konveyor/velero v0.10.2-0.20220915155627-5fc1e6615f62

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
482482
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
483483
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
484484
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
485-
github.com/konveyor/velero v0.10.2-0.20220811171855-13e54ebbefce h1:y8iDat4ch+JKTgt5Vv4ig4wSYG6U7v3k8ySa0l7OSVk=
486-
github.com/konveyor/velero v0.10.2-0.20220811171855-13e54ebbefce/go.mod h1:PJMXrsf21l4sof7DQrtCem4Ktjua0Xhi+hZzXUHsLsc=
485+
github.com/konveyor/velero v0.10.2-0.20220915155627-5fc1e6615f62 h1:UY1A8za6/ZTuVfY3YplZLeqkNpDDtJgUU6he5sSP+Ow=
486+
github.com/konveyor/velero v0.10.2-0.20220915155627-5fc1e6615f62/go.mod h1:PJMXrsf21l4sof7DQrtCem4Ktjua0Xhi+hZzXUHsLsc=
487487
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
488488
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
489489
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

‎pkg/common/common.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ const (
1818

1919
// Images
2020
const (
21-
VeleroImage = "quay.io/konveyor/velero:konveyor-1.9"
22-
OpenshiftPluginImage = "quay.io/konveyor/openshift-velero-plugin:latest"
23-
AWSPluginImage = "quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5"
24-
AzurePluginImage = "quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.5"
25-
GCPPluginImage = "quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.5"
26-
CSIPluginImage = "quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3"
21+
VeleroImage = "quay.io/konveyor/velero:oadp-1.1"
22+
OpenshiftPluginImage = "quay.io/konveyor/openshift-velero-plugin:oadp-1.1"
23+
AWSPluginImage = "quay.io/konveyor/velero-plugin-for-aws:oadp-1.1"
24+
AzurePluginImage = "quay.io/konveyor/velero-plugin-for-microsoft-azure:oadp-1.1"
25+
GCPPluginImage = "quay.io/konveyor/velero-plugin-for-gcp:oadp-1.1"
26+
CSIPluginImage = "quay.io/konveyor/velero-plugin-for-csi:oadp-1.1"
2727
// DataMoverImage is the data mover controller for data mover CRs - VolumeSnapshotBackup and VolumeSnapshotRestore
28-
DataMoverImage = "quay.io/konveyor/volume-snapshot-mover:latest"
28+
DataMoverImage = "quay.io/konveyor/volume-snapshot-mover:oadp-1.1"
2929
RegistryImage = "quay.io/konveyor/registry:latest"
3030
KubeVirtPluginImage = "quay.io/konveyor/kubevirt-velero-plugin:v0.2.0"
3131
)

0 commit comments

Comments
 (0)