Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

node.js imagestream with RHOAR version included #142

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

node.js imagestream with RHOAR version included #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb9e556
node.js imagestream with RHOAR version included
jorgemoralespou Jul 13, 2018
97caf71
Issue #136 Update eap-cd addon for version 13 of EAP-CD
Jul 11, 2018
86c435c
Added htpasswd into the origin container
jorgemoralespou Jul 11, 2018
8383f40
node.js imagestream with RHOAR version included
jorgemoralespou Jul 13, 2018
80cb5ef
Updated imagestream location to openshift/library
jorgemoralespou Jul 23, 2018
c35e5d8
Updated imagestream location to openshift/library
jorgemoralespou Jul 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 42 additions & 32 deletions add-ons/eap-cd/templates/eap-cd-amq-persistent-s2i.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss",
"version": "1.4.10",
"openshift.io/display-name": "JBoss EAP CD + A-MQ (with https)",
"version": "1.5.0",
"openshift.io/display-name": "JBoss EAP CD + AMQ 7 (with https)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application using Red Hat JBoss A-MQ with persistence and 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",
"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 A-MQ with persistence and secure communication using https.",
"description": "An example JBoss Enterprise Application Platform continuous delivery application using Red Hat JBoss AMQ with persistence and 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",
"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 with persistence and secure communication using https.",
"template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/",
"template.openshift.io/support-url": "https://access.redhat.com"
},
"name": "eap-cd-amq-persistent-s2i"
},
"labels": {
"template": "eap-cd-amq-persistent-s2i",
"xpaas": "1.4.10"
"xpaas": "1.5.0"
},
"message": "A new JBoss EAP CD 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.",
"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.",
"parameters": [
{
"displayName": "Application Name",
Expand All @@ -39,14 +39,14 @@
"displayName": "Git Repository URL",
"description": "Git source URI for application",
"name": "SOURCE_REPOSITORY_URL",
"value": "https://github.com/jboss-openshift/openshift-quickstarts.git",
"value": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
"required": true
},
{
"displayName": "Git Reference",
"description": "Git branch/tag reference",
"name": "SOURCE_REPOSITORY_REF",
"value": "1.3",
"value": "openshift",
"required": false
},
{
Expand All @@ -57,49 +57,49 @@
"required": false
},
{
"displayName": "A-MQ Volume Size",
"description": "Size of the volume used by A-MQ for persisting messages.",
"displayName": "AMQ Volume Size",
"description": "Size of the volume used by AMQ for persisting messages.",
"name": "VOLUME_CAPACITY",
"value": "1Gi",
"required": true
},
{
"displayName": "JMS Connection Factory JNDI Name",
"description": "JNDI name for connection factory used by applications to connect to the broker, e.g. java:/ConnectionFactory",
"description": "JNDI name for connection factory used by applications to connect to the broker, e.g. java:jboss/DefaultJMSConnectionFactory",
"name": "MQ_JNDI",
"value": "java:/ConnectionFactory",
"value": "java:jboss/DefaultJMSConnectionFactory",
"required": false
},
{
"displayName": "Split Data?",
"displayName": "Split the data directory?",
"description": "Split the data directory for each node in a mesh.",
"name": "AMQ_SPLIT",
"value": "false",
"required": false
},
{
"displayName": "A-MQ Protocols",
"displayName": "AMQ Protocols",
"description": "Broker protocols to configure, separated by commas. Allowed values are: `openwire`, `amqp`, `stomp` and `mqtt`. Only `openwire` is supported by EAP.",
"name": "MQ_PROTOCOL",
"value": "openwire",
"required": false
},
{
"displayName": "Queues",
"description": "Queue names, separated by commas. These queues will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP.",
"description": "Queue names, separated by commas. These queues will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP. Note that all queues used by the application *must* be specified here in order to be created automatically on the remote AMQ broker.",
"name": "MQ_QUEUES",
"value": "HELLOWORLDMDBQueue",
"value": "HelloWorldMDBQueue",
"required": false
},
{
"displayName": "Topics",
"description": "Topic names, separated by commas. These topics will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP.",
"description": "Topic names, separated by commas. These topics will be automatically created when the broker starts. Also, they will be made accessible as JNDI resources in EAP. Note that all topics used by the application *must* be specified here in order to be created automatically on the remote AMQ broker.",
"name": "MQ_TOPICS",
"value": "HELLOWORLDMDBTopic",
"value": "HelloWorldMDBTopic",
"required": false
},
{
"displayName": "A-MQ Serializable Packages",
"displayName": "AMQ Serializable Packages",
"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",
"name": "MQ_SERIALIZABLE_PACKAGES",
"value": "",
Expand Down Expand Up @@ -141,31 +141,37 @@
"required": false
},
{
"displayName": "A-MQ Username",
"displayName": "AMQ Username",
"description": "User name for standard broker user. It is required for connecting to the broker. If left empty, it will be generated.",
"name": "MQ_USERNAME",
"from": "user[a-zA-Z0-9]{3}",
"generate": "expression",
"required": false
},
{
"displayName": "A-MQ Password",
"displayName": "AMQ Password",
"description": "Password for standard broker user. It is required for connecting to the broker. If left empty, it will be generated.",
"name": "MQ_PASSWORD",
"from": "[a-zA-Z0-9]{8}",
"generate": "expression",
"required": false
},
{
"displayName": "A-MQ Mesh Discovery Type",
"displayName": "AMQ Role",
"description": "AMQ Role for authenticated user",
"name": "MQ_ROLE",
"value": "admin"
},
{
"displayName": "AMQ Mesh Discovery Type",
"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.",
"name": "AMQ_MESH_DISCOVERY_TYPE",
"value": "dns",
"required": false
},
{
"displayName": "A-MQ Storage Limit",
"description": "The A-MQ storage usage limit",
"displayName": "AMQ Storage Limit",
"description": "The AMQ storage usage limit",
"name": "AMQ_STORAGE_USAGE_LIMIT",
"value": "100 gb",
"required": false
Expand Down Expand Up @@ -247,7 +253,7 @@
"displayName": "Maven Additional Arguments",
"description": "Maven additional arguments to use for S2I builds",
"name": "MAVEN_ARGS_APPEND",
"value": "",
"value": "-Dcom.redhat.xpaas.repo.jbossorg",
"required": false
},
{
Expand Down Expand Up @@ -481,7 +487,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "eap-cd-openshift:12"
"name": "eap-cd-openshift:13"
}
}
},
Expand Down Expand Up @@ -625,7 +631,7 @@
"env": [
{
"name": "MQ_SERVICE_PREFIX_MAPPING",
"value": "${APPLICATION_NAME}-amq=MQ"
"value": "${APPLICATION_NAME}-amq7=MQ"
},
{
"name": "MQ_JNDI",
Expand Down Expand Up @@ -763,7 +769,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "jboss-amq-63:1.3"
"name": "amq-broker-71-openshift:1.0"
}
}
},
Expand All @@ -788,7 +794,7 @@
"containers": [
{
"name": "${APPLICATION_NAME}-amq",
"image": "jboss-amq-63",
"image": "amq-broker-71-openshift",
"imagePullPolicy": "Always",
"readinessProbe": {
"exec": {
Expand All @@ -801,8 +807,8 @@
},
"ports": [
{
"name": "jolokia",
"containerPort": 8778,
"name": "console-jolokia",
"containerPort": 8161,
"protocol": "TCP"
},
{
Expand Down Expand Up @@ -856,6 +862,10 @@
"name": "AMQ_PASSWORD",
"value": "${MQ_PASSWORD}"
},
{
"name": "AMQ_ROLE",
"value": "${MQ_ROLE}"
},
{
"name": "AMQ_TRANSPORTS",
"value": "${MQ_PROTOCOL}"
Expand All @@ -865,7 +875,7 @@
"value": "${MQ_QUEUES}"
},
{
"name": "AMQ_TOPICS",
"name": "AMQ_ADDRESSES",
"value": "${MQ_TOPICS}"
},
{
Expand Down
Loading