|
|
@@ -5,8 +5,8 @@
|
|
|
"annotations": {
|
|
|
"iconClass": "icon-eap",
|
|
|
"tags": "eap,javaee,java,jboss",
|
|
|
- "version": "1.4.10",
|
|
|
- "openshift.io/display-name": "JBoss EAP CD (tx recovery)",
|
|
|
+ "version": "1.5.0",
|
|
|
+ "openshift.io/display-name": "JBoss EAP CD + AMQ 7 (tx recovery)",
|
|
|
"openshift.io/provider-display-name": "Red Hat, Inc.",
|
|
|
"description": "An example JBoss Enterprise Application Platform continuous delivery application with transaction recovery configured. 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 and insecure communication using http. The template also demonstrates how to enable automated transaction recovery on scale down of application pods. Automated transaction recovery is currently Technology Preview.",
|
|
|
@@ -17,7 +17,7 @@
|
|
|
},
|
|
|
"labels": {
|
|
|
"template": "eap-cd-tx-recovery-s2i",
|
|
|
- "xpaas": "1.4.10"
|
|
|
+ "xpaas": "1.5.0"
|
|
|
},
|
|
|
"message": "A new JBoss EAP CD based application has been created in your project.",
|
|
|
"parameters": [
|
|
|
@@ -32,45 +32,123 @@
|
|
|
"displayName": "Git Repository URL",
|
|
|
"description": "Git source URI for application",
|
|
|
"name": "SOURCE_REPOSITORY_URL",
|
|
|
- "value": "https://github.com/jboss-developer/jboss-eap-quickstarts.git",
|
|
|
+ "value": "https://github.com/jboss-openshift/openshift-quickstarts.git",
|
|
|
"required": true
|
|
|
},
|
|
|
{
|
|
|
"displayName": "Git Reference",
|
|
|
"description": "Git branch/tag reference",
|
|
|
"name": "SOURCE_REPOSITORY_REF",
|
|
|
- "value": "openshift",
|
|
|
+ "value": "1.3",
|
|
|
+ "required": false
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "displayName": "Custom install directories (see documentation).",
|
|
|
+ "description": "Additional directories from which to install.",
|
|
|
+ "name": "CUSTOM_INSTALL_DIRECTORIES",
|
|
|
+ "value": "extensions/*",
|
|
|
"required": false
|
|
|
},
|
|
|
{
|
|
|
"displayName": "Context Directory",
|
|
|
"description": "Path within Git project to build; empty for root project directory.",
|
|
|
"name": "CONTEXT_DIR",
|
|
|
- "value": "kitchensink",
|
|
|
+ "value": "jta-crash-rec-eap7",
|
|
|
+ "required": false
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "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:jboss/DefaultJMSConnectionFactory",
|
|
|
+ "name": "MQ_JNDI",
|
|
|
+ "value": "java:jboss/DefaultJMSConnectionFactory",
|
|
|
+ "required": false
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "displayName": "Split the data directory?",
|
|
|
+ "description": "Split the data directory for each node in a mesh.",
|
|
|
+ "name": "AMQ_SPLIT",
|
|
|
+ "value": "false",
|
|
|
+ "required": false
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "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",
|
|
|
+ "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": "",
|
|
|
+ "value": "jta-crash-rec-quickstart",
|
|
|
"required": false
|
|
|
},
|
|
|
{
|
|
|
"displayName": "Topics",
|
|
|
- "description": "Topic names",
|
|
|
+ "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": "",
|
|
|
"required": false
|
|
|
},
|
|
|
{
|
|
|
- "displayName": "A-MQ cluster password",
|
|
|
- "description": "A-MQ cluster admin password",
|
|
|
+ "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": "",
|
|
|
+ "required": false
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "displayName": "AMQ cluster password",
|
|
|
+ "description": "AMQ cluster admin password",
|
|
|
"name": "MQ_CLUSTER_PASSWORD",
|
|
|
"from": "[a-zA-Z0-9]{8}",
|
|
|
"generate": "expression",
|
|
|
"required": true
|
|
|
},
|
|
|
+ {
|
|
|
+ "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": "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": "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": "AMQ Storage Limit",
|
|
|
+ "description": "The AMQ storage usage limit",
|
|
|
+ "name": "AMQ_STORAGE_USAGE_LIMIT",
|
|
|
+ "value": "100 gb",
|
|
|
+ "required": false
|
|
|
+ },
|
|
|
{
|
|
|
"displayName": "Github Webhook Secret",
|
|
|
"description": "GitHub trigger secret",
|
|
|
@@ -202,6 +280,56 @@
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
+ "kind": "Service",
|
|
|
+ "apiVersion": "v1",
|
|
|
+ "spec": {
|
|
|
+ "ports": [
|
|
|
+ {
|
|
|
+ "port": 61616,
|
|
|
+ "targetPort": 61616
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ "selector": {
|
|
|
+ "deploymentConfig": "${APPLICATION_NAME}-amq"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "metadata": {
|
|
|
+ "name": "${APPLICATION_NAME}-amq-tcp",
|
|
|
+ "labels": {
|
|
|
+ "application": "${APPLICATION_NAME}"
|
|
|
+ },
|
|
|
+ "annotations": {
|
|
|
+ "description": "The broker's OpenWire port."
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "kind": "Service",
|
|
|
+ "apiVersion": "v1",
|
|
|
+ "spec": {
|
|
|
+ "clusterIP": "None",
|
|
|
+ "ports": [
|
|
|
+ {
|
|
|
+ "name": "mesh",
|
|
|
+ "port": 61616
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ "selector": {
|
|
|
+ "deploymentConfig": "${APPLICATION_NAME}-amq"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "metadata": {
|
|
|
+ "name": "${APPLICATION_NAME}-amq-mesh",
|
|
|
+ "labels": {
|
|
|
+ "application": "${APPLICATION_NAME}"
|
|
|
+ },
|
|
|
+ "annotations": {
|
|
|
+ "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",
|
|
|
+ "description": "Supports node discovery for mesh formation."
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
"kind": "Route",
|
|
|
"apiVersion": "v1",
|
|
|
"id": "${APPLICATION_NAME}-http",
|
|
|
@@ -269,7 +397,7 @@
|
|
|
"from": {
|
|
|
"kind": "ImageStreamTag",
|
|
|
"namespace": "${IMAGE_STREAM_NAMESPACE}",
|
|
|
- "name": "eap-cd-openshift:12"
|
|
|
+ "name": "eap-cd-openshift:13"
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -401,6 +529,38 @@
|
|
|
],
|
|
|
"env": [
|
|
|
{
|
|
|
+ "name": "MQ_SERVICE_PREFIX_MAPPING",
|
|
|
+ "value": "${APPLICATION_NAME}-amq7=MQ"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "MQ_JNDI",
|
|
|
+ "value": "${MQ_JNDI}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "MQ_USERNAME",
|
|
|
+ "value": "${MQ_USERNAME}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "MQ_PASSWORD",
|
|
|
+ "value": "${MQ_PASSWORD}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "MQ_PROTOCOL",
|
|
|
+ "value": "tcp"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "MQ_QUEUES",
|
|
|
+ "value": "${MQ_QUEUES}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "MQ_TOPICS",
|
|
|
+ "value": "${MQ_TOPICS}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "MQ_SERIALIZABLE_PACKAGES",
|
|
|
+ "value": "${MQ_SERIALIZABLE_PACKAGES}"
|
|
|
+ },
|
|
|
+ {
|
|
|
"name": "JGROUPS_PING_PROTOCOL",
|
|
|
"value": "openshift.DNS_PING"
|
|
|
},
|
|
|
@@ -417,12 +577,8 @@
|
|
|
"value": "${MQ_CLUSTER_PASSWORD}"
|
|
|
},
|
|
|
{
|
|
|
- "name": "MQ_QUEUES",
|
|
|
- "value": "${MQ_QUEUES}"
|
|
|
- },
|
|
|
- {
|
|
|
- "name": "MQ_TOPICS",
|
|
|
- "value": "${MQ_TOPICS}"
|
|
|
+ "name": "MQ_SERIALIZABLE_PACKAGES",
|
|
|
+ "value": "${MQ_SERIALIZABLE_PACKAGES}"
|
|
|
},
|
|
|
{
|
|
|
"name": "JGROUPS_CLUSTER_PASSWORD",
|
|
|
@@ -435,6 +591,10 @@
|
|
|
{
|
|
|
"name": "SPLIT_DATA",
|
|
|
"value": "${SPLIT_DATA}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "CUSTOM_INSTALL_DIRECTORIES",
|
|
|
+ "value": "${CUSTOM_INSTALL_DIRECTORIES}"
|
|
|
}
|
|
|
]
|
|
|
}
|
|
|
@@ -455,6 +615,185 @@
|
|
|
"kind": "DeploymentConfig",
|
|
|
"apiVersion": "v1",
|
|
|
"metadata": {
|
|
|
+ "name": "${APPLICATION_NAME}-amq",
|
|
|
+ "labels": {
|
|
|
+ "application": "${APPLICATION_NAME}"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "spec": {
|
|
|
+ "strategy": {
|
|
|
+ "type": "Rolling",
|
|
|
+ "rollingParams": {
|
|
|
+ "maxSurge": 0
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "triggers": [
|
|
|
+ {
|
|
|
+ "type": "ImageChange",
|
|
|
+ "imageChangeParams": {
|
|
|
+ "automatic": true,
|
|
|
+ "containerNames": [
|
|
|
+ "${APPLICATION_NAME}-amq"
|
|
|
+ ],
|
|
|
+ "from": {
|
|
|
+ "kind": "ImageStreamTag",
|
|
|
+ "namespace": "${IMAGE_STREAM_NAMESPACE}",
|
|
|
+ "name": "amq-broker-71-openshift:1.0"
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "type": "ConfigChange"
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ "replicas": 1,
|
|
|
+ "selector": {
|
|
|
+ "deploymentConfig": "${APPLICATION_NAME}-amq"
|
|
|
+ },
|
|
|
+ "template": {
|
|
|
+ "metadata": {
|
|
|
+ "name": "${APPLICATION_NAME}-amq",
|
|
|
+ "labels": {
|
|
|
+ "deploymentConfig": "${APPLICATION_NAME}-amq",
|
|
|
+ "application": "${APPLICATION_NAME}"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "spec": {
|
|
|
+ "terminationGracePeriodSeconds": 60,
|
|
|
+ "containers": [
|
|
|
+ {
|
|
|
+ "name": "${APPLICATION_NAME}-amq",
|
|
|
+ "image": "amq-broker-71-openshift",
|
|
|
+ "imagePullPolicy": "Always",
|
|
|
+ "readinessProbe": {
|
|
|
+ "exec": {
|
|
|
+ "command": [
|
|
|
+ "/bin/bash",
|
|
|
+ "-c",
|
|
|
+ "/opt/amq/bin/readinessProbe.sh"
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "ports": [
|
|
|
+ {
|
|
|
+ "name": "console-jolokia",
|
|
|
+ "containerPort": 8161,
|
|
|
+ "protocol": "TCP"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "amqp",
|
|
|
+ "containerPort": 5672,
|
|
|
+ "protocol": "TCP"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "amqp-ssl",
|
|
|
+ "containerPort": 5671,
|
|
|
+ "protocol": "TCP"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "mqtt",
|
|
|
+ "containerPort": 1883,
|
|
|
+ "protocol": "TCP"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "stomp",
|
|
|
+ "containerPort": 61613,
|
|
|
+ "protocol": "TCP"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "stomp-ssl",
|
|
|
+ "containerPort": 61612,
|
|
|
+ "protocol": "TCP"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "tcp",
|
|
|
+ "containerPort": 61616,
|
|
|
+ "protocol": "TCP"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "tcp-ssl",
|
|
|
+ "containerPort": 61617,
|
|
|
+ "protocol": "TCP"
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ "volumeMounts": [
|
|
|
+ {
|
|
|
+ "mountPath": "/opt/amq/data/kahadb",
|
|
|
+ "name": "${APPLICATION_NAME}-amq-pvol"
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ "env": [
|
|
|
+ {
|
|
|
+ "name": "AMQ_USER",
|
|
|
+ "value": "${MQ_USERNAME}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "AMQ_PASSWORD",
|
|
|
+ "value": "${MQ_PASSWORD}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "AMQ_ROLE",
|
|
|
+ "value": "${MQ_ROLE}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "AMQ_TRANSPORTS",
|
|
|
+ "value": "${MQ_PROTOCOL}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "AMQ_QUEUES",
|
|
|
+ "value": "${MQ_QUEUES}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "AMQ_ADDRESSES",
|
|
|
+ "value": "${MQ_TOPICS}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "MQ_SERIALIZABLE_PACKAGES",
|
|
|
+ "value": "${MQ_SERIALIZABLE_PACKAGES}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "AMQ_SPLIT",
|
|
|
+ "value": "${AMQ_SPLIT}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "AMQ_MESH_DISCOVERY_TYPE",
|
|
|
+ "value": "${AMQ_MESH_DISCOVERY_TYPE}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "AMQ_MESH_SERVICE_NAME",
|
|
|
+ "value": "${APPLICATION_NAME}-amq-mesh"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "AMQ_MESH_SERVICE_NAMESPACE",
|
|
|
+ "valueFrom": {
|
|
|
+ "fieldRef": {
|
|
|
+ "fieldPath": "metadata.namespace"
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "AMQ_STORAGE_USAGE_LIMIT",
|
|
|
+ "value": "${AMQ_STORAGE_USAGE_LIMIT}"
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ "volumes": [
|
|
|
+ {
|
|
|
+ "name": "${APPLICATION_NAME}-amq-pvol",
|
|
|
+ "persistentVolumeClaim": {
|
|
|
+ "claimName": "${APPLICATION_NAME}-amq-claim"
|
|
|
+ }
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "kind": "DeploymentConfig",
|
|
|
+ "apiVersion": "v1",
|
|
|
+ "metadata": {
|
|
|
"name": "${APPLICATION_NAME}-migration",
|
|
|
"labels": {
|
|
|
"application": "${APPLICATION_NAME}"
|
|
|
@@ -546,6 +885,25 @@
|
|
|
"value": "8888"
|
|
|
},
|
|
|
{
|
|
|
+ "name": "MQ_SERVICE_PREFIX_MAPPING",
|
|
|
+ "value": "${APPLICATION_NAME}-amq7=MQ"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "MQ_JNDI",
|
|
|
+ "value": "${MQ_JNDI}"
|
|
|
+ },
|
|
|
+ { "name": "MQ_USERNAME",
|
|
|
+ "value": "${MQ_USERNAME}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "MQ_PASSWORD",
|
|
|
+ "value": "${MQ_PASSWORD}"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "name": "MQ_PROTOCOL",
|
|
|
+ "value": "tcp"
|
|
|
+ },
|
|
|
+ {
|
|
|
"name": "MQ_CLUSTER_PASSWORD",
|
|
|
"value": "${MQ_CLUSTER_PASSWORD}"
|
|
|
},
|
|
|
@@ -603,6 +961,26 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ },
|
|
|
+ {
|
|
|
+ "apiVersion": "v1",
|
|
|
+ "kind": "PersistentVolumeClaim",
|
|
|
+ "metadata": {
|
|
|
+ "name": "${APPLICATION_NAME}-amq-claim",
|
|
|
+ "labels": {
|
|
|
+ "application": "${APPLICATION_NAME}"
|
|
|
+ }
|
|
|
+ },
|
|
|
+ "spec": {
|
|
|
+ "accessModes": [
|
|
|
+ "ReadWriteMany"
|
|
|
+ ],
|
|
|
+ "resources": {
|
|
|
+ "requests": {
|
|
|
+ "storage": "${VOLUME_CAPACITY}"
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
]
|
|
|
}
|
OpenShift Merge Robot