Skip to content

Commit d4495ea

Browse files
jmtdjmtd
authored
Merge pull request #254 from yselkowitz/imagestreams
Update imagestreams
2 parents ae96511 + dcb0121 commit d4495ea

7 files changed

+306
-39
lines changed

‎templates/community-image-streams.json

Lines changed: 24 additions & 4 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": {
@@ -169,6 +169,26 @@
169169
"name": "registry.access.redhat.com/ubi8/openjdk-11:latest"
170170
}
171171
},
172+
{
173+
"name": "openjdk-17-ubi8",
174+
"annotations": {
175+
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)",
176+
"description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.",
177+
"iconClass": "icon-rh-openjdk",
178+
"tags": "builder,java,openjdk",
179+
"supports": "java:17,java",
180+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
181+
"sampleContextDir": "undertow-servlet",
182+
"version": "17"
183+
},
184+
"referencePolicy": {
185+
"type": "Local"
186+
},
187+
"from": {
188+
"kind": "DockerImage",
189+
"name": "registry.access.redhat.com/ubi8/openjdk-17:latest"
190+
}
191+
},
172192
{
173193
"name": "latest",
174194
"annotations": {
@@ -186,7 +206,7 @@
186206
},
187207
"from": {
188208
"kind": "ImageStreamTag",
189-
"name": "openjdk-11-ubi8"
209+
"name": "openjdk-17-ubi8"
190210
}
191211
}
192212
]

‎templates/image-streams-aarch64.json

Lines changed: 24 additions & 4 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": {
@@ -141,6 +141,26 @@
141141
"name": "registry.redhat.io/ubi8/openjdk-11:latest"
142142
}
143143
},
144+
{
145+
"name": "openjdk-17-ubi8",
146+
"annotations": {
147+
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)",
148+
"description": "Build and run Java applications using Maven and OpenJDK 17.",
149+
"iconClass": "icon-rh-openjdk",
150+
"tags": "builder,java,openjdk",
151+
"supports": "java:17,java",
152+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
153+
"sampleContextDir": "undertow-servlet",
154+
"version": "17"
155+
},
156+
"referencePolicy": {
157+
"type": "Local"
158+
},
159+
"from": {
160+
"kind": "DockerImage",
161+
"name": "registry.redhat.io/ubi8/openjdk-17:latest"
162+
}
163+
},
144164
{
145165
"name": "latest",
146166
"annotations": {
@@ -158,7 +178,7 @@
158178
},
159179
"from": {
160180
"kind": "ImageStreamTag",
161-
"name": "openjdk-11-ubi8"
181+
"name": "openjdk-17-ubi8"
162182
}
163183
}
164184
]

‎templates/image-streams-ppc64le.json

Lines changed: 106 additions & 6 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": {
@@ -299,6 +299,46 @@
299299
"name": "registry.redhat.io/redhat-openjdk-18/openjdk18-openshift:latest"
300300
}
301301
},
302+
{
303+
"name": "openj9-8-el8",
304+
"annotations": {
305+
"openshift.io/display-name": "OpenJ9 1.8.0 (RHEL 8)",
306+
"description": "Build and run Java applications using Maven and OpenJ9 1.8.0.",
307+
"iconClass": "icon-rh-openj9",
308+
"tags": "builder,java,openj9",
309+
"supports": "java:8,java",
310+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
311+
"sampleContextDir": "undertow-servlet",
312+
"version": "8"
313+
},
314+
"referencePolicy": {
315+
"type": "Local"
316+
},
317+
"from": {
318+
"kind": "DockerImage",
319+
"name": "registry.redhat.io/openj9/openj9-8-rhel8:latest"
320+
}
321+
},
322+
{
323+
"name": "openj9-8-el7",
324+
"annotations": {
325+
"openshift.io/display-name": "OpenJ9 1.8.0 (RHEL 7)",
326+
"description": "Build and run Java applications using Maven and OpenJ9 1.8.0.",
327+
"iconClass": "icon-rh-openj9",
328+
"tags": "builder,java,openj9",
329+
"supports": "java:8,java",
330+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
331+
"sampleContextDir": "undertow-servlet",
332+
"version": "8"
333+
},
334+
"referencePolicy": {
335+
"type": "Local"
336+
},
337+
"from": {
338+
"kind": "DockerImage",
339+
"name": "registry.redhat.io/openj9/openj9-8-rhel7:latest"
340+
}
341+
},
302342
{
303343
"name": "8",
304344
"annotations": {
@@ -359,6 +399,46 @@
359399
"name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest"
360400
}
361401
},
402+
{
403+
"name": "openj9-11-el8",
404+
"annotations": {
405+
"openshift.io/display-name": "Red Hat OpenJ9 11 (RHEL 8)",
406+
"description": "Build and run Java applications using Maven and OpenJ9 11.",
407+
"iconClass": "icon-rh-openj9",
408+
"tags": "builder,java,openj9",
409+
"supports": "java:11,java",
410+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
411+
"sampleContextDir": "undertow-servlet",
412+
"version": "11"
413+
},
414+
"referencePolicy": {
415+
"type": "Local"
416+
},
417+
"from": {
418+
"kind": "DockerImage",
419+
"name": "registry.redhat.io/openj9/openj9-11-rhel8:latest"
420+
}
421+
},
422+
{
423+
"name": "openj9-11-el7",
424+
"annotations": {
425+
"openshift.io/display-name": "Red Hat OpenJ9 11 (RHEL 7)",
426+
"description": "Build and run Java applications using Maven and OpenJ9 11.",
427+
"iconClass": "icon-rh-openj9",
428+
"tags": "builder,java,openj9",
429+
"supports": "java:11,java",
430+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
431+
"sampleContextDir": "undertow-servlet",
432+
"version": "11"
433+
},
434+
"referencePolicy": {
435+
"type": "Local"
436+
},
437+
"from": {
438+
"kind": "DockerImage",
439+
"name": "registry.redhat.io/openj9/openj9-11-rhel7:latest"
440+
}
441+
},
362442
{
363443
"name": "11",
364444
"annotations": {
@@ -379,6 +459,26 @@
379459
"name": "registry.redhat.io/openjdk/openjdk-11-rhel7:latest"
380460
}
381461
},
462+
{
463+
"name": "openjdk-17-ubi8",
464+
"annotations": {
465+
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)",
466+
"description": "Build and run Java applications using Maven and OpenJDK 17.",
467+
"iconClass": "icon-rh-openjdk",
468+
"tags": "builder,java,openjdk",
469+
"supports": "java:17,java",
470+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
471+
"sampleContextDir": "undertow-servlet",
472+
"version": "17"
473+
},
474+
"referencePolicy": {
475+
"type": "Local"
476+
},
477+
"from": {
478+
"kind": "DockerImage",
479+
"name": "registry.redhat.io/ubi8/openjdk-17:latest"
480+
}
481+
},
382482
{
383483
"name": "latest",
384484
"annotations": {
@@ -396,7 +496,7 @@
396496
},
397497
"from": {
398498
"kind": "ImageStreamTag",
399-
"name": "openjdk-11-ubi8"
499+
"name": "openjdk-17-ubi8"
400500
}
401501
}
402502
]

0 commit comments

Comments
 (0)