Skip to content

Commit c0db97b

Browse files
jmtdjmtd
authored
Merge pull request #438 from jmtd/templates-jdk21
add JDK21 to OpenShift templates
2 parents a99a040 + 679ecc6 commit c0db97b

8 files changed

+215
-1
lines changed

‎templates/community-image-streams.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,40 @@
585585
}
586586
]
587587
}
588+
},
589+
{
590+
"kind": "ImageStream",
591+
"apiVersion": "image.openshift.io/v1",
592+
"metadata": {
593+
"name": "ubi8-openjdk-21",
594+
"annotations": {
595+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
596+
"openshift.io/provider-display-name": "Red Hat, Inc."
597+
}
598+
},
599+
"spec": {
600+
"tags": [
601+
{
602+
"name": "1.18",
603+
"annotations": {
604+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
605+
"description": "Build and run Java applications using Maven and OpenJDK 21 upon UBI8.",
606+
"iconClass": "icon-rh-openjdk",
607+
"tags": "builder,java,openjdk,ubi8",
608+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
609+
"sampleContextDir": "undertow-servlet",
610+
"version": "1.18"
611+
},
612+
"referencePolicy": {
613+
"type": "Local"
614+
},
615+
"from": {
616+
"kind": "DockerImage",
617+
"name": "registry.access.redhat.com/ubi8/openjdk-21:1.18"
618+
}
619+
}
620+
]
621+
}
588622
}, {
589623
"kind": "ImageStream",
590624
"apiVersion": "image.openshift.io/v1",

‎templates/data.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ ubi8:
3131
11: {}
3232
17:
3333
from: 11
34+
21:
35+
from: 18
3436
runtime:
3537
from: 9
3638
not: []
@@ -41,6 +43,9 @@ ubi8:
4143
17:
4244
name: "ubi8/openjdk-17-runtime"
4345
from: 11
46+
21:
47+
name: "ubi8/openjdk-21-runtime"
48+
from: 18
4449

4550
# ubi9 is not yet being used in any templates
4651
ubi9:
@@ -49,8 +54,13 @@ ubi9:
4954
builder:
5055
11: {}
5156
17: {}
57+
21:
58+
from: 17
5259
runtime:
5360
11:
5461
name: "ubi9/openjdk-11-runtime"
5562
17:
5663
name: "ubi9/openjdk-17-runtime"
64+
21:
65+
name: "ubi9/openjdk-21-runtime"
66+
from: 17

‎templates/generateImageStreamTemplates.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ def renderImageStream(os,
6262
nameFn=lambda os,v: "{}-openjdk-{}".format(os,v),
6363
variant='builder',
6464
displayNameFn=lambda v: False,
65+
jdkVers=[8,11,17,21],
6566

6667
# the following flags are passed through to renderTags
6768
imageTags=False,
@@ -83,7 +84,7 @@ def renderImageStream(os,
8384
displayName=displayNameFn(v),
8485
description=descriptionFn(v),
8586
))
86-
for v in [8,11,17]
87+
for v in jdkVers
8788
])
8889

8990
##############################################################################

