Skip to content

Commit 5e9d07e

Browse files
jmtdjmtd
authored
Merge pull request #627 from jmtd/update-ocp-templates
[OPENJDK-4363] Update ocp templates (version ranges, JDK25 images)
2 parents c4725ed + 660b422 commit 5e9d07e

File tree

7 files changed

+401
-3
lines changed

7 files changed

+401
-3
lines changed

‎templates/community-image-streams.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,25 @@
267267
"kind": "DockerImage",
268268
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.21"
269269
}
270+
},
271+
{
272+
"name": "1.23",
273+
"annotations": {
274+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
275+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
276+
"iconClass": "icon-rh-openjdk",
277+
"tags": "builder,java,openjdk,ubi8",
278+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
279+
"sampleContextDir": "undertow-servlet",
280+
"version": "1.23"
281+
},
282+
"referencePolicy": {
283+
"type": "Local"
284+
},
285+
"from": {
286+
"kind": "DockerImage",
287+
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.23"
288+
}
270289
}
271290
]
272291
}
@@ -753,6 +772,25 @@
753772
"kind": "DockerImage",
754773
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.21"
755774
}
775+
},
776+
{
777+
"name": "1.23",
778+
"annotations": {
779+
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)",
780+
"description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.",
781+
"iconClass": "icon-rh-openjdk",
782+
"tags": "builder,java,openjdk,ubi8",
783+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
784+
"sampleContextDir": "undertow-servlet",
785+
"version": "1.23"
786+
},
787+
"referencePolicy": {
788+
"type": "Local"
789+
},
790+
"from": {
791+
"kind": "DockerImage",
792+
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.23"
793+
}
756794
}
757795
]
758796
}
@@ -844,6 +882,25 @@
844882
"kind": "DockerImage",
845883
"name": "registry.access.redhat.com/ubi8/openjdk-21:1.21"
846884
}
885+
},
886+
{
887+
"name": "1.23",
888+
"annotations": {
889+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
890+
"description": "Build and run Java applications using Maven and OpenJDK 21 upon UBI8.",
891+
"iconClass": "icon-rh-openjdk",
892+
"tags": "builder,java,openjdk,ubi8",
893+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
894+
"sampleContextDir": "undertow-servlet",
895+
"version": "1.23"
896+
},
897+
"referencePolicy": {
898+
"type": "Local"
899+
},
900+
"from": {
901+
"kind": "DockerImage",
902+
"name": "registry.access.redhat.com/ubi8/openjdk-21:1.23"
903+
}
847904
}
848905
]
849906
}

‎templates/data.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ rhel7:
2424
not: [ 2, 3, 4, 5, 6, 7, 8, 9, 13 ]
2525
ubi8:
2626
from: 3
27-
to: 21
28-
not: [ 4, 5, 6, 7, 8, 9 ]
27+
to: 23
28+
not: [ 4, 5, 6, 7, 8, 9, 22 ]
2929
builder: # "ubi8/openjdk-X"
3030
8: {}
3131
11:
@@ -52,12 +52,14 @@ ubi8:
5252
# ubi9 is not yet being used in any templates
5353
ubi9:
5454
from: 13
55-
to: 21
55+
to: 24
5656
builder:
5757
11: {}
5858
17: {}
5959
21:
6060
from: 17
61+
25:
62+
from: 24
6163
runtime:
6264
11:
6365
name: "ubi9/openjdk-11-runtime"
@@ -66,3 +68,6 @@ ubi9:
6668
21:
6769
name: "ubi9/openjdk-21-runtime"
6870
from: 17
71+
25:
72+
name: "ubi9/openjdk-25-runtime"
73+
from: 24

‎templates/image-streams-aarch64.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,25 @@
267267
"kind": "DockerImage",
268268
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.21"
269269
}
270+
},
271+
{
272+
"name": "1.23",
273+
"annotations": {
274+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
275+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
276+
"iconClass": "icon-rh-openjdk",
277+
"tags": "builder,java,openjdk,ubi8,hidden",
278+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
279+
"sampleContextDir": "undertow-servlet",
280+
"version": "1.23"
281+
},
282+
"referencePolicy": {
283+
"type": "Local"
284+
},
285+
"from": {
286+
"kind": "DockerImage",
287+
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.23"
288+
}
270289
}
271290
]
272291
}
@@ -753,6 +772,25 @@
753772
"kind": "DockerImage",
754773
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.21"
755774
}
775+
},
776+
{
777+
"name": "1.23",
778+
"annotations": {
779+
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)",
780+
"description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.",
781+
"iconClass": "icon-rh-openjdk",
782+
"tags": "builder,java,openjdk,ubi8,hidden",
783+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
784+
"sampleContextDir": "undertow-servlet",
785+
"version": "1.23"
786+
},
787+
"referencePolicy": {
788+
"type": "Local"
789+
},
790+
"from": {
791+
"kind": "DockerImage",
792+
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.23"
793+
}
756794
}
757795
]
758796
}
@@ -844,6 +882,25 @@
844882
"kind": "DockerImage",
845883
"name": "registry.access.redhat.com/ubi8/openjdk-21:1.21"
846884
}
885+
},
886+
{
887+
"name": "1.23",
888+
"annotations": {
889+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
890+
"description": "Build and run Java applications using Maven and OpenJDK 21 upon UBI8.",
891+
"iconClass": "icon-rh-openjdk",
892+
"tags": "builder,java,openjdk,ubi8,hidden",
893+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
894+
"sampleContextDir": "undertow-servlet",
895+
"version": "1.23"
896+
},
897+
"referencePolicy": {
898+
"type": "Local"
899+
},
900+
"from": {
901+
"kind": "DockerImage",
902+
"name": "registry.access.redhat.com/ubi8/openjdk-21:1.23"
903+
}
847904
}
848905
]
849906
}

