Skip to content

Commit 3d346f1

Browse files
rcernichrcernich
committed
CLOUD-2249 secure routes for basic EAP, JWS and Java templates using TLS edge
 replace passthrough TLS with edge TLS for ephemeral templates remove HTTP/S_NAME parameters from basic and ephemeral templates Signed-off-by: rcernich <[email protected]>
1 parent 76d9e58 commit 3d346f1

40 files changed

+165
-2475
lines changed

‎eap/eap64-amq-persistent-s2i.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"iconClass": "icon-eap",
77
"tags": "eap,javaee,java,jboss",
88
"version": "1.4.10",
9-
"openshift.io/display-name": "JBoss EAP 6.4 + A-MQ (with https)",
9+
"openshift.io/display-name": "JBoss EAP 6.4 + AMQ (Persistent)",
1010
"openshift.io/provider-display-name": "Red Hat, Inc.",
11-
"description": "An example EAP 6 A-MQ application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
12-
"template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, using Red Hat JBoss A-MQ with persistence and secure communication using https.",
11+
"description": "An example EAP 6 AMQ application. For more information about using this template, see https://github.com/jboss-openshift/application-templates.",
12+
"template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, using Red Hat JBoss AMQ with persistence and secure communication using passthrough TLS.",
1313
"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/",
1414
"template.openshift.io/support-url": "https://access.redhat.com"
1515
},
@@ -19,7 +19,7 @@
1919
"template": "eap64-amq-persistent-s2i",
2020
"xpaas": "1.4.10"
2121
},
22-
"message": "A new EAP 6 and A-MQ persistent based application with SSL support has been created in your project. The username/password for accessing the A-MQ 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.",
22+
"message": "A new EAP 6 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": [
2424
{
2525
"displayName": "Application Name",
@@ -64,8 +64,8 @@
6464
"required": false
6565
},
6666
{
67-
"displayName": "A-MQ Volume Size",
68-
"description": "Size of the volume used by A-MQ for persisting messages.",
67+
"displayName": "AMQ Volume Size",
68+
"description": "Size of the volume used by AMQ for persisting messages.",
6969
"name": "VOLUME_CAPACITY",
7070
"value": "1Gi",
7171
"required": true
@@ -85,7 +85,7 @@
8585
"required": false
8686
},
8787
{
88-
"displayName": "A-MQ Protocols",
88+
"displayName": "AMQ Protocols",
8989
"description": "Broker protocols to configure, separated by commas. Allowed values are: `openwire`, `amqp`, `stomp` and `mqtt`. Only `openwire` is supported by EAP.",
9090
"name": "MQ_PROTOCOL",
9191
"value": "openwire",
@@ -106,7 +106,7 @@
106106
"required": false
107107
},
108108
{
109-
"displayName": "A-MQ Serializable Packages",
109+
"displayName": "AMQ Serializable Packages",
110110
"description": "List of packages that are allowed to be serialized for use in ObjectMessage, separated by commas. If your app doesn't use ObjectMessages, leave this blank. This is a security enforcement. For the rationale, see http://activemq.apache.org/objectmessage.html",
111111
"name": "MQ_SERIALIZABLE_PACKAGES",
112112
"value": "",
@@ -148,31 +148,31 @@
148148
"required": false
149149
},
150150
{
151-
"displayName": "A-MQ Username",
151+
"displayName": "AMQ Username",
152152
"description": "User name for standard broker user. It is required for connecting to the broker. If left empty, it will be generated.",
153153
"name": "MQ_USERNAME",
154154
"from": "user[a-zA-Z0-9]{3}",
155155
"generate": "expression",
156156
"required": false
157157
},
158158
{
159-
"displayName": "A-MQ Password",
159+
"displayName": "AMQ Password",
160160
"description": "Password for standard broker user. It is required for connecting to the broker. If left empty, it will be generated.",
161161
"name": "MQ_PASSWORD",
162162
"from": "[a-zA-Z0-9]{8}",
163163
"generate": "expression",
164164
"required": false
165165
},
166166
{
167-
"displayName": "A-MQ Mesh Discovery Type",
167+
"displayName": "AMQ Mesh Discovery Type",
168168
"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.",
169169
"name": "AMQ_MESH_DISCOVERY_TYPE",
170170
"value": "dns",
171171
"required": false
172172
},
173173
{
174-
"displayName": "A-MQ Storage Limit",
175-
"description": "The A-MQ storage usage limit",
174+
"displayName": "AMQ Storage Limit",
175+
"description": "The AMQ storage usage limit",
176176
"name": "AMQ_STORAGE_USAGE_LIMIT",
177177
"value": "100 gb",
178178
"required": false

0 commit comments

Comments
 (0)