Skip to content

Commit a99a040

Browse files
jmtdjmtd
authored
Merge pull request #434 from jmtd/openshift-templates-2023-01-cpu
update Openshift templates for post-2023 01 CPU
2 parents 4c0d89d + 2e52538 commit a99a040

File tree

7 files changed

+584
-2
lines changed

7 files changed

+584
-2
lines changed

‎templates/community-image-streams.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,25 @@
191191
"kind": "DockerImage",
192192
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.17"
193193
}
194+
},
195+
{
196+
"name": "1.18",
197+
"annotations": {
198+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
199+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
200+
"iconClass": "icon-rh-openjdk",
201+
"tags": "builder,java,openjdk,ubi8",
202+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
203+
"sampleContextDir": "undertow-servlet",
204+
"version": "1.18"
205+
},
206+
"referencePolicy": {
207+
"type": "Local"
208+
},
209+
"from": {
210+
"kind": "DockerImage",
211+
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.18"
212+
}
194213
}
195214
]
196215
}
@@ -377,6 +396,25 @@
377396
"kind": "DockerImage",
378397
"name": "registry.access.redhat.com/ubi8/openjdk-11:1.17"
379398
}
399+
},
400+
{
401+
"name": "1.18",
402+
"annotations": {
403+
"openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)",
404+
"description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.",
405+
"iconClass": "icon-rh-openjdk",
406+
"tags": "builder,java,openjdk,ubi8",
407+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
408+
"sampleContextDir": "undertow-servlet",
409+
"version": "1.18"
410+
},
411+
"referencePolicy": {
412+
"type": "Local"
413+
},
414+
"from": {
415+
"kind": "DockerImage",
416+
"name": "registry.access.redhat.com/ubi8/openjdk-11:1.18"
417+
}
380418
}
381419
]
382420
}
@@ -525,6 +563,25 @@
525563
"kind": "DockerImage",
526564
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.17"
527565
}
566+
},
567+
{
568+
"name": "1.18",
569+
"annotations": {
570+
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)",
571+
"description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.",
572+
"iconClass": "icon-rh-openjdk",
573+
"tags": "builder,java,openjdk,ubi8",
574+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
575+
"sampleContextDir": "undertow-servlet",
576+
"version": "1.18"
577+
},
578+
"referencePolicy": {
579+
"type": "Local"
580+
},
581+
"from": {
582+
"kind": "DockerImage",
583+
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.18"
584+
}
528585
}
529586
]
530587
}

‎templates/data.yaml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ rhel7:
88
# for the rhel7 images, the default range of versions is 1.0-1.12
99
# (these keys are numeric as the script uses them as inputs for range())
1010
from: 0
11-
to: 15
11+
to: 17
1212
builder:
1313
8:
1414
name: "redhat-openjdk-18/openjdk18-openshift"
@@ -24,7 +24,7 @@ rhel7:
2424
not: [ 2, 3, 4, 5, 6, 7, 8, 9, 13 ]
2525
ubi8:
2626
from: 3
27-
to: 17
27+
to: 18
2828
not: [ 4, 5, 6, 7, 8, 9 ]
2929
builder: # "ubi8/openjdk-X"
3030
8: {}
@@ -41,8 +41,11 @@ ubi8:
4141
17:
4242
name: "ubi8/openjdk-17-runtime"
4343
from: 11
44+
45+
# ubi9 is not yet being used in any templates
4446
ubi9:
4547
from: 13
48+
to: 17
4649
builder:
4750
11: {}
4851
17: {}

‎templates/image-streams-aarch64.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,25 @@
191191
"kind": "DockerImage",
192192
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.17"
193193
}
194+
},
195+
{
196+
"name": "1.18",
197+
"annotations": {
198+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
199+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
200+
"iconClass": "icon-rh-openjdk",
201+
"tags": "builder,java,openjdk,ubi8,hidden",
202+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
203+
"sampleContextDir": "undertow-servlet",
204+
"version": "1.18"
205+
},
206+
"referencePolicy": {
207+
"type": "Local"
208+
},
209+
"from": {
210+
"kind": "DockerImage",
211+
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.18"
212+
}
194213
}
195214
]
196215
}
@@ -377,6 +396,25 @@
377396
"kind": "DockerImage",
378397
"name": "registry.access.redhat.com/ubi8/openjdk-11:1.17"
379398
}
399+
},
400+
{
401+
"name": "1.18",
402+
"annotations": {
403+
"openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)",
404+
"description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.",
405+
"iconClass": "icon-rh-openjdk",
406+
"tags": "builder,java,openjdk,ubi8,hidden",
407+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
408+
"sampleContextDir": "undertow-servlet",
409+
"version": "1.18"
410+
},
411+
"referencePolicy": {
412+
"type": "Local"
413+
},
414+
"from": {
415+
"kind": "DockerImage",
416+
"name": "registry.access.redhat.com/ubi8/openjdk-11:1.18"
417+
}
380418
}
381419
]
382420
}
@@ -525,6 +563,25 @@
525563
"kind": "DockerImage",
526564
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.17"
527565
}
566+
},
567+
{
568+
"name": "1.18",
569+
"annotations": {
570+
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)",
571+
"description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.",
572+
"iconClass": "icon-rh-openjdk",
573+
"tags": "builder,java,openjdk,ubi8,hidden",
574+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
575+
"sampleContextDir": "undertow-servlet",
576+
"version": "1.18"
577+
},
578+
"referencePolicy": {
579+
"type": "Local"
580+
},
581+
"from": {
582+
"kind": "DockerImage",
583+
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.18"
584+
}
528585
}
529586
]
530587
}

