Skip to content

Commit 61bed9d

Browse files
Osni Oliveiraosnipso
Osni Oliveira
authored and
osnipso
committed
Fix image streams to use the correct OpenJ9 repo; update legacy templates to use latest image stream
- Removed image streams from 1.0 to 1.5, since those versions were never released for OpenJ9 - The image streams were referencing the Intel tag; fixed - Tagging 7.3-v1.8-openj9
1 parent 5eae163 commit 61bed9d

8 files changed

+17
-125
lines changed

‎templates/datagrid73-basic.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"annotations": {
66
"iconClass": "icon-datagrid",
77
"tags": "datagrid,jboss",
8-
"version": "1.4",
8+
"version": "1.8",
99
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3 (Ephemeral, no https)",
1010
"openshift.io/provider-display-name": "Red Hat, Inc.",
1111
"description": "An example Red Hat JBoss Data Grid application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
@@ -290,7 +290,7 @@
290290
"from": {
291291
"kind": "ImageStreamTag",
292292
"namespace": "${IMAGE_STREAM_NAMESPACE}",
293-
"name": "jboss-datagrid73-openshift:1.4"
293+
"name": "jboss-datagrid73-openshift:1.8"
294294
}
295295
}
296296
},

‎templates/datagrid73-https.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"annotations": {
66
"iconClass": "icon-datagrid",
77
"tags": "datagrid,jboss,hidden",
8-
"version": "1.4",
8+
"version": "1.8",
99
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3 (Ephemeral with https)",
1010
"openshift.io/provider-display-name": "Red Hat, Inc.",
1111
"description": "An example Red Hat JBoss Data Grid application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
@@ -407,7 +407,7 @@
407407
"from": {
408408
"kind": "ImageStreamTag",
409409
"namespace": "${IMAGE_STREAM_NAMESPACE}",
410-
"name": "jboss-datagrid73-openshift:1.4"
410+
"name": "jboss-datagrid73-openshift:1.8"
411411
}
412412
}
413413
},

‎templates/datagrid73-image-stream.json‎

Lines changed: 3 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -22,114 +22,6 @@
2222
},
2323
"spec": {
2424
"tags": [
25-
{
26-
"name": "1.0",
27-
"annotations": {
28-
"description": "Red Hat JBoss Data Grid 7.3 image",
29-
"iconClass": "icon-datagrid",
30-
"tags": "datagrid,jboss,hidden",
31-
"supports": "datagrid:7.3",
32-
"version": "1.0",
33-
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3"
34-
},
35-
"referencePolicy": {
36-
"type": "Local"
37-
},
38-
"from": {
39-
"kind": "DockerImage",
40-
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.0"
41-
}
42-
},
43-
{
44-
"name": "1.1",
45-
"annotations": {
46-
"description": "Red Hat JBoss Data Grid 7.3 image",
47-
"iconClass": "icon-datagrid",
48-
"tags": "datagrid,jboss,hidden",
49-
"supports": "datagrid:7.3",
50-
"version": "1.1",
51-
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3"
52-
},
53-
"referencePolicy": {
54-
"type": "Local"
55-
},
56-
"from": {
57-
"kind": "DockerImage",
58-
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.1"
59-
}
60-
},
61-
{
62-
"name": "1.2",
63-
"annotations": {
64-
"description": "Red Hat JBoss Data Grid 7.3 image",
65-
"iconClass": "icon-datagrid",
66-
"tags": "datagrid,jboss,hidden",
67-
"supports": "datagrid:7.3",
68-
"version": "1.2",
69-
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3"
70-
},
71-
"referencePolicy": {
72-
"type": "Local"
73-
},
74-
"from": {
75-
"kind": "DockerImage",
76-
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.2"
77-
}
78-
},
79-
{
80-
"name": "1.3",
81-
"annotations": {
82-
"description": "Red Hat JBoss Data Grid 7.3 image",
83-
"iconClass": "icon-datagrid",
84-
"tags": "datagrid,jboss,hidden",
85-
"supports": "datagrid:7.3",
86-
"version": "1.3",
87-
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3"
88-
},
89-
"referencePolicy": {
90-
"type": "Local"
91-
},
92-
"from": {
93-
"kind": "DockerImage",
94-
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.3"
95-
}
96-
},
97-
{
98-
"name": "1.4",
99-
"annotations": {
100-
"description": "Red Hat JBoss Data Grid 7.3 image",
101-
"iconClass": "icon-datagrid",
102-
"tags": "datagrid,jboss,hidden",
103-
"supports": "datagrid:7.3",
104-
"version": "1.4",
105-
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3"
106-
},
107-
"referencePolicy": {
108-
"type": "Local"
109-
},
110-
"from": {
111-
"kind": "DockerImage",
112-
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.4"
113-
}
114-
},
115-
{
116-
"name": "1.5",
117-
"annotations": {
118-
"description": "Red Hat JBoss Data Grid 7.3 image",
119-
"iconClass": "icon-datagrid",
120-
"tags": "datagrid,jboss,hidden",
121-
"supports": "datagrid:7.3",
122-
"version": "1.5",
123-
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3"
124-
},
125-
"referencePolicy": {
126-
"type": "Local"
127-
},
128-
"from": {
129-
"kind": "DockerImage",
130-
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.5"
131-
}
132-
},
13325
{
13426
"name": "1.6",
13527
"annotations": {
@@ -145,7 +37,7 @@
14537
},
14638
"from": {
14739
"kind": "DockerImage",
148-
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.6"
40+
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openj9-11-openshift-rhel8:1.6"
14941
}
15042
},
15143
{
@@ -163,7 +55,7 @@
16355
},
16456
"from": {
16557
"kind": "DockerImage",
166-
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.7"
58+
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openj9-11-openshift-rhel8:1.7"
16759
}
16860
},
16961
{
@@ -181,7 +73,7 @@
18173
},
18274
"from": {
18375
"kind": "DockerImage",
184-
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openshift:1.8"
76+
"name": "registry.redhat.io/jboss-datagrid-7/datagrid73-openj9-11-openshift-rhel8:1.8"
18577
}
18678
}
18779
]

