Skip to content

Commit c415da1

Browse files
author
agajdosi
committed
Issue #179 Update eap-cd addon to EAP-CD-15
1 parent cfcdd8e commit c415da1

18 files changed

+1259
-66
lines changed

‎add-ons/eap-cd/eap-cd.addon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Name: eap-cd
2-
# Description: Imports EAP CD 14 templates
2+
# Description: Imports EAP CD 15 templates
33
# Url: https://github.com/jboss-container-images/jboss-eap-7-openshift-image/tree/eap-cd/templates
44

55
# Templates
66
oc apply -f templates -n openshift
77
# ImageStream
88
oc apply -f imagestream -n openshift
99

10-
echo EAP CD 14 imagestreams and templates installed
10+
echo EAP CD 15 imagestreams and templates installed

‎add-ons/eap-cd/imagestream/eap-cd-image-stream.json‎

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
},
2323
"labels": {
24-
"xpaas": "14.0"
24+
"xpaas": "15.0"
2525
},
2626
"spec": {
2727
"tags": [
@@ -31,7 +31,7 @@
3131
"description": "The latest available build of JBoss EAP continuous delivery Tech Preview.",
3232
"iconClass": "icon-eap",
3333
"tags": "builder,eap,javaee,java,jboss,hidden",
34-
"supports": "eap:7.2,javaee:8,java:8",
34+
"supports": "eap:7.3,javaee:8,java:8",
3535
"sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift",
3636
"sampleContextDir": "kitchensink",
3737
"sampleRef": "openshift",
@@ -46,6 +46,28 @@
4646
"name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift:latest"
4747
}
4848
},
49+
{
50+
"name": "15",
51+
"annotations": {
52+
"description": "JBoss EAP continuous delivery Tech Preview version 15.",
53+
"iconClass": "icon-eap",
54+
"tags": "builder,eap,javaee,java,jboss,hidden",
55+
"supports": "eap:7.3,javaee:8,java:8",
56+
"sampleRepo": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
57+
"sampleContextDir": "kitchensink",
58+
"sampleRef": "openshift",
59+
"version": "15",
60+
"openshift.io/display-name": "JBoss EAP continuous delivery 15 (Tech Preview)"
61+
},
62+
"referencePolicy": {
63+
"type": "Local"
64+
},
65+
"from": {
66+
"kind": "ImageStreamTag",
67+
"name": "15.0"
68+
69+
}
70+
},
4971
{
5072
"name": "14",
5173
"annotations": {
@@ -174,7 +196,29 @@
174196
"kind": "DockerImage",
175197
"name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift:14.0"
176198
}
199+
},
200+
{
201+
"name": "15.0",
202+
"annotations": {
203+
"description": "JBoss EAP continuous delivery 15 Tech Preview S2I Image",
204+
"iconClass": "icon-eap",
205+
"tags": "builder,eap,javaee,java,jboss,hidden",
206+
"supports": "eap:7.3,javaee:8,java:8",
207+
"sampleRepo": "https://github.com/jbossas/eap-quickstarts/openshift",
208+
"sampleContextDir": "kitchensink",
209+
"sampleRef": "openshift",
210+
"version": "15.0",
211+
"openshift.io/display-name": "JBoss EAP continuous delivery 15 (Tech Preview)"
212+
},
213+
"referencePolicy": {
214+
"type": "Local"
215+
},
216+
"from": {
217+
"kind": "DockerImage",
218+
"name": "registry.redhat.io/jboss-eap-7-tech-preview/eap-cd-openshift:15.0"
219+
}
177220
}
221+
178222
]
179223
}
180224
}