‎templates/image-streams-ppc64le.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,25 @@
695695
"kind": "DockerImage",
696696
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.21"
697697
}
698+
},
699+
{
700+
"name": "1.23",
701+
"annotations": {
702+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
703+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
704+
"iconClass": "icon-rh-openjdk",
705+
"tags": "builder,java,openjdk,ubi8,hidden",
706+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
707+
"sampleContextDir": "undertow-servlet",
708+
"version": "1.23"
709+
},
710+
"referencePolicy": {
711+
"type": "Local"
712+
},
713+
"from": {
714+
"kind": "DockerImage",
715+
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.23"
716+
}
698717
}
699718
]
700719
}
@@ -1181,6 +1200,25 @@
11811200
"kind": "DockerImage",
11821201
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.21"
11831202
}
1203+
},
1204+
{
1205+
"name": "1.23",
1206+
"annotations": {
1207+
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)",
1208+
"description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.",
1209+
"iconClass": "icon-rh-openjdk",
1210+
"tags": "builder,java,openjdk,ubi8,hidden",
1211+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
1212+
"sampleContextDir": "undertow-servlet",
1213+
"version": "1.23"
1214+
},
1215+
"referencePolicy": {
1216+
"type": "Local"
1217+
},
1218+
"from": {
1219+
"kind": "DockerImage",
1220+
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.23"
1221+
}
11841222
}
11851223
]
11861224
}
@@ -1272,6 +1310,25 @@
12721310
"kind": "DockerImage",
12731311
"name": "registry.access.redhat.com/ubi8/openjdk-21:1.21"
12741312
}
1313+
},
1314+
{
1315+
"name": "1.23",
1316+
"annotations": {
1317+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
1318+
"description": "Build and run Java applications using Maven and OpenJDK 21 upon UBI8.",
1319+
"iconClass": "icon-rh-openjdk",
1320+
"tags": "builder,java,openjdk,ubi8,hidden",
1321+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
1322+
"sampleContextDir": "undertow-servlet",
1323+
"version": "1.23"
1324+
},
1325+
"referencePolicy": {
1326+
"type": "Local"
1327+
},
1328+
"from": {
1329+
"kind": "DockerImage",
1330+
"name": "registry.access.redhat.com/ubi8/openjdk-21:1.23"
1331+
}
12751332
}
12761333
]
12771334
}

‎templates/image-streams-s390x.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,25 @@
695695
"kind": "DockerImage",
696696
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.21"
697697
}
698+
},
699+
{
700+
"name": "1.23",
701+
"annotations": {
702+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
703+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
704+
"iconClass": "icon-rh-openjdk",
705+
"tags": "builder,java,openjdk,ubi8,hidden",
706+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
707+
"sampleContextDir": "undertow-servlet",
708+
"version": "1.23"
709+
},
710+
"referencePolicy": {
711+
"type": "Local"
712+
},
713+
"from": {
714+
"kind": "DockerImage",
715+
"name": "registry.access.redhat.com/ubi8/openjdk-8:1.23"
716+
}
698717
}
699718
]
700719
}
@@ -1181,6 +1200,25 @@
11811200
"kind": "DockerImage",
11821201
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.21"
11831202
}
1203+
},
1204+
{
1205+
"name": "1.23",
1206+
"annotations": {
1207+
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)",
1208+
"description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.",
1209+
"iconClass": "icon-rh-openjdk",
1210+
"tags": "builder,java,openjdk,ubi8,hidden",
1211+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
1212+
"sampleContextDir": "undertow-servlet",
1213+
"version": "1.23"
1214+
},
1215+
"referencePolicy": {
1216+
"type": "Local"
1217+
},
1218+
"from": {
1219+
"kind": "DockerImage",
1220+
"name": "registry.access.redhat.com/ubi8/openjdk-17:1.23"
1221+
}
11841222
}
11851223
]
11861224
}
@@ -1272,6 +1310,25 @@
12721310
"kind": "DockerImage",
12731311
"name": "registry.access.redhat.com/ubi8/openjdk-21:1.21"
12741312
}
1313+
},
1314+
{
1315+
"name": "1.23",
1316+
"annotations": {
1317+
"openshift.io/display-name": "Red Hat OpenJDK 21 (UBI8)",
1318+
"description": "Build and run Java applications using Maven and OpenJDK 21 upon UBI8.",
1319+
"iconClass": "icon-rh-openjdk",
1320+
"tags": "builder,java,openjdk,ubi8,hidden",
1321+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
1322+
"sampleContextDir": "undertow-servlet",
1323+
"version": "1.23"
1324+
},
1325+
"referencePolicy": {
1326+
"type": "Local"
1327+
},
1328+
"from": {
1329+
"kind": "DockerImage",
1330+
"name": "registry.access.redhat.com/ubi8/openjdk-21:1.23"
1331+
}
12751332
}
12761333
]
12771334
}

0 commit comments

Comments
 (0)