‎templates/datagrid73-mysql-persistent.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"annotations": {
66
"iconClass": "icon-datagrid",
77
"tags": "datagrid,jboss",
8-
"version": "1.4",
8+
"version": "1.8",
99
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3 + MySQL (with https)",
1010
"openshift.io/provider-display-name": "Red Hat, Inc.",
1111
"description": "An example Red Hat JBoss Data Grid application with a MySQL database. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
@@ -527,7 +527,7 @@
527527
"from": {
528528
"kind": "ImageStreamTag",
529529
"namespace": "${IMAGE_STREAM_NAMESPACE}",
530-
"name": "jboss-datagrid73-openshift:1.4"
530+
"name": "jboss-datagrid73-openshift:1.8"
531531
}
532532
}
533533
},

‎templates/datagrid73-mysql.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"annotations": {
66
"iconClass": "icon-datagrid",
77
"tags": "datagrid,jboss,hidden",
8-
"version": "1.4",
8+
"version": "1.8",
99
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3 + MySQL (Ephemeral with https)",
1010
"openshift.io/provider-display-name": "Red Hat, Inc.",
1111
"description": "An example Red Hat JBoss Data Grid application with a MySQL database. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
@@ -520,7 +520,7 @@
520520
"from": {
521521
"kind": "ImageStreamTag",
522522
"namespace": "${IMAGE_STREAM_NAMESPACE}",
523-
"name": "jboss-datagrid73-openshift:1.4"
523+
"name": "jboss-datagrid73-openshift:1.8"
524524
}
525525
}
526526
},

‎templates/datagrid73-partition.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"annotations": {
66
"iconClass": "icon-datagrid",
77
"tags": "datagrid,jboss,hidden",
8-
"version": "1.4",
8+
"version": "1.8",
99
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3 (Ephemeral, no https)",
1010
"openshift.io/provider-display-name": "Red Hat, Inc.",
1111
"description": "An example Red Hat JBoss Data Grid application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
@@ -328,7 +328,7 @@
328328
"from": {
329329
"kind": "ImageStreamTag",
330330
"namespace": "${IMAGE_STREAM_NAMESPACE}",
331-
"name": "jboss-datagrid73-openshift:1.4"
331+
"name": "jboss-datagrid73-openshift:1.8"
332332
}
333333
}
334334
},

‎templates/datagrid73-postgresql-persistent.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"annotations": {
66
"iconClass": "icon-datagrid",
77
"tags": "datagrid,jboss",
8-
"version": "1.4",
8+
"version": "1.8",
99
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3 + PostgreSQL (with https)",
1010
"openshift.io/provider-display-name": "Red Hat, Inc.",
1111
"description": "An example Red Hat JBoss Data Grid application with a PostgreSQL database. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
@@ -507,7 +507,7 @@
507507
"from": {
508508
"kind": "ImageStreamTag",
509509
"namespace": "${IMAGE_STREAM_NAMESPACE}",
510-
"name": "jboss-datagrid73-openshift:1.4"
510+
"name": "jboss-datagrid73-openshift:1.8"
511511
}
512512
}
513513
},

‎templates/datagrid73-postgresql.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"annotations": {
66
"iconClass": "icon-datagrid",
77
"tags": "datagrid,jboss,hidden",
8-
"version": "1.4",
8+
"version": "1.8",
99
"openshift.io/display-name": "Red Hat JBoss Data Grid 7.3 + PostgreSQL (Ephemeral with https)",
1010
"openshift.io/provider-display-name": "Red Hat, Inc.",
1111
"description": "An example Red Hat JBoss Data Grid application with a PostgreSQL database. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
@@ -500,7 +500,7 @@
500500
"from": {
501501
"kind": "ImageStreamTag",
502502
"namespace": "${IMAGE_STREAM_NAMESPACE}",
503-
"name": "jboss-datagrid73-openshift:1.4"
503+
"name": "jboss-datagrid73-openshift:1.8"
504504
}
505505
}
506506
},

0 commit comments

Comments
 (0)