Skip to content

Commit 129c558

Browse files
horis233horis233
authored
update channel to v3 (#375)
* update channel to v3 * update channel for zen operator
1 parent cbc990d commit 129c558

File tree

6 files changed

+64
-71
lines changed

6 files changed

+64
-71
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ bundle-manifests:
188188

189189
generate-all: generate manifests ## Generate bundle manifests, metadata and package manifests
190190
$(OPERATOR_SDK) generate kustomize manifests -q
191-
- make bundle-manifests CHANNELS=beta DEFAULT_CHANNEL=beta
191+
- make bundle-manifests CHANNELS=v3 DEFAULT_CHANNEL=v3
192192

193193
##@ Test
194194

‎bundle.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
44
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
55
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
66
LABEL operators.operatorframework.io.bundle.package.v1=ibm-common-service-operator
7-
LABEL operators.operatorframework.io.bundle.channels.v1=beta
8-
LABEL operators.operatorframework.io.bundle.channel.default.v1=beta
7+
LABEL operators.operatorframework.io.bundle.channels.v1=v3
8+
LABEL operators.operatorframework.io.bundle.channel.default.v1=v3
99
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.2.0
1010
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1111
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v2

‎bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -112,95 +112,95 @@ metadata:
112112
operators:
113113
- name: ibm-licensing-operator
114114
namespace: placeholder
115-
channel: beta
115+
channel: v3
116116
packageName: ibm-licensing-operator-app
117117
scope: public
118118
sourceName: opencloud-operators
119119
sourceNamespace: openshift-marketplace
120120
- name: ibm-mongodb-operator
121121
namespace: placeholder
122-
channel: beta
122+
channel: v3
123123
packageName: ibm-mongodb-operator-app
124124
sourceName: opencloud-operators
125125
sourceNamespace: openshift-marketplace
126126
- name: ibm-cert-manager-operator
127127
namespace: placeholder
128-
channel: beta
128+
channel: v3
129129
packageName: ibm-cert-manager-operator
130130
scope: public
131131
sourceName: opencloud-operators
132132
sourceNamespace: openshift-marketplace
133133
- name: ibm-iam-operator
134134
namespace: placeholder
135-
channel: beta
135+
channel: v3
136136
packageName: ibm-iam-operator
137137
scope: public
138138
sourceName: opencloud-operators
139139
sourceNamespace: openshift-marketplace
140140
- name: ibm-healthcheck-operator
141141
namespace: placeholder
142-
channel: beta
142+
channel: v3
143143
packageName: ibm-healthcheck-operator-app
144144
scope: public
145145
sourceName: opencloud-operators
146146
sourceNamespace: openshift-marketplace
147147
- name: ibm-commonui-operator
148148
namespace: placeholder
149-
channel: beta
149+
channel: v3
150150
packageName: ibm-commonui-operator-app
151151
scope: public
152152
sourceName: opencloud-operators
153153
sourceNamespace: openshift-marketplace
154154
- name: ibm-management-ingress-operator
155155
namespace: placeholder
156-
channel: beta
156+
channel: v3
157157
packageName: ibm-management-ingress-operator-app
158158
scope: public
159159
sourceName: opencloud-operators
160160
sourceNamespace: openshift-marketplace
161161
- name: ibm-ingress-nginx-operator
162162
namespace: placeholder
163-
channel: beta
163+
channel: v3
164164
packageName: ibm-ingress-nginx-operator-app
165165
scope: public
166166
sourceName: opencloud-operators
167167
sourceNamespace: openshift-marketplace
168168
- name: ibm-auditlogging-operator
169169
namespace: placeholder
170-
channel: beta
170+
channel: v3
171171
packageName: ibm-auditlogging-operator-app
172172
scope: public
173173
sourceName: opencloud-operators
174174
sourceNamespace: openshift-marketplace
175175
- name: ibm-platform-api-operator
176176
namespace: placeholder
177-
channel: beta
177+
channel: v3
178178
packageName: ibm-platform-api-operator-app
179179
scope: public
180180
sourceName: opencloud-operators
181181
sourceNamespace: openshift-marketplace
182182
- name: ibm-monitoring-exporters-operator
183183
namespace: placeholder
184-
channel: beta
184+
channel: v3
185185
packageName: ibm-monitoring-exporters-operator-app
186186
scope: public
187187
sourceName: opencloud-operators
188188
sourceNamespace: openshift-marketplace
189189
- name: ibm-monitoring-prometheusext-operator
190190
namespace: placeholder
191-
channel: beta
191+
channel: v3
192192
packageName: ibm-monitoring-prometheusext-operator-app
193193
scope: public
194194
sourceName: opencloud-operators
195195
sourceNamespace: openshift-marketplace
196-
- channel: beta
196+
- channel: v3
197197
name: ibm-monitoring-grafana-operator
198198
namespace: placeholder
199199
packageName: ibm-monitoring-grafana-operator-app
200200
scope: public
201201
sourceName: opencloud-operators
202202
sourceNamespace: openshift-marketplace
203-
- channel: beta
203+
- channel: v3
204204
name: ibm-events-operator
205205
namespace: placeholder
206206
packageName: ibm-events-operator
@@ -214,7 +214,7 @@ metadata:
214214
scope: public
215215
sourceName: certified-operators
216216
sourceNamespace: openshift-marketplace
217-
- channel: beta
217+
- channel: v3
218218
name: ibm-zen-operator
219219
namespace: placeholder
220220
packageName: ibm-zen-operator
@@ -244,7 +244,7 @@ metadata:
244244
annotations:
245245
version: "12"
246246
spec:
247-
channel: beta
247+
channel: v3
248248
installPlanApproval: Automatic
249249
name: ibm-common-service-operator
250250
source: opencloud-operators
@@ -259,7 +259,7 @@ metadata:
259259
annotations:
260260
version: "12"
261261
spec:
262-
channel: beta
262+
channel: v3
263263
installPlanApproval: Automatic
264264
name: ibm-namespace-scope-operator-restricted
265265
source: opencloud-operators
@@ -273,7 +273,7 @@ metadata:
273273
annotations:
274274
version: "12"
275275
spec:
276-
channel: beta
276+
channel: v3
277277
installPlanApproval: Automatic
278278
name: ibm-namespace-scope-operator
279279
source: opencloud-operators
@@ -287,7 +287,7 @@ metadata:
287287
annotations:
288288
version: "13"
289289
spec:
290-
channel: beta
290+
channel: v3
291291
installPlanApproval: Automatic
292292
name: ibm-odlm
293293
source: opencloud-operators
@@ -301,7 +301,7 @@ metadata:
301301
annotations:
302302
version: "13"
303303
spec:
304-
channel: beta
304+
channel: v3
305305
installPlanApproval: Automatic
306306
name: ibm-odlm
307307
source: opencloud-operators

‎bundle/metadata/annotations.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
annotations:
2-
operators.operatorframework.io.bundle.channel.default.v1: beta
3-
operators.operatorframework.io.bundle.channels.v1: beta
2+
operators.operatorframework.io.bundle.channel.default.v1: v3
3+
operators.operatorframework.io.bundle.channels.v1: v3
44
operators.operatorframework.io.bundle.manifests.v1: manifests/
55
operators.operatorframework.io.bundle.mediatype.v1: registry+v1
66
operators.operatorframework.io.bundle.metadata.v1: metadata/

‎config/manifests/bases/ibm-common-service-operator.clusterserviceversion.yaml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -95,95 +95,95 @@ metadata:
9595
operators:
9696
- name: ibm-licensing-operator
9797
namespace: placeholder
98-
channel: beta
98+
channel: v3
9999
packageName: ibm-licensing-operator-app
100100
scope: public
101101
sourceName: opencloud-operators
102102
sourceNamespace: openshift-marketplace
103103
- name: ibm-mongodb-operator
104104
namespace: placeholder
105-
channel: beta
105+
channel: v3
106106
packageName: ibm-mongodb-operator-app
107107
sourceName: opencloud-operators
108108
sourceNamespace: openshift-marketplace
109109
- name: ibm-cert-manager-operator
110110
namespace: placeholder
111-
channel: beta
111+
channel: v3
112112
packageName: ibm-cert-manager-operator
113113
scope: public
114114
sourceName: opencloud-operators
115115
sourceNamespace: openshift-marketplace
116116
- name: ibm-iam-operator
117117
namespace: placeholder
118-
channel: beta
118+
channel: v3
119119
packageName: ibm-iam-operator
120120
scope: public
121121
sourceName: opencloud-operators
122122
sourceNamespace: openshift-marketplace
123123
- name: ibm-healthcheck-operator
124124
namespace: placeholder
125-
channel: beta
125+
channel: v3
126126
packageName: ibm-healthcheck-operator-app
127127
scope: public
128128
sourceName: opencloud-operators
129129
sourceNamespace: openshift-marketplace
130130
- name: ibm-commonui-operator
131131
namespace: placeholder
132-
channel: beta
132+
channel: v3
133133
packageName: ibm-commonui-operator-app
134134
scope: public
135135
sourceName: opencloud-operators
136136
sourceNamespace: openshift-marketplace
137137
- name: ibm-management-ingress-operator
138138
namespace: placeholder
139-
channel: beta
139+
channel: v3
140140
packageName: ibm-management-ingress-operator-app
141141
scope: public
142142
sourceName: opencloud-operators
143143
sourceNamespace: openshift-marketplace
144144
- name: ibm-ingress-nginx-operator
145145
namespace: placeholder
146-
channel: beta
146+
channel: v3
147147
packageName: ibm-ingress-nginx-operator-app
148148
scope: public
149149
sourceName: opencloud-operators
150150
sourceNamespace: openshift-marketplace
151151
- name: ibm-auditlogging-operator
152152
namespace: placeholder
153-
channel: beta
153+
channel: v3
154154
packageName: ibm-auditlogging-operator-app
155155
scope: public
156156
sourceName: opencloud-operators
157157
sourceNamespace: openshift-marketplace
158158
- name: ibm-platform-api-operator
159159
namespace: placeholder
160-
channel: beta
160+
channel: v3
161161
packageName: ibm-platform-api-operator-app
162162
scope: public
163163
sourceName: opencloud-operators
164164
sourceNamespace: openshift-marketplace
165165
- name: ibm-monitoring-exporters-operator
166166
namespace: placeholder
167-
channel: beta
167+
channel: v3
168168
packageName: ibm-monitoring-exporters-operator-app
169169
scope: public
170170
sourceName: opencloud-operators
171171
sourceNamespace: openshift-marketplace
172172
- name: ibm-monitoring-prometheusext-operator
173173
namespace: placeholder
174-
channel: beta
174+
channel: v3
175175
packageName: ibm-monitoring-prometheusext-operator-app
176176
scope: public
177177
sourceName: opencloud-operators
178178
sourceNamespace: openshift-marketplace
179-
- channel: beta
179+
- channel: v3
180180
name: ibm-monitoring-grafana-operator
181181
namespace: placeholder
182182
packageName: ibm-monitoring-grafana-operator-app
183183
scope: public
184184
sourceName: opencloud-operators
185185
sourceNamespace: openshift-marketplace
186-
- channel: beta
186+
- channel: v3
187187
name: ibm-events-operator
188188
namespace: placeholder
189189
packageName: ibm-events-operator
@@ -197,7 +197,7 @@ metadata:
197197
scope: public
198198
sourceName: certified-operators
199199
sourceNamespace: openshift-marketplace
200-
- channel: beta
200+
- channel: v3
201201
name: ibm-zen-operator
202202
namespace: placeholder
203203
packageName: ibm-zen-operator
@@ -227,7 +227,7 @@ metadata:
227227
annotations:
228228
version: "12"
229229
spec:
230-
channel: beta
230+
channel: v3
231231
installPlanApproval: Automatic
232232
name: ibm-common-service-operator
233233
source: opencloud-operators
@@ -242,7 +242,7 @@ metadata:
242242
annotations:
243243
version: "12"
244244
spec:
245-
channel: beta
245+
channel: v3
246246
installPlanApproval: Automatic
247247
name: ibm-namespace-scope-operator-restricted
248248
source: opencloud-operators
@@ -256,7 +256,7 @@ metadata:
256256
annotations:
257257
version: "12"
258258
spec:
259-
channel: beta
259+
channel: v3
260260
installPlanApproval: Automatic
261261
name: ibm-namespace-scope-operator
262262
source: opencloud-operators
@@ -270,7 +270,7 @@ metadata:
270270
annotations:
271271
version: "13"
272272
spec:
273-
channel: beta
273+
channel: v3
274274
installPlanApproval: Automatic
275275
name: ibm-odlm
276276
source: opencloud-operators
@@ -284,7 +284,7 @@ metadata:
284284
annotations:
285285
version: "13"
286286
spec:
287-
channel: beta
287+
channel: v3
288288
installPlanApproval: Automatic
289289
name: ibm-odlm
290290
source: opencloud-operators

0 commit comments

Comments
 (0)