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

Jump to bottom

updating references to velero fork as of 1.9.2-rc.1 #824

Merged
merged 3 commits into from
Sep 16, 2022
Merged

updating references to velero fork as of 1.9.2-rc.1 #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
032a5ab
updating references to velero fork as of 1.9.2-rc.1
sseago Sep 15, 2022
7661c2e
Update go.mod references.
kaovilai Sep 15, 2022
61bab2e
Merge pull request #2 from kaovilai/sseago-velero-1.9.2-patch
sseago Sep 16, 2022
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
32 changes: 16 additions & 16 deletions bundle/manifests/oadp-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,21 +727,21 @@ spec:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: RELATED_IMAGE_VELERO
value: quay.io/konveyor/velero:konveyor-1.9
value: quay.io/konveyor/velero:oadp-1.1
- name: RELATED_IMAGE_VELERO_RESTIC_RESTORE_HELPER
value: quay.io/konveyor/velero-restic-restore-helper:konveyor-1.9
value: quay.io/konveyor/velero-restic-restore-helper:oadp-1.1
- name: RELATED_IMAGE_OPENSHIFT_VELERO_PLUGIN
value: quay.io/konveyor/openshift-velero-plugin:latest
value: quay.io/konveyor/openshift-velero-plugin:oadp-1.1
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_AWS
value: quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5
value: quay.io/konveyor/velero-plugin-for-aws:oadp-1.1
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_MICROSOFT_AZURE
value: quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.5
value: quay.io/konveyor/velero-plugin-for-microsoft-azure:oadp-1.1
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_GCP
value: quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.5
value: quay.io/konveyor/velero-plugin-for-gcp:oadp-1.1
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_CSI
value: quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3
value: quay.io/konveyor/velero-plugin-for-csi:oadp-1.1
- name: RELATED_IMAGE_VOLUME_SNAPSHOT_MOVER
value: quay.io/konveyor/volume-snapshot-mover:latest
value: quay.io/konveyor/volume-snapshot-mover:oadp-1.1
- name: RELATED_IMAGE_KUBEVIRT_VELERO_PLUGIN
value: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
image: quay.io/konveyor/oadp-operator:latest
Expand Down Expand Up @@ -850,21 +850,21 @@ spec:
provider:
name: Red Hat
relatedImages:
- image: quay.io/konveyor/velero:konveyor-1.9
- image: quay.io/konveyor/velero:oadp-1.1
name: velero
- image: quay.io/konveyor/velero-restic-restore-helper:konveyor-1.9
- image: quay.io/konveyor/velero-restic-restore-helper:oadp-1.1
name: velero-restic-restore-helper
- image: quay.io/konveyor/openshift-velero-plugin:latest
- image: quay.io/konveyor/openshift-velero-plugin:oadp-1.1
name: openshift-velero-plugin
- image: quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5
- image: quay.io/konveyor/velero-plugin-for-aws:oadp-1.1
name: velero-plugin-for-aws
- image: quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.5
- image: quay.io/konveyor/velero-plugin-for-microsoft-azure:oadp-1.1
name: velero-plugin-for-microsoft-azure
- image: quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.5
- image: quay.io/konveyor/velero-plugin-for-gcp:oadp-1.1
name: velero-plugin-for-gcp
- image: quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3
- image: quay.io/konveyor/velero-plugin-for-csi:oadp-1.1
name: velero-plugin-for-csi
- image: quay.io/konveyor/volume-snapshot-mover:latest
- image: quay.io/konveyor/volume-snapshot-mover:oadp-1.1
name: volume-snapshot-mover
- image: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
name: kubevirt-velero-plugin
Expand Down
2 changes: 2 additions & 0 deletions bundle/manifests/velero.io_downloadrequests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ spec:
- BackupResourceList
- RestoreLog
- RestoreResults
- CSIBackupVolumeSnapshots
- CSIBackupVolumeSnapshotContents
type: string
name:
description: Name is the name of the kubernetes resource with
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/velero.io_downloadrequests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ spec:
- BackupResourceList
- RestoreLog
- RestoreResults
- CSIBackupVolumeSnapshots
- CSIBackupVolumeSnapshotContents
type: string
name:
description: Name is the name of the kubernetes resource with
Expand Down
16 changes: 8 additions & 8 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,21 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: RELATED_IMAGE_VELERO
value: quay.io/konveyor/velero:konveyor-1.9
value: quay.io/konveyor/velero:oadp-1.1
- name: RELATED_IMAGE_VELERO_RESTIC_RESTORE_HELPER
value: quay.io/konveyor/velero-restic-restore-helper:konveyor-1.9
value: quay.io/konveyor/velero-restic-restore-helper:oadp-1.1
- name: RELATED_IMAGE_OPENSHIFT_VELERO_PLUGIN
value: quay.io/konveyor/openshift-velero-plugin:latest
value: quay.io/konveyor/openshift-velero-plugin:oadp-1.1
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_AWS
value: quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5
value: quay.io/konveyor/velero-plugin-for-aws:oadp-1.1
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_MICROSOFT_AZURE
value: quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.5
value: quay.io/konveyor/velero-plugin-for-microsoft-azure:oadp-1.1
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_GCP
value: quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.5
value: quay.io/konveyor/velero-plugin-for-gcp:oadp-1.1
- name: RELATED_IMAGE_VELERO_PLUGIN_FOR_CSI
value: quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3
value: quay.io/konveyor/velero-plugin-for-csi:oadp-1.1
- name: RELATED_IMAGE_VOLUME_SNAPSHOT_MOVER
value: quay.io/konveyor/volume-snapshot-mover:latest
value: quay.io/konveyor/volume-snapshot-mover:oadp-1.1
- name: RELATED_IMAGE_KUBEVIRT_VELERO_PLUGIN
value: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
args:
Expand Down
10 changes: 5 additions & 5 deletions config/velero/velero.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
restartPolicy: Always
initContainers:
- name: openshift-velero-plugin
image: 'quay.io/konveyor/openshift-velero-plugin:latest'
image: 'quay.io/konveyor/openshift-velero-plugin:oadp-1.1'
resources: {}
volumeMounts:
- name: plugins
Expand All @@ -35,7 +35,7 @@ spec:
terminationMessagePolicy: File
imagePullPolicy: Always
- name: velero-plugin-for-aws
image: 'quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5'
image: 'quay.io/konveyor/velero-plugin-for-aws:oadp-1.1'
resources: {}
volumeMounts:
- name: plugins
Expand All @@ -44,7 +44,7 @@ spec:
terminationMessagePolicy: File
imagePullPolicy: Always
- name: velero-plugin-for-csi
image: 'quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3'
image: 'quay.io/konveyor/velero-plugin-for-csi:oadp-1.1'
resources: {}
volumeMounts:
- name: plugins
Expand Down Expand Up @@ -95,7 +95,7 @@ spec:
- name: cloud-credentials
mountPath: /credentials
terminationMessagePolicy: File
image: 'quay.io/konveyor/velero:konveyor-1.9'
image: 'quay.io/konveyor/velero:oadp-1.1'
args:
- server
serviceAccount: velero
Expand All @@ -117,4 +117,4 @@ spec:
maxUnavailable: 25%
maxSurge: 25%
revisionHistoryLimit: 10
progressDeadlineSeconds: 600
progressDeadlineSeconds: 600
4 changes: 2 additions & 2 deletions controllers/velero_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3669,12 +3669,12 @@ func TestDPAReconciler_getVeleroImage(t *testing.T) {
},
},
pluginName: common.Velero,
wantImage: "quay.io/konveyor/velero:konveyor-1.9",
wantImage: "quay.io/konveyor/velero:oadp-1.1",
setEnvVars: map[string]string{
"REGISTRY": "quay.io",
"PROJECT": "konveyor",
"VELERO_REPO": "velero",
"VELERO_TAG": "konveyor-1.9",
"VELERO_TAG": "oadp-1.1",
},
},
}
Expand Down
8 changes: 5 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/operator-framework/operator-lib v0.9.0
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.51.2
github.com/sirupsen/logrus v1.8.1
github.com/vmware-tanzu/velero v1.8.0 // TODO: Update this to a pinned version
github.com/vmware-tanzu/velero v1.9.2-rc.1 // TODO: Update this to a pinned version
k8s.io/api v0.23.0
k8s.io/apiextensions-apiserver v0.23.0
k8s.io/apimachinery v0.23.0
Expand All @@ -24,6 +24,8 @@ require (
sigs.k8s.io/controller-runtime v0.11.0
)