‎add-ons/eap-cd/templates/eap-cd-amq-persistent-s2i.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"labels": {
1919
"template": "eap-cd-amq-persistent-s2i",
20-
"xpaas": "14.0"
20+
"xpaas": "15.0"
2121
},
2222
"message": "A new JBoss EAP CD and AMQ persistent based application with SSL support has been created in your project. The username/password for accessing the AMQ service is ${MQ_USERNAME}/${MQ_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
2323
"parameters": [
@@ -324,6 +324,7 @@
324324
"kind": "Service",
325325
"apiVersion": "v1",
326326
"spec": {
327+
"publishNotReadyAddresses": true,
327328
"clusterIP": "None",
328329
"ports": [
329330
{
@@ -488,7 +489,7 @@
488489
"from": {
489490
"kind": "ImageStreamTag",
490491
"namespace": "${IMAGE_STREAM_NAMESPACE}",
491-
"name": "eap-cd-openshift:14"
492+
"name": "eap-cd-openshift:15"
492493
}
493494
}
494495
},
@@ -770,7 +771,7 @@
770771
"from": {
771772
"kind": "ImageStreamTag",
772773
"namespace": "${IMAGE_STREAM_NAMESPACE}",
773-
"name": "amq-broker-71-openshift:1.0"
774+
"name": "amq-broker-72-openshift:1.1"
774775
}
775776
}
776777
},
@@ -795,7 +796,7 @@
795796
"containers": [
796797
{
797798
"name": "${APPLICATION_NAME}-amq",
798-
"image": "amq-broker-71-openshift",
799+
"image": "amq-broker-72-openshift",
799800
"imagePullPolicy": "Always",
800801
"readinessProbe": {
801802
"exec": {

‎add-ons/eap-cd/templates/eap-cd-amq-s2i.json‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"annotations": {
66
"iconClass": "icon-eap",
77
"tags": "eap,javaee,java,jboss,hidden",
8-
"version": "14.0",
9-
"openshift.io/display-name": "JBoss EAP CD 14 + AMQ 7 with passthrough TLS",
8+
"version": "15.0",
9+
"openshift.io/display-name": "JBoss EAP CD 15 + AMQ 7 with passthrough TLS",
1010
"openshift.io/provider-display-name": "Red Hat, Inc.",
1111
"description": "An example JBoss Enterprise Application Platform continuous delivery application using Red Hat JBoss AMQ. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc",
1212
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery based application, including a build configuration, application deployment configuration, using Red Hat JBoss AMQ and secure communication using passthrough TLS.",
@@ -17,7 +17,7 @@
1717
},
1818
"labels": {
1919
"template": "eap-cd-amq-s2i",
20-
"xpaas": "14.0"
20+
"xpaas": "15.0"
2121
},
2222
"message": "A new JBoss EAP CD and AMQ 7 based application with SSL support has been created in your project. The username/password for accessing the AMQ service is ${MQ_USERNAME}/${MQ_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
2323
"parameters": [
@@ -142,6 +142,12 @@
142142
"generate": "expression",
143143
"required": false
144144
},
145+
{
146+
"displayName": "AMQ Role",
147+
"description": "AMQ Role for authenticated user",
148+
"name": "MQ_ROLE",
149+
"value": "admin"
150+
},
145151
{
146152
"displayName": "AMQ Mesh Discovery Type",
147153
"description": "The discovery agent type to use for discovering mesh endpoints. 'dns' will use OpenShift's DNS service to resolve endpoints. 'kube' will use Kubernetes REST API to resolve service endpoints. If using 'kube' the service account for the pod must have the 'view' role, which can be added via 'oc policy add-role-to-user view system:serviceaccount:<namespace>:default' where <namespace> is the project namespace.",
@@ -304,6 +310,7 @@
304310
"kind": "Service",
305311
"apiVersion": "v1",
306312
"spec": {
313+
"publishNotReadyAddresses": true,
307314
"clusterIP": "None",
308315
"ports": [
309316
{
@@ -468,7 +475,7 @@
468475
"from": {
469476
"kind": "ImageStreamTag",
470477
"namespace": "${IMAGE_STREAM_NAMESPACE}",
471-
"name": "eap-cd-openshift:14"
478+
"name": "eap-cd-openshift:15"
472479
}
473480
}
474481
},
@@ -626,6 +633,10 @@
626633
"name": "MQ_PASSWORD",
627634
"value": "${MQ_PASSWORD}"
628635
},
636+
{
637+
"name": "MQ_ROLE",
638+
"value": "${MQ_ROLE}"
639+
},
629640
{
630641
"name": "MQ_PROTOCOL",
631642
"value": "tcp"
@@ -747,7 +758,7 @@
747758
"from": {
748759
"kind": "ImageStreamTag",
749760
"namespace": "${IMAGE_STREAM_NAMESPACE}",
750-
"name": "amq-broker-71-openshift:1.0"
761+
"name": "amq-broker-72-openshift:1.1"
751762
}
752763
}
753764
},
@@ -772,7 +783,7 @@
772783
"containers": [
773784
{
774785
"name": "${APPLICATION_NAME}-amq",
775-
"image": "amq-broker-71-openshift",
786+
"image": "amq-broker-72-openshift",
776787
"imagePullPolicy": "Always",
777788
"readinessProbe": {
778789
"exec": {

‎add-ons/eap-cd/templates/eap-cd-basic-s2i.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"annotations": {
66
"iconClass": "icon-eap",
77
"tags": "eap,javaee,java,jboss",
8-
"version": "14.0",
9-
"openshift.io/display-name": "JBoss EAP CD 14",
8+
"version": "15.0",
9+
"openshift.io/display-name": "JBoss EAP CD 15",
1010
"openshift.io/provider-display-name": "Red Hat, Inc.",
1111
"description": "An example JBoss Enterprise Application Platform continuous delivery application. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc",
1212
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery based application, including a build configuration, application deployment configuration and secure communication using edge TLS.",
@@ -17,7 +17,7 @@
1717
},
1818
"labels": {
1919
"template": "eap-cd-basic-s2i",
20-
"xpaas": "14.0"
20+
"xpaas": "15.0"
2121
},
2222
"message": "A new JBoss EAP CD based application has been created in your project.",
2323
"parameters": [
@@ -165,6 +165,7 @@
165165
"kind": "Service",
166166
"apiVersion": "v1",
167167
"spec": {
168+
"publishNotReadyAddresses": true,
168169
"clusterIP": "None",
169170
"ports": [
170171
{
@@ -260,7 +261,7 @@
260261
"from": {
261262
"kind": "ImageStreamTag",
262263
"namespace": "${IMAGE_STREAM_NAMESPACE}",
263-
"name": "eap-cd-openshift:14"
264+
"name": "eap-cd-openshift:15"
264265
}
265266
}
266267
},

‎add-ons/eap-cd/templates/eap-cd-https-s2i.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"annotations": {
66
"iconClass": "icon-eap",
77
"tags": "eap,javaee,java,jboss",
8-
"version": "14.0",
9-
"openshift.io/display-name": "JBoss EAP CD 14 with passthrough TLS",
8+
"version": "15.0",
9+
"openshift.io/display-name": "JBoss EAP CD 15 with passthrough TLS",
1010
"openshift.io/provider-display-name": "Red Hat, Inc.",
1111
"description": "An example JBoss Enterprise Application Platform continuous delivery application configured with secure communication using HTTPS. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc",
1212
"template.openshift.io/long-description": "This template defines resources needed to develop a JBoss Enterprise Application Platform continuous delivery application, including a build configuration, application deployment configuration and secure communication using passthrough TLS.",
@@ -17,7 +17,7 @@
1717
},
1818
"labels": {
1919
"template": "eap-cd-https-s2i",
20-
"xpaas": "14.0"
20+
"xpaas": "15.0"
2121
},
2222
"message": "A new JBoss EAP CD based application with SSL support has been created in your project. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
2323
"parameters": [
@@ -259,6 +259,7 @@
259259
"kind": "Service",
260260
"apiVersion": "v1",
261261
"spec": {
262+
"publishNotReadyAddresses": true,
262263
"clusterIP": "None",
263264
"ports": [
264265
{
@@ -373,7 +374,7 @@
373374
"from": {
374375
"kind": "ImageStreamTag",
375376
"namespace": "${IMAGE_STREAM_NAMESPACE}",
376-
"name": "eap-cd-openshift:14"
377+
"name": "eap-cd-openshift:15"
377378
}
378379
}
379380
},

‎add-ons/eap-cd/templates/eap-cd-mongodb-persistent-s2i.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"annotations": {
66
"iconClass": "icon-eap",
77
"tags": "eap,javaee,java,jboss",
8-
"version": "14.0",
9-
"openshift.io/display-name": "JBoss EAP CD 14 + MongoDB with passthrough TLS",
8+
"version": "15.0",
9+
"openshift.io/display-name": "JBoss EAP CD 15 + MongoDB with passthrough TLS",
1010
"openshift.io/provider-display-name": "Red Hat, Inc.",
1111
"description": "An example JBoss Enterprise Application Platform continuous delivery application with a MongoDB database. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc.",
1212
"template.openshift.io/long-description": "This template defines resources needed to develop JBoss Enterprise Application Server continuous delivery based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using persistence and secure communication using passthrough TLS.",
@@ -17,7 +17,7 @@
1717
},
1818
"labels": {
1919
"template": "eap-cd-mongodb-persistent-s2i",
20-
"xpaas": "14.0"
20+
"xpaas": "15.0"
2121
},
2222
"message": "A new JBoss EAP CD and MongoDB persistent based application with SSL support has been created in your project. The username/password for accessing the MongoDB database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\"). Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
2323
"parameters": [
@@ -373,6 +373,7 @@
373373
"kind": "Service",
374374
"apiVersion": "v1",
375375
"spec": {
376+
"publishNotReadyAddresses": true,
376377
"clusterIP": "None",
377378
"ports": [
378379
{
@@ -487,7 +488,7 @@
487488
"from": {
488489
"kind": "ImageStreamTag",
489490
"namespace": "${IMAGE_STREAM_NAMESPACE}",
490-
"name": "eap-cd-openshift:14"
491+
"name": "eap-cd-openshift:15"
491492
}
492493
}
493494
},

‎add-ons/eap-cd/templates/eap-cd-mongodb-s2i.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"annotations": {
66
"iconClass": "icon-eap",
77
"tags": "eap,javaee,java,jboss,hidden",
8-
"version": "14.0",
9-
"openshift.io/display-name": "JBoss EAP CD 14 + MongoDB (Ephemeral, with passthrough TLS)",
8+
"version": "15.0",
9+
"openshift.io/display-name": "JBoss EAP CD 15 + MongoDB (Ephemeral, with passthrough TLS)",
1010
"openshift.io/provider-display-name": "Red Hat, Inc.",
1111
"description": "An example JBoss Enterprise Application Platform continuous delivery application with a MongoDB database. For more information about using this template, see https://github.com/jboss-container-images/jboss-eap-7-openshift-image/blob/eap-cd/README.adoc.",
1212
"template.openshift.io/long-description": "This template defines resources needed to develop JBoss Enterprise Application Server continuous delivery based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using ephemeral (temporary) storage and secure communication using passthrough TLS.",
@@ -17,7 +17,7 @@
1717
},
1818
"labels": {
1919
"template": "eap-cd-mongodb-s2i",
20-
"xpaas": "14.0"
20+
"xpaas": "15.0"
2121
},
2222
"message": "A new EAP CD and MongoDB based application with SSL support has been created in your project. The username/password for accessing the MongoDB database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\"). Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications.",
2323
"parameters": [
@@ -366,6 +366,7 @@
366366
"kind": "Service",
367367
"apiVersion": "v1",
368368
"spec": {
369+
"publishNotReadyAddresses": true,
369370
"clusterIP": "None",
370371
"ports": [
371372
{
@@ -480,7 +481,7 @@
480481
"from": {
481482
"kind": "ImageStreamTag",
482483
"namespace": "${IMAGE_STREAM_NAMESPACE}",
483-
"name": "eap-cd-openshift:14"
484+
"name": "eap-cd-openshift:15"
484485
}
485486
}
486487
},

0 commit comments

Comments
 (0)