Skip to content

Commit af6ec1c

Browse files
committed
Update upstream kubevirt tag in manager deployment env, preserve openshift#611 changes in config (openshift#615)
* Preserve openshift#611 bundle changes in config manifests * prefix `v` to kubevirt tag
1 parent b421de7 commit af6ec1c

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

bundle/manifests/oadp-operator.clusterserviceversion.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apiVersion: operators.coreos.com/v1alpha1
22
kind: ClusterServiceVersion
33
metadata:
44
annotations:
5-
operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift Platform Plus"]'
65
alm-examples: |-
76
[
87
{
@@ -169,7 +168,8 @@ metadata:
169168
operatorframework.io/cluster-monitoring: "true"
170169
operatorframework.io/suggested-namespace: openshift-adp
171170
operators.openshift.io/infrastructure-features: '["Disconnected"]'
172-
operators.operatorframework.io/builder: operator-sdk-v1.18.0+git
171+
operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift Platform Plus"]'
172+
operators.operatorframework.io/builder: operator-sdk-v1.14.0
173173
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
174174
repository: https://github.com/openshift/oadp-operator
175175
support: Red Hat
@@ -498,7 +498,7 @@ spec:
498498
- name: VELERO_CSI_PLUGIN_TAG
499499
value: latest
500500
- name: VELERO_KUBEVIRT_PLUGIN_TAG
501-
value: 0.2.0
501+
value: v0.2.0
502502
image: quay.io/konveyor/oadp-operator:latest
503503
imagePullPolicy: Always
504504
livenessProbe:

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ spec:
7676
- name: VELERO_CSI_PLUGIN_TAG
7777
value: latest
7878
- name: VELERO_KUBEVIRT_PLUGIN_TAG
79-
value: 0.2.0
79+
value: v0.2.0
8080
args:
8181
- --leader-elect
8282
image: controller:latest

config/manifests/bases/oadp-operator.clusterserviceversion.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ metadata:
1414
operatorframework.io/cluster-monitoring: "true"
1515
operatorframework.io/suggested-namespace: openshift-adp
1616
operators.openshift.io/infrastructure-features: '["Disconnected"]'
17+
operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift
18+
Platform Plus"]'
1719
repository: https://github.com/openshift/oadp-operator
1820
support: Red Hat
1921
labels:
@@ -124,7 +126,7 @@ spec:
124126
- oadp
125127
links:
126128
- name: OADP Operator
127-
url: https://oadp.konveyor.io/
129+
url: https://github.com/openshift/oadp-operator
128130
maintainers:
129131
130132
name: Dylan Murray

0 commit comments

Comments
 (0)