require github.com/google/go-cmp v0.5.6

require (
cloud.google.com/go v0.93.3 // indirect
github.com/Azure/azure-sdk-for-go v61.4.0+incompatible // indirect
Expand Down Expand Up @@ -52,7 +54,6 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/hashicorp/go-hclog v0.14.1 // indirect
Expand Down Expand Up @@ -110,4 +111,5 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace github.com/vmware-tanzu/velero => github.com/konveyor/velero v0.10.2-0.20220811171855-13e54ebbefce
// replace with https://github.com/openshift/velero/tree/oadp-1.1
replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20220915155627-5fc1e6615f62
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,6 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konveyor/velero v0.10.2-0.20220811171855-13e54ebbefce h1:y8iDat4ch+JKTgt5Vv4ig4wSYG6U7v3k8ySa0l7OSVk=
github.com/konveyor/velero v0.10.2-0.20220811171855-13e54ebbefce/go.mod h1:PJMXrsf21l4sof7DQrtCem4Ktjua0Xhi+hZzXUHsLsc=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
Expand Down Expand Up @@ -591,6 +589,8 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl
github.com/openshift/api v0.0.0-20210805075156-d8fab4513288 h1:Yw96Z8gygCXxjeMTm55gGsTNxwnJkr6L2Baf3NsUQFU=
github.com/openshift/api v0.0.0-20210805075156-d8fab4513288/go.mod h1:x81TFA31x1OMT9SYWukQqJ/KbmeveRN6fo+XeGRK8g0=
github.com/openshift/build-machinery-go v0.0.0-20210712174854-1bb7fd1518d3/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/velero v0.10.2-0.20220915155627-5fc1e6615f62 h1:10lAvBeuT07QJVodru4VqSedCD5lgCPb9/jAThkffdo=
github.com/openshift/velero v0.10.2-0.20220915155627-5fc1e6615f62/go.mod h1:PJMXrsf21l4sof7DQrtCem4Ktjua0Xhi+hZzXUHsLsc=
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=
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 @@ -18,14 +18,14 @@ const (

// Images
const (
VeleroImage = "quay.io/konveyor/velero:konveyor-1.9"
OpenshiftPluginImage = "quay.io/konveyor/openshift-velero-plugin:latest"
AWSPluginImage = "quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5"
AzurePluginImage = "quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.5"
GCPPluginImage = "quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.5"
CSIPluginImage = "quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3"
VeleroImage = "quay.io/konveyor/velero:oadp-1.1"
OpenshiftPluginImage = "quay.io/konveyor/openshift-velero-plugin:oadp-1.1"
AWSPluginImage = "quay.io/konveyor/velero-plugin-for-aws:oadp-1.1"
AzurePluginImage = "quay.io/konveyor/velero-plugin-for-microsoft-azure:oadp-1.1"
GCPPluginImage = "quay.io/konveyor/velero-plugin-for-gcp:oadp-1.1"
CSIPluginImage = "quay.io/konveyor/velero-plugin-for-csi:oadp-1.1"
// DataMoverImage is the data mover controller for data mover CRs - VolumeSnapshotBackup and VolumeSnapshotRestore
DataMoverImage = "quay.io/konveyor/volume-snapshot-mover:latest"
DataMoverImage = "quay.io/konveyor/volume-snapshot-mover:oadp-1.1"
RegistryImage = "quay.io/konveyor/registry:latest"
KubeVirtPluginImage = "quay.io/konveyor/kubevirt-velero-plugin:v0.2.0"
)
Expand Down
20 changes: 10 additions & 10 deletions pkg/credentials/credentials_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ func TestCredentials_getPluginImage(t *testing.T) {
},
},
pluginName: common.VeleroPluginForAWS,
wantImage: "quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5",
wantImage: "quay.io/konveyor/velero-plugin-for-aws:oadp-1.1",
setEnvVars: map[string]string{
"REGISTRY": "quay.io",
"PROJECT": "konveyor",
"VELERO_AWS_PLUGIN_REPO": "velero-plugin-for-aws",
"VELERO_AWS_PLUGIN_TAG": "konveyor-1.5",
"VELERO_AWS_PLUGIN_TAG": "oadp-1.1",
},
},

