Skip to content

Commit

Permalink
Updated templates for migration: CLOUD-1952 (#320)
Browse files Browse the repository at this point in the history 
* Updated templates for migration: CLOUD-1952
  • Loading branch information
knrc committed Aug 9, 2017
1 parent ac7f249 commit c8550e3
Show file tree
Hide file tree
Showing 9 changed files with 489 additions and 36 deletions.
6 changes: 3 additions & 3 deletions amq/amq62-basic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
"description": "Application template for JBoss A-MQ brokers. These can be deployed as standalone or in a mesh. This template doesn't feature SSL support.",
"iconClass": "icon-jboss",
"tags": "messaging,amq,jboss,xpaas",
"version": "1.4.0",
"version": "1.5.0",
"openshift.io/display-name": "Red Hat JBoss A-MQ 6.2 (Ephemeral, no SSL)"
},
"name": "amq62-basic"
},
"labels": {
"template": "amq62-basic",
"xpaas": "1.4.0"
"xpaas": "1.5.0"
},
"message": "A new messaging service has been created in your project. It will handle the protocol(s) \"${MQ_PROTOCOL}\". The username/password for accessing the service is ${MQ_USERNAME}/${MQ_PASSWORD}.",
"parameters": [
Expand Down Expand Up @@ -215,7 +215,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "jboss-amq-62:1.4"
"name": "jboss-amq-62:1.5"
}
}
},
Expand Down
120 changes: 114 additions & 6 deletions amq/amq62-persistent-ssl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"apiVersion": "v1",
"metadata": {
"annotations": {
"description": "Application template for JBoss A-MQ brokers. These are deployed as standalone and use persistent storage for saving messages. This template supports SSL and requires usage of OpenShift secrets.",
"description": "Application template for JBoss A-MQ brokers. These are deployed as standalone and use persistent storage for saving messages, including message migration when the number of pods are reduced. This template supports SSL and requires usage of OpenShift secrets.",
"iconClass": "icon-jboss",
"tags": "messaging,amq,jboss,xpaas",
"version": "1.4.0",
"version": "1.5.0",
"openshift.io/display-name": "Red Hat JBoss A-MQ 6.2 (Persistent with SSL)"
},
"name": "amq62-persistent-ssl"
},
"labels": {
"template": "amq62-persistent-ssl",
"xpaas": "1.4.0"
"xpaas": "1.5.0"
},
"message": "A new persistent messaging service with SSL support has been created in your project. It will handle the protocol(s) \"${MQ_PROTOCOL}\". The username/password for accessing the service is ${MQ_USERNAME}/${MQ_PASSWORD}. Please be sure to create the \"amq-service-account\" service account and a secret named \"${AMQ_SECRET}\" containing the trust store and key store files (\"${AMQ_TRUSTSTORE}\" and \"${AMQ_KEYSTORE}\") used for serving secure content.",
"parameters": [
Expand All @@ -26,9 +26,9 @@
},
{
"displayName": "Split Data?",
"description": "Split the data directory for each node in a mesh.",
"description": "Split the data directory for each node in a mesh, this is now the default behaviour.",
"name": "AMQ_SPLIT",
"value": "false",
"value": "true",
"required": false
},
{
Expand Down Expand Up @@ -360,7 +360,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "jboss-amq-62:1.4"
"name": "jboss-amq-62:1.5"
}
}
},
Expand Down Expand Up @@ -545,6 +545,114 @@
}
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "${APPLICATION_NAME}-drainer",
"labels": {
"application": "${APPLICATION_NAME}"
}
},
"spec": {
"strategy": {
"type": "Recreate"
},
"triggers": [
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"${APPLICATION_NAME}-drainer"
],
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "jboss-amq-62:1.5"
}
}
},
{
"type": "ConfigChange"
}
],
"replicas": 1,
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-drainer"
},
"template": {
"metadata": {
"name": "${APPLICATION_NAME}-drainer",
"labels": {
"deploymentConfig": "${APPLICATION_NAME}-drainer",
"application": "${APPLICATION_NAME}"
}
},
"spec": {
"terminationGracePeriodSeconds": 60,
"containers": [
{
"name": "${APPLICATION_NAME}-drainer",
"image": "jboss-amq-62",
"command": [
"/opt/amq/bin/drain.sh"
],
"imagePullPolicy": "Always",
"volumeMounts": [
{
"mountPath": "/opt/amq/data",
"name": "${APPLICATION_NAME}-amq-pvol"
}
],
"ports": [
{
"name": "jolokia",
"containerPort": 8778,
"protocol": "TCP"
},
{
"name": "tcp",
"containerPort": 61616,
"protocol": "TCP"
}
],
"env": [
{
"name": "AMQ_USER",
"value": "${MQ_USERNAME}"
},
{
"name": "AMQ_PASSWORD",
"value": "${MQ_PASSWORD}"
},
{
"name": "AMQ_MESH_SERVICE_NAME",
"value": "${APPLICATION_NAME}-amq-tcp"
},
{
"name": "AMQ_MESH_SERVICE_NAMESPACE",
"valueFrom": {
"fieldRef": {
"fieldPath": "metadata.namespace"
}
}
}
]
}
],
"volumes": [
{
"name": "${APPLICATION_NAME}-amq-pvol",
"persistentVolumeClaim": {
"claimName": "${APPLICATION_NAME}-amq-claim"
}
}
]
}
}
}
},
{
"apiVersion": "v1",
"kind": "PersistentVolumeClaim",
Expand Down
120 changes: 114 additions & 6 deletions amq/amq62-persistent.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"apiVersion": "v1",
"metadata": {
"annotations": {
"description": "Application template for JBoss A-MQ brokers. These can be deployed as standalone and use persistent storage for saving messages. This template doesn't feature SSL support.",
"description": "Application template for JBoss A-MQ brokers. These can be deployed as standalone and use persistent storage for saving messages, including message migration when the number of pods are reduced. This template doesn't feature SSL support.",
"iconClass": "icon-jboss",
"tags": "messaging,amq,jboss,xpaas",
"version": "1.4.0",
"version": "1.5.0",
"openshift.io/display-name": "Red Hat JBoss A-MQ 6.2 (Persistent, no SSL)"
},
"name": "amq62-persistent"
},
"labels": {
"template": "amq62-persistent",
"xpaas": "1.4.0"
"xpaas": "1.5.0"
},
"message": "A new persistent messaging service has been created in your project. It will handle the protocol(s) \"${MQ_PROTOCOL}\". The username/password for accessing the service is ${MQ_USERNAME}/${MQ_PASSWORD}.",
"parameters": [
Expand All @@ -26,9 +26,9 @@
},
{
"displayName": "Split Data?",
"description": "Split the data directory for each node in a mesh.",
"description": "Split the data directory for each node in a mesh, this is now the default behaviour.",
"name": "AMQ_SPLIT",
"value": "false",
"value": "true",
"required": false
},
{
Expand Down Expand Up @@ -229,7 +229,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "jboss-amq-62:1.4"
"name": "jboss-amq-62:1.5"
}
}
},
Expand Down Expand Up @@ -362,6 +362,114 @@
}
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "${APPLICATION_NAME}-drainer",
"labels": {
"application": "${APPLICATION_NAME}"
}
},
"spec": {
"strategy": {
"type": "Recreate"
},
"triggers": [
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"${APPLICATION_NAME}-drainer"
],
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "jboss-amq-62:1.5"
}
}
},
{
"type": "ConfigChange"
}
],
"replicas": 1,
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-drainer"
},
"template": {
"metadata": {
"name": "${APPLICATION_NAME}-drainer",
"labels": {
"deploymentConfig": "${APPLICATION_NAME}-drainer",
"application": "${APPLICATION_NAME}"
}
},
"spec": {
"terminationGracePeriodSeconds": 60,
"containers": [
{
"name": "${APPLICATION_NAME}-drainer",
"image": "jboss-amq-62",
"command": [
"/opt/amq/bin/drain.sh"
],
"imagePullPolicy": "Always",
"volumeMounts": [
{
"mountPath": "/opt/amq/data",
"name": "${APPLICATION_NAME}-amq-pvol"
}
],
"ports": [
{
"name": "jolokia",
"containerPort": 8778,
"protocol": "TCP"
},
{
"name": "tcp",
"containerPort": 61616,
"protocol": "TCP"
}
],
"env": [
{
"name": "AMQ_USER",
"value": "${MQ_USERNAME}"
},
{
"name": "AMQ_PASSWORD",
"value": "${MQ_PASSWORD}"
},
{
"name": "AMQ_MESH_SERVICE_NAME",
"value": "${APPLICATION_NAME}-amq-tcp"
},
{
"name": "AMQ_MESH_SERVICE_NAMESPACE",
"valueFrom": {
"fieldRef": {
"fieldPath": "metadata.namespace"
}
}
}
]
}
],
"volumes": [
{
"name": "${APPLICATION_NAME}-amq-pvol",
"persistentVolumeClaim": {
"claimName": "${APPLICATION_NAME}-amq-claim"
}
}
]
}
}
}
},
{
"apiVersion": "v1",
"kind": "PersistentVolumeClaim",
Expand Down
6 changes: 3 additions & 3 deletions amq/amq62-ssl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
"description": "Application template for JBoss A-MQ brokers. These can be deployed as standalone or in a mesh. This template supports SSL and requires usage of OpenShift secrets.",
"iconClass": "icon-jboss",
"tags": "messaging,amq,jboss,xpaas",
"version": "1.4.0",
"version": "1.5.0",
"openshift.io/display-name": "Red Hat JBoss A-MQ 6.2 (Ephemeral with SSL)"
},
"name": "amq62-ssl"
},
"labels": {
"template": "amq62-ssl",
"xpaas": "1.4.0"
"xpaas": "1.5.0"
},
"message": "A new messaging service with SSL support has been created in your project. It will handle the protocol(s) \"${MQ_PROTOCOL}\". The username/password for accessing the service is ${MQ_USERNAME}/${MQ_PASSWORD}. Please be sure to create the \"amq-service-account\" service account and a secret named \"${AMQ_SECRET}\" containing the trust store and key store files (\"${AMQ_TRUSTSTORE}\" and \"${AMQ_KEYSTORE}\") used for serving secure content.",
"parameters": [
Expand Down Expand Up @@ -346,7 +346,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "jboss-amq-62:1.4"
"name": "jboss-amq-62:1.5"
}
}
},
Expand Down
6 changes: 3 additions & 3 deletions amq/amq63-basic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
"description": "Application template for JBoss A-MQ brokers. These can be deployed as standalone or in a mesh. This template doesn't feature SSL support.",
"iconClass": "icon-jboss",
"tags": "messaging,amq,jboss,xpaas",
"version": "1.0",
"version": "1.1",
"openshift.io/display-name": "Red Hat JBoss A-MQ 6.3 (Ephemeral, no SSL)"
},
"name": "amq63-basic"
},
"labels": {
"template": "amq63-basic",
"xpaas": "1.4.0"
"xpaas": "1.5.0"
},
"message": "A new messaging service has been created in your project. It will handle the protocol(s) \"${MQ_PROTOCOL}\". The username/password for accessing the service is ${MQ_USERNAME}/${MQ_PASSWORD}.",
"parameters": [
Expand Down Expand Up @@ -215,7 +215,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
"name": "jboss-amq-63:1.0"
"name": "jboss-amq-63:1.1"
}
}
},
Expand Down
Loading

0 comments on commit c8550e3

Please sign in to comment.