Skip to content

cherry-pick 1.0 OADP-380+kubevirt-upstream-tag-cp #675

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

Merged
dymurray merged 1 commit into from
May 9, 2022
Merged

cherry-pick 1.0 OADP-380+kubevirt-upstream-tag-cp #675

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
6 changes: 3 additions & 3 deletions bundle/manifests/oadp-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: operators.coreos.com/v1alpha1
kind: ClusterServiceVersion
metadata:
annotations:
operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift Platform Plus"]'
alm-examples: |-
[
{
Expand Down Expand Up @@ -169,7 +168,8 @@ metadata:
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/suggested-namespace: openshift-adp
operators.openshift.io/infrastructure-features: '["Disconnected"]'
operators.operatorframework.io/builder: operator-sdk-v1.18.0+git
operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift Platform Plus"]'
operators.operatorframework.io/builder: operator-sdk-v1.14.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/openshift/oadp-operator
support: Red Hat
Expand Down Expand Up @@ -498,7 +498,7 @@ spec:
- name: VELERO_CSI_PLUGIN_TAG
value: latest
- name: VELERO_KUBEVIRT_PLUGIN_TAG
value: 0.2.0
value: v0.2.0
image: quay.io/konveyor/oadp-operator:latest
imagePullPolicy: Always
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ spec:
- name: VELERO_CSI_PLUGIN_TAG
value: latest
- name: VELERO_KUBEVIRT_PLUGIN_TAG
value: 0.2.0
value: v0.2.0
args:
- --leader-elect
image: controller:latest
Expand Down
4 changes: 3 additions & 1 deletion config/manifests/bases/oadp-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ metadata:
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/suggested-namespace: openshift-adp
operators.openshift.io/infrastructure-features: '["Disconnected"]'
operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift
Platform Plus"]'
repository: https://github.com/openshift/oadp-operator
support: Red Hat
labels:
Expand Down Expand Up @@ -124,7 +126,7 @@ spec:
- oadp
links:
- name: OADP Operator
url: https://oadp.konveyor.io/
url: https://github.com/openshift/oadp-operator
maintainers:
- email: dymurray@redhat.com
name: Dylan Murray
Expand Down