‎templates/image-streams-aarch64.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,40 @@
585585
}
586586
]
587587
}
588+
},
589+
{
590+
"kind": "ImageStream",
591+
"apiVersion": "image.openshift.io/v1",
592+
"metadata": {
593+
"name": "ubi8-openjdk-21",
594+
"annotations": {
595+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
596+
"openshift.io/provider-display-name": "Red Hat, Inc."
597+
}
598+
},
599+
"spec": {
600+
"tags": [
601+
{
602+
"name": "1.18",
603+
"annotations": {
604+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
605+
"description": "Build and run Java applications using Maven and OpenJDK 21 upon UBI8.",
606+
"iconClass": "icon-rh-openjdk",
607+
"tags": "builder,java,openjdk,ubi8,hidden",
608+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
609+
"sampleContextDir": "undertow-servlet",
610+
"version": "1.18"
611+
},
612+
"referencePolicy": {
613+
"type": "Local"
614+
},
615+
"from": {
616+
"kind": "DockerImage",
617+
"name": "registry.access.redhat.com/ubi8/openjdk-21:1.18"
618+
}
619+
}
620+
]
621+
}
588622
}, {
589623
"kind": "ImageStream",
590624
"apiVersion": "image.openshift.io/v1",

‎templates/image-streams-ppc64le.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,40 @@
10131013
}
10141014
]
10151015
}
1016+
},
1017+
{
1018+
"kind": "ImageStream",
1019+
"apiVersion": "image.openshift.io/v1",
1020+
"metadata": {
1021+
"name": "ubi8-openjdk-21",
1022+
"annotations": {
1023+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
1024+
"openshift.io/provider-display-name": "Red Hat, Inc."
1025+
}
1026+
},
1027+
"spec": {
1028+
"tags": [
1029+
{
1030+
"name": "1.18",
1031+
"annotations": {
1032+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
1033+
"description": "Build and run Java applications using Maven and OpenJDK 21 upon UBI8.",
1034+
"iconClass": "icon-rh-openjdk",
1035+
"tags": "builder,java,openjdk,ubi8,hidden",
1036+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
1037+
"sampleContextDir": "undertow-servlet",
1038+
"version": "1.18"
1039+
},
1040+
"referencePolicy": {
1041+
"type": "Local"
1042+
},
1043+
"from": {
1044+
"kind": "DockerImage",
1045+
"name": "registry.access.redhat.com/ubi8/openjdk-21:1.18"
1046+
}
1047+
}
1048+
]
1049+
}
10161050
},{
10171051
"kind": "ImageStream",
10181052
"apiVersion": "image.openshift.io/v1",

‎templates/image-streams-s390x.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,40 @@
10131013
}
10141014
]
10151015
}
1016+
},
1017+
{
1018+
"kind": "ImageStream",
1019+
"apiVersion": "image.openshift.io/v1",
1020+
"metadata": {
1021+
"name": "ubi8-openjdk-21",
1022+
"annotations": {
1023+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
1024+
"openshift.io/provider-display-name": "Red Hat, Inc."
1025+
}
1026+
},
1027+
"spec": {
1028+
"tags": [
1029+
{
1030+
"name": "1.18",
1031+
"annotations": {
1032+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
1033+
"description": "Build and run Java applications using Maven and OpenJDK 21 upon UBI8.",
1034+
"iconClass": "icon-rh-openjdk",
1035+
"tags": "builder,java,openjdk,ubi8,hidden",
1036+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
1037+
"sampleContextDir": "undertow-servlet",
1038+
"version": "1.18"
1039+
},
1040+
"referencePolicy": {
1041+
"type": "Local"
1042+
},
1043+
"from": {
1044+
"kind": "DockerImage",
1045+
"name": "registry.access.redhat.com/ubi8/openjdk-21:1.18"
1046+
}
1047+
}
1048+
]
1049+
}
10161050
},{
10171051
"kind": "ImageStream",
10181052
"apiVersion": "image.openshift.io/v1",

‎templates/image-streams.json‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,6 +1053,40 @@
10531053
}
10541054
]
10551055
}
1056+
},
1057+
{
1058+
"kind": "ImageStream",
1059+
"apiVersion": "image.openshift.io/v1",
1060+
"metadata": {
1061+
"name": "ubi8-openjdk-21",
1062+
"annotations": {
1063+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
1064+
"openshift.io/provider-display-name": "Red Hat, Inc."
1065+
}
1066+
},
1067+
"spec": {
1068+
"tags": [
1069+
{
1070+
"name": "1.18",
1071+
"annotations": {
1072+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
1073+
"description": "Build and run Java applications using Maven and OpenJDK 21 upon UBI8.",
1074+
"iconClass": "icon-rh-openjdk",
1075+
"tags": "builder,java,openjdk,ubi8,hidden",
1076+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
1077+
"sampleContextDir": "undertow-servlet",
1078+
"version": "1.18"
1079+
},
1080+
"referencePolicy": {
1081+
"type": "Local"
1082+
},
1083+
"from": {
1084+
"kind": "DockerImage",
1085+
"name": "registry.access.redhat.com/ubi8/openjdk-21:1.18"
1086+
}
1087+
}
1088+
]
1089+
}
10561090
},{
10571091
"kind": "ImageStream",
10581092
"apiVersion": "image.openshift.io/v1",

‎templates/runtime-image-streams.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,39 @@
557557
}
558558
]
559559
}
560+
},
561+
{
562+
"kind": "ImageStream",
563+
"apiVersion": "image.openshift.io/v1",
564+
"metadata": {
565+
"name": "ubi8-openjdk-21-runtime",
566+
"annotations": {
567+
"openshift.io/display-name": "Red Hat OpenJDK 21 Runtime (UBI8)",
568+
"openshift.io/provider-display-name": "Red Hat, Inc."
569+
}
570+
},
571+
"spec": {
572+
"tags": [
573+
{
574+
"name": "1.18",
575+
"annotations": {
576+
"openshift.io/display-name": "Red Hat OpenJDK 21 Runtime (UBI8)",
577+
"description": "Run Java applications using OpenJDK 21 upon UBI8.",
578+
"iconClass": "icon-rh-openjdk",
579+
"tags": "java,openjdk,ubi8",
580+
581+
"version": "1.18"
582+
},
583+
"referencePolicy": {
584+
"type": "Local"
585+
},
586+
"from": {
587+
"kind": "DockerImage",
588+
"name": "registry.access.redhat.com/ubi8/openjdk-21-runtime:1.18"
589+
}
590+
}
591+
]
592+
}
560593
},{
561594
"kind": "ImageStream",
562595
"apiVersion": "image.openshift.io/v1",

0 commit comments

Comments
 (0)