‎templates/image-streams-ppc64le.json‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,46 @@
200200
"kind": "DockerImage",
201201
"name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.15"
202202
}
203+
},
204+
{
205+
"name": "1.16",
206+
"annotations": {
207+
"openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL7)",
208+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon RHEL7.",
209+
"iconClass": "icon-rh-openjdk",
210+
"tags": "builder,java,openjdk,hidden",
211+
"supports": "java:8",
212+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
213+
"sampleContextDir": "undertow-servlet",
214+
"version": "1.16"
215+
},
216+
"referencePolicy": {
217+
"type": "Local"
218+
},
219+
"from": {
220+
"kind": "DockerImage",
221+
"name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.16"
222+
}
223+
},
224+
{
225+
"name": "1.17",
226+
"annotations": {
227+
"openshift.io/display-name": "Red Hat OpenJDK 8 (RHEL7)",
228+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon RHEL7.",
229+
"iconClass": "icon-rh-openjdk",
230+
"tags": "builder,java,openjdk,hidden",
231+
"supports": "java:8",
232+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
233+
"sampleContextDir": "undertow-servlet",
234+
"version": "1.17"
235+
},
236+
"referencePolicy": {
237+
"type": "Local"
238+
},
239+
"from": {
240+
"kind": "DockerImage",
241+
"name": "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.17"
242+
}
203243
}
204244
]
205245
}
@@ -354,6 +394,46 @@
354394
"kind": "DockerImage",
355395
"name": "registry.access.redhat.com/openjdk/openjdk-11-rhel7:1.15"
356396
}
397+
},
398+
{
399+
"name": "1.16",
400+
"annotations": {
401+
"openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL7)",
402+
"description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL7.",
403+
"iconClass": "icon-rh-openjdk",
404+
"tags": "builder,java,openjdk,hidden",
405+
"supports": "java:11",
406+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
407+
"sampleContextDir": "undertow-servlet",
408+
"version": "1.16"
409+
},
410+
"referencePolicy": {
411+
"type": "Local"
412+
},
413+
"from": {
414+
"kind": "DockerImage",
415+
"name": "registry.access.redhat.com/openjdk/openjdk-11-rhel7:1.16"
416+
}
417+
},
418+
{
419+
"name": "1.17",
420+
"annotations": {
421+
"openshift.io/display-name": "Red Hat OpenJDK 11 (RHEL7)",
422+
"description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL7.",
423+
"iconClass": "icon-rh-openjdk",
424+
"tags": "builder,java,openjdk,hidden",
425+
"supports": "java:11",
426+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
427+
"sampleContextDir": "undertow-servlet",
428+
"version": "1.17"
429+
},
430+
"referencePolicy": {
431+
"type": "Local"
432+
},
433+
"from": {
434+
"kind": "DockerImage",
435+
"name": "registry.access.redhat.com/openjdk/openjdk-11-rhel7:1.17"
436+
}
357437
}
358438
]
359439
}
@@ -539,6 +619,25 @@
539619
"kind": "DockerImage",
540620
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.17"
541621
}
622+
},
623+
{
624+
"name": "1.18",
625+
"annotations": {
626+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
627+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
628+
"iconClass": "icon-rh-openjdk",
629+
"tags": "builder,java,openjdk,ubi8,hidden",
630+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
631+
"sampleContextDir": "undertow-servlet",
632+
"version": "1.18"
633+
},
634+
"referencePolicy": {
635+
"type": "Local"
636+
},
637+
"from": {
638+
"kind": "DockerImage",
639+
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.18"
640+
}
542641
}
543642
]
544643
}
@@ -725,6 +824,25 @@
725824
"kind": "DockerImage",
726825
"name": "registry.access.redhat.com/ubi8/openjdk-11:1.17"
727826
}
827+
},
828+
{
829+
"name": "1.18",
830+
"annotations": {
831+
"openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)",
832+
"description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.",
833+
"iconClass": "icon-rh-openjdk",
834+
"tags": "builder,java,openjdk,ubi8,hidden",
835+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
836+
"sampleContextDir": "undertow-servlet",
837+
"version": "1.18"
838+
},
839+
"referencePolicy": {
840+
"type": "Local"
841+
},
842+
"from": {
843+
"kind": "DockerImage",
844+
"name": "registry.access.redhat.com/ubi8/openjdk-11:1.18"
845+
}
728846
}
729847
]
730848
}
@@ -873,6 +991,25 @@
873991
"kind": "DockerImage",
874992
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.17"
875993
}
994+
},
995+
{
996+
"name": "1.18",
997+
"annotations": {
998+
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)",
999+
"description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.",
1000+
"iconClass": "icon-rh-openjdk",
1001+
"tags": "builder,java,openjdk,ubi8,hidden",
1002+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
1003+
"sampleContextDir": "undertow-servlet",
1004+
"version": "1.18"
1005+
},
1006+
"referencePolicy": {
1007+
"type": "Local"
1008+
},
1009+
"from": {
1010+
"kind": "DockerImage",
1011+
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.18"
1012+
}
8761013
}
8771014
]
8781015
}

0 commit comments

Comments
 (0)