Skip to content

Commit a0cc5de

Browse files
jmtdjmtd
committed
[OPENJDK-2048] commit output of generateImageStreamTemplates.py
The output of generateImageStreamTemplates.py differs slightly from the original static files. There are some unimportant whitespace changes, and other changes best viewed through the wdiff filter (`git show -b --word-diff`) which are benign (or an improvement): * JDK8's version is written as '8' rather than '1.8' * RHEL8 is replaced with UBI8 * RHEL7 ImageStream 'display-name' is explicitly suffixed '(RHEL7)' and 'description' with 'upon RHEL7' * all container registry URIs are now registry.access.redhat.com rather then there be a mixture * ImageStream.annotations.version 1.4.17 (the deprecated xpaas project version) has gone, * as has the 'xpaas' label * java:8 and java:11 are added in the s390x and aarch64 templates. I think they were missing by mistake. * "sampleRepo" is removed from the few runtime imageStreams that (erroneously) had them defined Signed-off-by: Jonathan Dowland <[email protected]>
1 parent 0cd8d06 commit a0cc5de

File tree

6 files changed

+362
-372
lines changed

6 files changed

+362
-372
lines changed

‎templates/community-image-streams.json‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
"metadata": {
1616
"name": "ubi8-openjdk-8",
1717
"annotations": {
18-
"openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)",
18+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
1919
"openshift.io/provider-display-name": "Red Hat, Inc."
2020
}
2121
},
2222
"spec": {
2323
"tags": [
24-
{
24+
{
2525
"name": "1.3",
2626
"annotations": {
27-
"openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)",
28-
"description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.",
27+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
28+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
2929
"iconClass": "icon-rh-openjdk",
3030
"tags": "builder,java,openjdk,ubi8",
3131
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -43,8 +43,8 @@
4343
{
4444
"name": "1.10",
4545
"annotations": {
46-
"openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)",
47-
"description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.",
46+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
47+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
4848
"iconClass": "icon-rh-openjdk",
4949
"tags": "builder,java,openjdk,ubi8",
5050
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -62,8 +62,8 @@
6262
{
6363
"name": "1.11",
6464
"annotations": {
65-
"openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)",
66-
"description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.",
65+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
66+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
6767
"iconClass": "icon-rh-openjdk",
6868
"tags": "builder,java,openjdk,ubi8",
6969
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -81,8 +81,8 @@
8181
{
8282
"name": "1.12",
8383
"annotations": {
84-
"openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)",
85-
"description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.",
84+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
85+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
8686
"iconClass": "icon-rh-openjdk",
8787
"tags": "builder,java,openjdk,ubi8",
8888
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -100,7 +100,7 @@
100100
]
101101
}
102102
},
103-
{
103+
{
104104
"kind": "ImageStream",
105105
"apiVersion": "image.openshift.io/v1",
106106
"metadata": {
@@ -112,11 +112,11 @@
112112
},
113113
"spec": {
114114
"tags": [
115-
{
115+
{
116116
"name": "1.3",
117117
"annotations": {
118118
"openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)",
119-
"description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL8.",
119+
"description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.",
120120
"iconClass": "icon-rh-openjdk",
121121
"tags": "builder,java,openjdk,ubi8",
122122
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -135,7 +135,7 @@
135135
"name": "1.10",
136136
"annotations": {
137137
"openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)",
138-
"description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL8.",
138+
"description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.",
139139
"iconClass": "icon-rh-openjdk",
140140
"tags": "builder,java,openjdk,ubi8",
141141
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -154,7 +154,7 @@
154154
"name": "1.11",
155155
"annotations": {
156156
"openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)",
157-
"description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL8.",
157+
"description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.",
158158
"iconClass": "icon-rh-openjdk",
159159
"tags": "builder,java,openjdk,ubi8",
160160
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -173,7 +173,7 @@
173173
"name": "1.12",
174174
"annotations": {
175175
"openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)",
176-
"description": "Build and run Java applications using Maven and OpenJDK 11 upon RHEL8.",
176+
"description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.",
177177
"iconClass": "icon-rh-openjdk",
178178
"tags": "builder,java,openjdk,ubi8",
179179
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -191,7 +191,7 @@
191191
]
192192
}
193193
},
194-
{
194+
{
195195
"kind": "ImageStream",
196196
"apiVersion": "image.openshift.io/v1",
197197
"metadata": {
@@ -203,11 +203,11 @@
203203
},
204204
"spec": {
205205
"tags": [
206-
{
206+
{
207207
"name": "1.11",
208208
"annotations": {
209209
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)",
210-
"description": "Build and run Java applications using Maven and OpenJDK 17 upon RHEL8.",
210+
"description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.",
211211
"iconClass": "icon-rh-openjdk",
212212
"tags": "builder,java,openjdk,ubi8",
213213
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -226,7 +226,7 @@
226226
"name": "1.12",
227227
"annotations": {
228228
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)",
229-
"description": "Build and run Java applications using Maven and OpenJDK 17 upon RHEL8.",
229+
"description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.",
230230
"iconClass": "icon-rh-openjdk",
231231
"tags": "builder,java,openjdk,ubi8",
232232
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -243,8 +243,7 @@
243243
}
244244
]
245245
}
246-
},
247-
{
246+
}, {
248247
"kind": "ImageStream",
249248
"apiVersion": "image.openshift.io/v1",
250249
"metadata": {
@@ -380,4 +379,4 @@
380379
}
381380
}
382381
]
383-
}
382+
}

‎templates/image-streams-aarch64.json‎

Lines changed: 67 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"metadata": {
55
"name": "openjdk18-image-stream",
66
"annotations": {
7-
"description": "ImageStream definition for Red Hat OpenJDK.",
7+
"description": "ImageStream definition for Red Hat UBI8 OpenJDK.",
88
"openshift.io/provider-display-name": "Red Hat, Inc."
99
}
1010
},
@@ -15,21 +15,17 @@
1515
"metadata": {
1616
"name": "ubi8-openjdk-8",
1717
"annotations": {
18-
"openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)",
19-
"openshift.io/provider-display-name": "Red Hat, Inc.",
20-
"version": "1.4.17"
21-
},
22-
"labels": {
23-
"xpaas": "1.4.17"
18+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
19+
"openshift.io/provider-display-name": "Red Hat, Inc."
2420
}
2521
},
2622
"spec": {
2723
"tags": [
28-
{
24+
{
2925
"name": "1.3",
3026
"annotations": {
31-
"openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)",
32-
"description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.",
27+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
28+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
3329
"iconClass": "icon-rh-openjdk",
3430
"tags": "builder,java,openjdk,ubi8,hidden",
3531
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -47,8 +43,8 @@
4743
{
4844
"name": "1.10",
4945
"annotations": {
50-
"openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)",
51-
"description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.",
46+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
47+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
5248
"iconClass": "icon-rh-openjdk",
5349
"tags": "builder,java,openjdk,ubi8,hidden",
5450
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -66,8 +62,8 @@
6662
{
6763
"name": "1.11",
6864
"annotations": {
69-
"openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)",
70-
"description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.",
65+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
66+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
7167
"iconClass": "icon-rh-openjdk",
7268
"tags": "builder,java,openjdk,ubi8,hidden",
7369
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -85,8 +81,8 @@
8581
{
8682
"name": "1.12",
8783
"annotations": {
88-
"openshift.io/display-name": "Red Hat OpenJDK 1.8 (UBI8)",
89-
"description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.",
84+
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI8)",
85+
"description": "Build and run Java applications using Maven and OpenJDK 8 upon UBI8.",
9086
"iconClass": "icon-rh-openjdk",
9187
"tags": "builder,java,openjdk,ubi8,hidden",
9288
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
@@ -104,23 +100,19 @@
104100
]
105101
}
106102
},
107-
{
103+
{
108104
"kind": "ImageStream",
109105
"apiVersion": "image.openshift.io/v1",
110106
"metadata": {
111107
"name": "ubi8-openjdk-11",
112108
"annotations": {
113109
"openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)",
114-
"openshift.io/provider-display-name": "Red Hat, Inc.",
115-
"version": "1.4.17"
116-
},
117-
"labels": {
118-
"xpaas": "1.4.17"
110+
"openshift.io/provider-display-name": "Red Hat, Inc."
119111
}
120112
},
121113
"spec": {
122114
"tags": [
123-
{
115+
{
124116
"name": "1.3",
125117
"annotations": {
126118
"openshift.io/display-name": "Red Hat OpenJDK 11 (UBI8)",
@@ -199,23 +191,19 @@
199191
]
200192
}
201193
},
202-
{
194+
{
203195
"kind": "ImageStream",
204196
"apiVersion": "image.openshift.io/v1",
205197
"metadata": {
206198
"name": "ubi8-openjdk-17",
207199
"annotations": {
208200
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)",
209-
"openshift.io/provider-display-name": "Red Hat, Inc.",
210-
"version": "1.4.17"
211-
},
212-
"labels": {
213-
"xpaas": "1.4.17"
201+
"openshift.io/provider-display-name": "Red Hat, Inc."
214202
}
215203
},
216204
"spec": {
217205
"tags": [
218-
{
206+
{
219207
"name": "1.11",
220208
"annotations": {
221209
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI8)",
@@ -255,19 +243,14 @@
255243
}
256244
]
257245
}
258-
},
259-
{
246+
}, {
260247
"kind": "ImageStream",
261248
"apiVersion": "image.openshift.io/v1",
262249
"metadata": {
263250
"name": "java",
264251
"annotations": {
265252
"openshift.io/display-name": "Red Hat OpenJDK",
266-
"openshift.io/provider-display-name": "Red Hat, Inc.",
267-
"version": "1.4.17"
268-
},
269-
"labels": {
270-
"xpaas": "1.4.17"
253+
"openshift.io/provider-display-name": "Red Hat, Inc."
271254
}
272255
},
273256
"spec": {
@@ -276,7 +259,7 @@
276259
"name": "openjdk-8-ubi8",
277260
"annotations": {
278261
"openshift.io/display-name": "Red Hat OpenJDK 8 (UBI 8)",
279-
"description": "Build and run Java applications using Maven and OpenJDK 8.",
262+
"description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.",
280263
"iconClass": "icon-rh-openjdk",
281264
"tags": "builder,java,openjdk",
282265
"supports": "java:8,java",
@@ -289,14 +272,34 @@
289272
},
290273
"from": {
291274
"kind": "DockerImage",
292-
"name": "registry.redhat.io/ubi8/openjdk-8:latest"
275+
"name": "registry.access.redhat.com/ubi8/openjdk-8:latest"
276+
}
277+
},
278+
{
279+
"name": "8",
280+
"annotations": {
281+
"openshift.io/display-name": "Red Hat OpenJDK 8",
282+
"description": "Build and run Java applications using Maven and OpenJDK 1.8 upon UBI8.",
283+
"iconClass": "icon-rh-openjdk",
284+
"tags": "builder,java,openjdk,hidden",
285+
"supports": "java:8,java",
286+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
287+
"sampleContextDir": "undertow-servlet",
288+
"version": "8"
289+
},
290+
"referencePolicy": {
291+
"type": "Local"
292+
},
293+
"from": {
294+
"kind": "DockerImage",
295+
"name": "registry.access.redhat.com/ubi8/openjdk-8:latest"
293296
}
294297
},
295298
{
296299
"name": "openjdk-11-ubi8",
297300
"annotations": {
298301
"openshift.io/display-name": "Red Hat OpenJDK 11 (UBI 8)",
299-
"description": "Build and run Java applications using Maven and OpenJDK 11.",
302+
"description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.",
300303
"iconClass": "icon-rh-openjdk",
301304
"tags": "builder,java,openjdk",
302305
"supports": "java:11,java",
@@ -309,14 +312,34 @@
309312
},
310313
"from": {
311314
"kind": "DockerImage",
312-
"name": "registry.redhat.io/ubi8/openjdk-11:latest"
315+
"name": "registry.access.redhat.com/ubi8/openjdk-11:latest"
316+
}
317+
},
318+
{
319+
"name": "11",
320+
"annotations": {
321+
"openshift.io/display-name": "Red Hat OpenJDK 11",
322+
"description": "Build and run Java applications using Maven and OpenJDK 11 upon UBI8.",
323+
"iconClass": "icon-rh-openjdk",
324+
"tags": "builder,java,openjdk,hidden",
325+
"supports": "java:11,java",
326+
"sampleRepo": "https://github.com/jboss-openshift/openshift-quickstarts",
327+
"sampleContextDir": "undertow-servlet",
328+
"version": "11"
329+
},
330+
"referencePolicy": {
331+
"type": "Local"
332+
},
333+
"from": {
334+
"kind": "DockerImage",
335+
"name": "registry.access.redhat.com/ubi8/openjdk-11:latest"
313336
}
314337
},
315338
{
316339
"name": "openjdk-17-ubi8",
317340
"annotations": {
318341
"openshift.io/display-name": "Red Hat OpenJDK 17 (UBI 8)",
319-
"description": "Build and run Java applications using Maven and OpenJDK 17.",
342+
"description": "Build and run Java applications using Maven and OpenJDK 17 upon UBI8.",
320343
"iconClass": "icon-rh-openjdk",
321344
"tags": "builder,java,openjdk",
322345
"supports": "java:17,java",
@@ -329,7 +352,7 @@
329352
},
330353
"from": {
331354
"kind": "DockerImage",
332-
"name": "registry.redhat.io/ubi8/openjdk-17:latest"
355+
"name": "registry.access.redhat.com/ubi8/openjdk-17:latest"
333356
}
334357
},
335358
{
@@ -356,4 +379,4 @@
356379
}
357380
}
358381
]
359-
}
382+
}

0 commit comments

Comments
 (0)