Expand Down Expand Up @@ -154,12 +154,12 @@ func TestCredentials_getPluginImage(t *testing.T) {
},
},
pluginName: common.VeleroPluginForOpenshift,
wantImage: "quay.io/konveyor/openshift-velero-plugin:latest",
wantImage: "quay.io/konveyor/openshift-velero-plugin:oadp-1.1",
setEnvVars: map[string]string{
"REGISTRY": "quay.io",
"PROJECT": "konveyor",
"VELERO_OPENSHIFT_PLUGIN_REPO": "openshift-velero-plugin",
"VELERO_OPENSHIFT_PLUGIN_TAG": "latest",
"VELERO_OPENSHIFT_PLUGIN_TAG": "oadp-1.1",
},
},

Expand Down Expand Up @@ -227,12 +227,12 @@ func TestCredentials_getPluginImage(t *testing.T) {
},
},
pluginName: common.VeleroPluginForGCP,
wantImage: "quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.5",
wantImage: "quay.io/konveyor/velero-plugin-for-gcp:oadp-1.1",
setEnvVars: map[string]string{
"REGISTRY": "quay.io",
"PROJECT": "konveyor",
"VELERO_GCP_PLUGIN_REPO": "velero-plugin-for-gcp",
"VELERO_GCP_PLUGIN_TAG": "konveyor-1.5",
"VELERO_GCP_PLUGIN_TAG": "oadp-1.1",
},
},

