Skip to content

Commit 0cf9135

Browse files
yselkowitzyselkowitz
committed
Use groupified apiVersion
Non-groupified objects were deprecated in OCP 4.7. Signed-off-by: Yaakov Selkowitz <[email protected]>
1 parent d5c5d16 commit 0cf9135

7 files changed

+32
-32
lines changed

‎templates/community-image-streams.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"items": [
1212
{
1313
"kind": "ImageStream",
14-
"apiVersion": "v1",
14+
"apiVersion": "image.openshift.io/v1",
1515
"metadata": {
1616
"name": "ubi8-openjdk-8",
1717
"annotations": {
@@ -45,7 +45,7 @@
4545
},
4646
{
4747
"kind": "ImageStream",
48-
"apiVersion": "v1",
48+
"apiVersion": "image.openshift.io/v1",
4949
"metadata": {
5050
"name": "ubi8-openjdk-11",
5151
"annotations": {
@@ -79,7 +79,7 @@
7979
},
8080
{
8181
"kind": "ImageStream",
82-
"apiVersion": "v1",
82+
"apiVersion": "image.openshift.io/v1",
8383
"metadata": {
8484
"name": "java",
8585
"annotations": {

‎templates/image-streams-aarch64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"items": [
1212
{
1313
"kind": "ImageStream",
14-
"apiVersion": "v1",
14+
"apiVersion": "image.openshift.io/v1",
1515
"metadata": {
1616
"name": "ubi8-openjdk-8",
1717
"annotations": {
@@ -49,7 +49,7 @@
4949
},
5050
{
5151
"kind": "ImageStream",
52-
"apiVersion": "v1",
52+
"apiVersion": "image.openshift.io/v1",
5353
"metadata": {
5454
"name": "ubi8-openjdk-11",
5555
"annotations": {
@@ -87,7 +87,7 @@
8787
},
8888
{
8989
"kind": "ImageStream",
90-
"apiVersion": "v1",
90+
"apiVersion": "image.openshift.io/v1",
9191
"metadata": {
9292
"name": "java",
9393
"annotations": {

‎templates/image-streams-ppc64le.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"items": [
1212
{
1313
"kind": "ImageStream",
14-
"apiVersion": "v1",
14+
"apiVersion": "image.openshift.io/v1",
1515
"metadata": {
1616
"name": "redhat-openjdk18-openshift",
1717
"annotations": {
@@ -110,7 +110,7 @@
110110
},
111111
{
112112
"kind": "ImageStream",
113-
"apiVersion": "v1",
113+
"apiVersion": "image.openshift.io/v1",
114114
"metadata": {
115115
"name": "openjdk-11-rhel7",
116116
"annotations": {
@@ -169,7 +169,7 @@
169169
},
170170
{
171171
"kind": "ImageStream",
172-
"apiVersion": "v1",
172+
"apiVersion": "image.openshift.io/v1",
173173
"metadata": {
174174
"name": "ubi8-openjdk-8",
175175
"annotations": {
@@ -207,7 +207,7 @@
207207
},
208208
{
209209
"kind": "ImageStream",
210-
"apiVersion": "v1",
210+
"apiVersion": "image.openshift.io/v1",
211211
"metadata": {
212212
"name": "ubi8-openjdk-11",
213213
"annotations": {
@@ -245,7 +245,7 @@
245245
},
246246
{
247247
"kind": "ImageStream",
248-
"apiVersion": "v1",
248+
"apiVersion": "image.openshift.io/v1",
249249
"metadata": {
250250
"name": "java",
251251
"annotations": {

‎templates/image-streams-s390x.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"items": [
1212
{
1313
"kind": "ImageStream",
14-
"apiVersion": "v1",
14+
"apiVersion": "image.openshift.io/v1",
1515
"metadata": {
1616
"name": "redhat-openjdk18-openshift",
1717
"annotations": {
@@ -110,7 +110,7 @@
110110
},
111111
{
112112
"kind": "ImageStream",
113-
"apiVersion": "v1",
113+
"apiVersion": "image.openshift.io/v1",
114114
"metadata": {
115115
"name": "openjdk-11-rhel7",
116116
"annotations": {
@@ -169,7 +169,7 @@
169169
},
170170
{
171171
"kind": "ImageStream",
172-
"apiVersion": "v1",
172+
"apiVersion": "image.openshift.io/v1",
173173
"metadata": {
174174
"name": "ubi8-openjdk-8",
175175
"annotations": {
@@ -207,7 +207,7 @@
207207
},
208208
{
209209
"kind": "ImageStream",
210-
"apiVersion": "v1",
210+
"apiVersion": "image.openshift.io/v1",
211211
"metadata": {
212212
"name": "ubi8-openjdk-11",
213213
"annotations": {
@@ -245,7 +245,7 @@
245245
},
246246
{
247247
"kind": "ImageStream",
248-
"apiVersion": "v1",
248+
"apiVersion": "image.openshift.io/v1",
249249
"metadata": {
250250
"name": "openj9-8-rhel7",
251251
"annotations": {
@@ -284,7 +284,7 @@
284284
},
285285
{
286286
"kind": "ImageStream",
287-
"apiVersion": "v1",
287+
"apiVersion": "image.openshift.io/v1",
288288
"metadata": {
289289
"name": "openj9-11-rhel7",
290290
"annotations": {
@@ -323,7 +323,7 @@
323323
},
324324
{
325325
"kind": "ImageStream",
326-
"apiVersion": "v1",
326+
"apiVersion": "image.openshift.io/v1",
327327
"metadata": {
328328
"name": "openj9-8-rhel8",
329329
"annotations": {
@@ -361,7 +361,7 @@
361361
},
362362
{
363363
"kind": "ImageStream",
364-
"apiVersion": "v1",
364+
"apiVersion": "image.openshift.io/v1",
365365
"metadata": {
366366
"name": "openj9-11-rhel8",
367367
"annotations": {
@@ -399,7 +399,7 @@
399399
},
400400
{
401401
"kind": "ImageStream",
402-
"apiVersion": "v1",
402+
"apiVersion": "image.openshift.io/v1",
403403
"metadata": {
404404
"name": "java",
405405
"annotations": {

‎templates/image-streams.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"items": [
1212
{
1313
"kind": "ImageStream",
14-
"apiVersion": "v1",
14+
"apiVersion": "image.openshift.io/v1",
1515
"metadata": {
1616
"name": "redhat-openjdk18-openshift",
1717
"annotations": {
@@ -210,7 +210,7 @@
210210
},
211211
{
212212
"kind": "ImageStream",
213-
"apiVersion": "v1",
213+
"apiVersion": "image.openshift.io/v1",
214214
"metadata": {
215215
"name": "openjdk-11-rhel7",
216216
"annotations": {
@@ -269,7 +269,7 @@
269269
},
270270
{
271271
"kind": "ImageStream",
272-
"apiVersion": "v1",
272+
"apiVersion": "image.openshift.io/v1",
273273
"metadata": {
274274
"name": "ubi8-openjdk-8",
275275
"annotations": {
@@ -307,7 +307,7 @@
307307
},
308308
{
309309
"kind": "ImageStream",
310-
"apiVersion": "v1",
310+
"apiVersion": "image.openshift.io/v1",
311311
"metadata": {
312312
"name": "ubi8-openjdk-11",
313313
"annotations": {
@@ -345,7 +345,7 @@
345345
},
346346
{
347347
"kind": "ImageStream",
348-
"apiVersion": "v1",
348+
"apiVersion": "image.openshift.io/v1",
349349
"metadata": {
350350
"name": "java",
351351
"annotations": {

‎templates/openjdk-web-basic-s2i.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"kind": "Template",
3-
"apiVersion": "v1",
3+
"apiVersion": "template.openshift.io/v1",
44
"metadata": {
55
"annotations": {
66
"iconClass": "icon-rh-openjdk",
@@ -114,7 +114,7 @@
114114
},
115115
{
116116
"kind": "Route",
117-
"apiVersion": "v1",
117+
"apiVersion": "route.openshift.io/v1",
118118
"id": "${APPLICATION_NAME}-http",
119119
"metadata": {
120120
"name": "${APPLICATION_NAME}",
@@ -134,7 +134,7 @@
134134
},
135135
{
136136
"kind": "ImageStream",
137-
"apiVersion": "v1",
137+
"apiVersion": "image.openshift.io/v1",
138138
"metadata": {
139139
"name": "${APPLICATION_NAME}",
140140
"labels": {
@@ -144,7 +144,7 @@
144144
},
145145
{
146146
"kind": "BuildConfig",
147-
"apiVersion": "v1",
147+
"apiVersion": "build.openshift.io/v1",
148148
"metadata": {
149149
"name": "${APPLICATION_NAME}",
150150
"labels": {
@@ -202,7 +202,7 @@
202202
},
203203
{
204204
"kind": "DeploymentConfig",
205-
"apiVersion": "v1",
205+
"apiVersion": "apps.openshift.io/v1",
206206
"metadata": {
207207
"name": "${APPLICATION_NAME}",
208208
"labels": {

‎templates/runtime-image-streams.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"items": [
1212
{
1313
"kind": "ImageStream",
14-
"apiVersion": "v1",
14+
"apiVersion": "image.openshift.io/v1",
1515
"metadata": {
1616
"name": "ubi8-openjdk-8-runtime",
1717
"annotations": {
@@ -43,7 +43,7 @@
4343
},
4444
{
4545
"kind": "ImageStream",
46-
"apiVersion": "v1",
46+
"apiVersion": "image.openshift.io/v1",
4747
"metadata": {
4848
"name": "ubi8-openjdk-11-runtime",
4949
"annotations": {

0 commit comments

Comments
 (0)