Expand Down Expand Up @@ -300,12 +300,12 @@ func TestCredentials_getPluginImage(t *testing.T) {
},
},
pluginName: common.VeleroPluginForAzure,
wantImage: "quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.5",
wantImage: "quay.io/konveyor/velero-plugin-for-microsoft-azure:oadp-1.1",
setEnvVars: map[string]string{
"REGISTRY": "quay.io",
"PROJECT": "konveyor",
"VELERO_AZURE_PLUGIN_REPO": "velero-plugin-for-microsoft-azure",
"VELERO_AZURE_PLUGIN_TAG": "konveyor-1.5",
"VELERO_AZURE_PLUGIN_TAG": "oadp-1.1",
},
},

Expand Down Expand Up @@ -373,12 +373,12 @@ func TestCredentials_getPluginImage(t *testing.T) {
},
},
pluginName: common.VeleroPluginForCSI,
wantImage: "quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3",
wantImage: "quay.io/konveyor/velero-plugin-for-csi:oadp-1.1",
setEnvVars: map[string]string{
"REGISTRY": "quay.io",
"PROJECT": "konveyor",
"VELERO_CSI_PLUGIN_REPO": "velero-plugin-for-csi",
"VELERO_CSI_PLUGIN_TAG": "konveyor-0.3",
"VELERO_CSI_PLUGIN_TAG": "oadp-1.1",
},
},
// KubeVirt tests
Expand Down