From d7c8ad7d02c6f0a10f4e5620b55d1d615e0c444b Mon Sep 17 00:00:00 2001 From: Filippe Spolti Date: Mon, 28 Aug 2017 14:35:58 -0300 Subject: [PATCH] [CLOUD-1167] - Remove deploymentConfig label from all templates Signed-off-by: Filippe Spolti --- amq/amq62-basic.json | 44 +++++----- amq/amq62-persistent-ssl.json | 81 +++++++++++-------- amq/amq62-persistent.json | 57 +++++++------ amq/amq62-ssl.json | 68 +++++++++------- amq/amq63-basic.json | 44 +++++----- amq/amq63-persistent-ssl.json | 81 +++++++++++-------- amq/amq63-persistent.json | 57 +++++++------ amq/amq63-ssl.json | 68 +++++++++------- datagrid/datagrid65-basic.json | 33 ++++---- datagrid/datagrid65-https.json | 43 ++++++---- datagrid/datagrid65-mysql-persistent.json | 61 ++++++++------ datagrid/datagrid65-mysql.json | 58 +++++++------ .../datagrid65-postgresql-persistent.json | 61 ++++++++------ datagrid/datagrid65-postgresql.json | 58 +++++++------ datagrid/datagrid71-basic.json | 33 ++++---- datagrid/datagrid71-https.json | 42 ++++++---- datagrid/datagrid71-mysql-persistent.json | 61 ++++++++------ datagrid/datagrid71-mysql.json | 58 +++++++------ datagrid/datagrid71-partition.json | 40 +++++---- .../datagrid71-postgresql-persistent.json | 61 ++++++++------ datagrid/datagrid71-postgresql.json | 56 +++++++------ datavirt/datavirt63-basic-s2i.json | 27 ++++--- .../datavirt63-extensions-support-s2i.json | 39 +++++---- datavirt/datavirt63-secure-s2i.json | 33 ++++---- decisionserver/decisionserver64-amq-s2i.json | 52 ++++++------ .../decisionserver64-basic-s2i.json | 27 ++++--- .../decisionserver64-https-s2i.json | 36 +++++---- eap/eap64-amq-persistent-s2i.json | 57 +++++++------ eap/eap64-amq-s2i.json | 52 ++++++------ eap/eap64-basic-s2i.json | 27 ++++--- eap/eap64-https-s2i.json | 36 +++++---- eap/eap64-mongodb-persistent-s2i.json | 55 +++++++------ eap/eap64-mongodb-s2i.json | 52 ++++++------ eap/eap64-mysql-persistent-s2i.json | 55 +++++++------ eap/eap64-mysql-s2i.json | 52 ++++++------ eap/eap64-postgresql-persistent-s2i.json | 55 +++++++------ eap/eap64-postgresql-s2i.json | 52 ++++++------ eap/eap64-sso-s2i.json | 36 +++++---- eap/eap64-third-party-db-s2i.json | 36 +++++---- eap/eap70-amq-persistent-s2i.json | 56 +++++++------ eap/eap70-amq-s2i.json | 52 ++++++------ eap/eap70-basic-s2i.json | 27 ++++--- eap/eap70-https-s2i.json | 36 +++++---- eap/eap70-mongodb-persistent-s2i.json | 55 +++++++------ eap/eap70-mongodb-s2i.json | 52 ++++++------ eap/eap70-mysql-persistent-s2i.json | 55 +++++++------ eap/eap70-mysql-s2i.json | 52 ++++++------ eap/eap70-postgresql-persistent-s2i.json | 55 +++++++------ eap/eap70-postgresql-s2i.json | 52 ++++++------ eap/eap70-sso-s2i.json | 36 +++++---- eap/eap70-third-party-db-s2i.json | 34 ++++---- eap/eap71-amq-persistent-s2i.json | 55 +++++++------ eap/eap71-amq-s2i.json | 52 ++++++------ eap/eap71-basic-s2i.json | 27 ++++--- eap/eap71-https-s2i.json | 36 +++++---- eap/eap71-mongodb-persistent-s2i.json | 55 +++++++------ eap/eap71-mongodb-s2i.json | 52 ++++++------ eap/eap71-mysql-persistent-s2i.json | 55 +++++++------ eap/eap71-mysql-s2i.json | 52 ++++++------ eap/eap71-postgresql-persistent-s2i.json | 55 +++++++------ eap/eap71-postgresql-s2i.json | 52 ++++++------ eap/eap71-sso-s2i.json | 36 +++++---- eap/eap71-third-party-db-s2i.json | 36 +++++---- openjdk/openjdk18-web-basic-s2i.json | 27 ++++--- ...cessserver64-amq-mysql-persistent-s2i.json | 75 +++++++++-------- .../processserver64-amq-mysql-s2i.json | 66 ++++++++------- ...erver64-amq-postgresql-persistent-s2i.json | 74 +++++++++-------- .../processserver64-amq-postgresql-s2i.json | 68 +++++++++------- processserver/processserver64-basic-s2i.json | 27 ++++--- .../processserver64-mysql-persistent-s2i.json | 55 +++++++------ processserver/processserver64-mysql-s2i.json | 52 ++++++------ ...essserver64-postgresql-persistent-s2i.json | 55 +++++++------ .../processserver64-postgresql-s2i.json | 52 ++++++------ sso/sso71-https.json | 30 ++++--- sso/sso71-mysql-persistent.json | 49 ++++++----- sso/sso71-mysql.json | 37 ++++----- sso/sso71-postgresql-persistent.json | 49 ++++++----- sso/sso71-postgresql.json | 37 ++++----- webserver/jws31-tomcat7-basic-s2i.json | 27 ++++--- webserver/jws31-tomcat7-https-s2i.json | 36 +++++---- .../jws31-tomcat7-mongodb-persistent-s2i.json | 55 +++++++------ webserver/jws31-tomcat7-mongodb-s2i.json | 52 ++++++------ .../jws31-tomcat7-mysql-persistent-s2i.json | 55 +++++++------ webserver/jws31-tomcat7-mysql-s2i.json | 52 ++++++------ ...s31-tomcat7-postgresql-persistent-s2i.json | 55 +++++++------ webserver/jws31-tomcat7-postgresql-s2i.json | 52 ++++++------ webserver/jws31-tomcat8-basic-s2i.json | 27 ++++--- webserver/jws31-tomcat8-https-s2i.json | 36 +++++---- .../jws31-tomcat8-mongodb-persistent-s2i.json | 55 +++++++------ webserver/jws31-tomcat8-mongodb-s2i.json | 52 ++++++------ .../jws31-tomcat8-mysql-persistent-s2i.json | 55 +++++++------ webserver/jws31-tomcat8-mysql-s2i.json | 52 ++++++------ ...s31-tomcat8-postgresql-persistent-s2i.json | 55 +++++++------ webserver/jws31-tomcat8-postgresql-s2i.json | 52 ++++++------ 94 files changed, 2590 insertions(+), 2000 deletions(-) diff --git a/amq/amq62-basic.json b/amq/amq62-basic.json index 8f8e14cb..7f5df465 100644 --- a/amq/amq62-basic.json +++ b/amq/amq62-basic.json @@ -110,13 +110,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-amqp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's AMQP port." @@ -134,13 +136,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-mqtt", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's MQTT port." @@ -158,13 +162,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-stomp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's STOMP port." @@ -182,13 +188,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port.", @@ -200,9 +208,10 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -218,7 +227,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -232,22 +241,19 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-62", "imagePullPolicy": "Always", "readinessProbe": { @@ -343,4 +349,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq62-persistent-ssl.json b/amq/amq62-persistent-ssl.json index 96f9d616..78f256b4 100644 --- a/amq/amq62-persistent-ssl.json +++ b/amq/amq62-persistent-ssl.json @@ -163,13 +163,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-amqp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's AMQP port." @@ -187,13 +189,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-amqp-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's AMQP SSL port." @@ -211,13 +215,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-mqtt", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's MQTT port." @@ -235,13 +241,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-mqtt-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's MQTT SSL port." @@ -259,13 +267,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-stomp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's STOMP port." @@ -283,13 +293,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-stomp-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's STOMP SSL port." @@ -307,13 +319,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -331,13 +345,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire (SSL) port.", @@ -349,9 +365,10 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -367,7 +384,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -381,15 +398,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -397,7 +411,7 @@ "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-62", "imagePullPolicy": "Always", "volumeMounts": [ @@ -567,7 +581,8 @@ "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq-drainer" } }, "spec": { @@ -594,15 +609,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-drainer" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-drainer", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq-drainer" } }, "spec": { @@ -675,7 +687,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -690,4 +703,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq62-persistent.json b/amq/amq62-persistent.json index 67c812fb..054824e3 100644 --- a/amq/amq62-persistent.json +++ b/amq/amq62-persistent.json @@ -124,13 +124,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-amqp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's AMQP port." @@ -148,13 +150,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-mqtt", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's MQTT port." @@ -172,13 +176,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-stomp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's STOMP port." @@ -196,13 +202,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port.", @@ -214,9 +222,10 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -232,7 +241,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -246,22 +255,19 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-62", "imagePullPolicy": "Always", "volumeMounts": [ @@ -380,7 +386,8 @@ "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq-drainer" } }, "spec": { @@ -407,15 +414,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-drainer" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-drainer", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq-drainer" } }, "spec": { @@ -488,7 +492,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -503,4 +508,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq62-ssl.json b/amq/amq62-ssl.json index 9f488820..2c0f0d2b 100644 --- a/amq/amq62-ssl.json +++ b/amq/amq62-ssl.json @@ -145,13 +145,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-amqp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's AMQP port." @@ -169,13 +171,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-amqp-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's AMQP SSL port." @@ -193,13 +197,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-mqtt", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's MQTT port." @@ -217,13 +223,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-mqtt-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's MQTT SSL port." @@ -241,13 +249,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-stomp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's STOMP port." @@ -265,13 +275,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-stomp-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's STOMP SSL port." @@ -289,13 +301,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -313,13 +327,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire (SSL) port.", @@ -331,9 +347,10 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -349,7 +366,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -363,15 +380,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -379,7 +393,7 @@ "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-62", "imagePullPolicy": "Always", "volumeMounts": [ @@ -530,4 +544,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq63-basic.json b/amq/amq63-basic.json index e1353076..0c3a7fbc 100644 --- a/amq/amq63-basic.json +++ b/amq/amq63-basic.json @@ -110,13 +110,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-amqp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's AMQP port." @@ -134,13 +136,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-mqtt", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's MQTT port." @@ -158,13 +162,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-stomp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's STOMP port." @@ -182,13 +188,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port.", @@ -200,9 +208,10 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -218,7 +227,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -232,22 +241,19 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-63", "imagePullPolicy": "Always", "readinessProbe": { @@ -343,4 +349,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq63-persistent-ssl.json b/amq/amq63-persistent-ssl.json index 3eedee93..fc1b6bbe 100644 --- a/amq/amq63-persistent-ssl.json +++ b/amq/amq63-persistent-ssl.json @@ -162,13 +162,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-amqp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's AMQP port." @@ -186,13 +188,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-amqp-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's AMQP SSL port." @@ -210,13 +214,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-mqtt", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's MQTT port." @@ -234,13 +240,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-mqtt-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's MQTT SSL port." @@ -258,13 +266,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-stomp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's STOMP port." @@ -282,13 +292,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-stomp-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's STOMP SSL port." @@ -306,13 +318,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -330,13 +344,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire (SSL) port.", @@ -348,9 +364,10 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -366,7 +383,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -380,15 +397,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -396,7 +410,7 @@ "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-63", "imagePullPolicy": "Always", "volumeMounts": [ @@ -566,7 +580,8 @@ "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq-drainer" } }, "spec": { @@ -593,15 +608,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-drainer" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-drainer", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq-drainer" } }, "spec": { @@ -674,7 +686,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -689,4 +702,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq63-persistent.json b/amq/amq63-persistent.json index 7c0aec61..98841e16 100644 --- a/amq/amq63-persistent.json +++ b/amq/amq63-persistent.json @@ -127,13 +127,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-amqp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's AMQP port." @@ -151,13 +153,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-mqtt", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's MQTT port." @@ -175,13 +179,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-stomp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's STOMP port." @@ -199,13 +205,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port.", @@ -217,9 +225,10 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -235,7 +244,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -249,22 +258,19 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-63", "imagePullPolicy": "Always", "volumeMounts": [ @@ -383,7 +389,8 @@ "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq-drainer" } }, "spec": { @@ -410,15 +417,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-drainer" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-drainer", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq-drainer" } }, "spec": { @@ -491,7 +495,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -506,4 +511,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq63-ssl.json b/amq/amq63-ssl.json index a55403c7..e8f94218 100644 --- a/amq/amq63-ssl.json +++ b/amq/amq63-ssl.json @@ -148,13 +148,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-amqp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's AMQP port." @@ -172,13 +174,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-amqp-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's AMQP SSL port." @@ -196,13 +200,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-mqtt", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's MQTT port." @@ -220,13 +226,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-mqtt-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's MQTT SSL port." @@ -244,13 +252,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-stomp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's STOMP port." @@ -268,13 +278,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-stomp-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's STOMP SSL port." @@ -292,13 +304,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -316,13 +330,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp-ssl", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire (SSL) port.", @@ -334,9 +350,10 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -352,7 +369,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -366,15 +383,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -382,7 +396,7 @@ "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-63", "imagePullPolicy": "Always", "volumeMounts": [ @@ -533,4 +547,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid65-basic.json b/datagrid/datagrid65-basic.json index af390c13..06bf40d4 100644 --- a/datagrid/datagrid65-basic.json +++ b/datagrid/datagrid65-basic.json @@ -123,13 +123,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTP port." @@ -147,13 +149,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-memcached", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Memcached service for clustered applications." @@ -171,13 +175,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-hotrod", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications." @@ -191,7 +197,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTP service." @@ -210,7 +217,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -237,15 +245,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -370,4 +375,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid65-https.json b/datagrid/datagrid65-https.json index 97d02c78..71ebe92d 100644 --- a/datagrid/datagrid65-https.json +++ b/datagrid/datagrid65-https.json @@ -186,13 +186,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTP port." @@ -210,13 +212,16 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" + } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTPS port." @@ -234,13 +239,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-memcached", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Memcached service for clustered applications." @@ -258,13 +265,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-hotrod", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications." @@ -278,7 +287,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTP service." @@ -298,7 +308,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTPS service." @@ -320,7 +331,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -347,15 +359,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -552,4 +561,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid65-mysql-persistent.json b/datagrid/datagrid65-mysql-persistent.json index 01813266..92585170 100644 --- a/datagrid/datagrid65-mysql-persistent.json +++ b/datagrid/datagrid65-mysql-persistent.json @@ -281,13 +281,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTP port.", @@ -306,13 +308,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTPS port.", @@ -331,13 +335,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-memcached", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Memcached service for clustered applications.", @@ -356,13 +362,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-hotrod", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications.", @@ -381,13 +389,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -401,7 +411,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTP service." @@ -421,7 +432,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTPS service." @@ -443,7 +455,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -470,15 +483,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -732,7 +742,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -759,15 +770,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -842,7 +850,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -857,4 +866,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid65-mysql.json b/datagrid/datagrid65-mysql.json index 1e8ca1b5..26d4a323 100644 --- a/datagrid/datagrid65-mysql.json +++ b/datagrid/datagrid65-mysql.json @@ -271,13 +271,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTP port.", @@ -296,13 +298,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTPS port.", @@ -321,13 +325,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-memcached", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Memcached service for clustered applications.", @@ -346,13 +352,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-hotrod", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications.", @@ -371,13 +379,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -391,7 +401,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTP service." @@ -411,7 +422,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTPS service." @@ -433,7 +445,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -460,15 +473,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -722,7 +732,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -749,15 +760,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -813,4 +821,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid65-postgresql-persistent.json b/datagrid/datagrid65-postgresql-persistent.json index 4a1d818c..55017a7c 100644 --- a/datagrid/datagrid65-postgresql-persistent.json +++ b/datagrid/datagrid65-postgresql-persistent.json @@ -264,13 +264,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTP port.", @@ -289,13 +291,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTPS port.", @@ -314,13 +318,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-memcached", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Memcached service for clustered applications." @@ -338,13 +344,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-hotrod", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications." @@ -362,13 +370,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -382,7 +392,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTP service." @@ -402,7 +413,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTPS service." @@ -424,7 +436,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -451,15 +464,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -713,7 +723,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -740,15 +751,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -815,7 +823,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -830,4 +839,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid65-postgresql.json b/datagrid/datagrid65-postgresql.json index d97bdfa7..0104f58d 100644 --- a/datagrid/datagrid65-postgresql.json +++ b/datagrid/datagrid65-postgresql.json @@ -253,13 +253,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTP port.", @@ -278,13 +280,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTPS port.", @@ -303,13 +307,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-memcached", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Memcached service for clustered applications." @@ -327,13 +333,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-hotrod", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications." @@ -351,13 +359,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -371,7 +381,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTP service." @@ -391,7 +402,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTPS service." @@ -413,7 +425,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -440,15 +453,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -702,7 +712,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -729,15 +740,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -785,4 +793,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid71-basic.json b/datagrid/datagrid71-basic.json index d4b83da3..5bc01e6f 100644 --- a/datagrid/datagrid71-basic.json +++ b/datagrid/datagrid71-basic.json @@ -154,13 +154,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTP port." @@ -178,13 +180,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-memcached", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Memcached service for clustered applications." @@ -202,13 +206,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-hotrod", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications." @@ -222,7 +228,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTP service." @@ -241,7 +248,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -268,15 +276,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -417,4 +422,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid71-https.json b/datagrid/datagrid71-https.json index 2a46bd3a..d801b293 100644 --- a/datagrid/datagrid71-https.json +++ b/datagrid/datagrid71-https.json @@ -217,13 +217,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTP port." @@ -241,13 +243,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTPS port." @@ -265,13 +269,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-memcached", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Memcached service for clustered applications." @@ -289,13 +295,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-hotrod", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications." @@ -309,7 +317,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTP service." @@ -329,7 +338,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTPS service." @@ -351,7 +361,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -378,15 +389,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -599,4 +607,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid71-mysql-persistent.json b/datagrid/datagrid71-mysql-persistent.json index 72bdf203..c17e3684 100644 --- a/datagrid/datagrid71-mysql-persistent.json +++ b/datagrid/datagrid71-mysql-persistent.json @@ -309,13 +309,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTP port.", @@ -334,13 +336,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTPS port.", @@ -359,13 +363,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-memcached", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Memcached service for clustered applications.", @@ -384,13 +390,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-hotrod", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications.", @@ -409,13 +417,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -429,7 +439,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTP service." @@ -449,7 +460,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTPS service." @@ -471,7 +483,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -498,15 +511,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -776,7 +786,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -803,15 +814,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -886,7 +894,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -901,4 +910,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid71-mysql.json b/datagrid/datagrid71-mysql.json index 99f97a7c..cc668f61 100644 --- a/datagrid/datagrid71-mysql.json +++ b/datagrid/datagrid71-mysql.json @@ -302,13 +302,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTP port.", @@ -327,13 +329,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTPS port.", @@ -352,13 +356,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-memcached", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Memcached service for clustered applications.", @@ -377,13 +383,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-hotrod", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications.", @@ -402,13 +410,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -422,7 +432,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTP service." @@ -442,7 +453,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTPS service." @@ -464,7 +476,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -491,15 +504,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -769,7 +779,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -796,15 +807,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -860,4 +868,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid71-partition.json b/datagrid/datagrid71-partition.json index 31436e33..7c8b1edb 100644 --- a/datagrid/datagrid71-partition.json +++ b/datagrid/datagrid71-partition.json @@ -168,13 +168,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTP port." @@ -192,13 +194,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-memcached", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Memcached service for clustered applications." @@ -216,13 +220,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-hotrod", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications." @@ -240,13 +246,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-debug", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications." @@ -260,7 +268,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTP service." @@ -279,7 +288,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -306,15 +316,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -483,7 +490,8 @@ "metadata": { "name": "${APPLICATION_NAME}-datagrid-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { diff --git a/datagrid/datagrid71-postgresql-persistent.json b/datagrid/datagrid71-postgresql-persistent.json index 5cd6e854..dd72c906 100644 --- a/datagrid/datagrid71-postgresql-persistent.json +++ b/datagrid/datagrid71-postgresql-persistent.json @@ -291,13 +291,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTP port.", @@ -316,13 +318,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTPS port.", @@ -341,13 +345,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-memcached", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Memcached service for clustered applications." @@ -365,13 +371,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-hotrod", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications." @@ -389,13 +397,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -409,7 +419,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTP service." @@ -429,7 +440,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTPS service." @@ -451,7 +463,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -478,15 +491,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -756,7 +766,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -783,15 +794,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -858,7 +866,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -873,4 +882,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid71-postgresql.json b/datagrid/datagrid71-postgresql.json index 505d6775..e8a68bfe 100644 --- a/datagrid/datagrid71-postgresql.json +++ b/datagrid/datagrid71-postgresql.json @@ -284,13 +284,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTP port.", @@ -309,13 +311,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "The web server's HTTPS port.", @@ -334,13 +338,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-memcached", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Memcached service for clustered applications." @@ -358,13 +364,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "metadata": { "name": "${APPLICATION_NAME}-hotrod", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Hot Rod service for clustered applications." @@ -382,13 +390,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -402,7 +412,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTP service." @@ -422,7 +433,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" }, "annotations": { "description": "Route for application's HTTPS service." @@ -444,7 +456,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -471,15 +484,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datagrid" } }, "spec": { @@ -749,7 +759,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -776,15 +787,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { diff --git a/datavirt/datavirt63-basic-s2i.json b/datavirt/datavirt63-basic-s2i.json index b6885d6f..b3603eac 100644 --- a/datavirt/datavirt63-basic-s2i.json +++ b/datavirt/datavirt63-basic-s2i.json @@ -182,13 +182,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" }, "annotations": { "description": "The data virtualization services." @@ -202,7 +204,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" }, "annotations": { "description": "Route for application's http (REST) service." @@ -224,7 +227,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } } }, @@ -234,7 +238,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } }, "spec": { @@ -334,7 +339,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } }, "spec": { @@ -360,15 +366,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } }, "spec": { @@ -488,4 +491,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datavirt/datavirt63-extensions-support-s2i.json b/datavirt/datavirt63-extensions-support-s2i.json index a06f714a..28f8ceae 100644 --- a/datavirt/datavirt63-extensions-support-s2i.json +++ b/datavirt/datavirt63-extensions-support-s2i.json @@ -305,13 +305,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" }, "annotations": { "description": "The data virtualization services." @@ -325,7 +327,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" }, "annotations": { "description": "Route for application's http (REST) service." @@ -348,7 +351,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" }, "annotations": { "description": "Route for application's https (REST) service." @@ -374,7 +378,8 @@ "metadata": { "name": "jdbc-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" }, "annotations": { "description": "Route for application's JDBC service." @@ -399,7 +404,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } } }, @@ -409,7 +415,8 @@ "metadata": { "name": "${APPLICATION_NAME}-ext", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } } }, @@ -419,7 +426,8 @@ "metadata": { "name": "${APPLICATION_NAME}-ext", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } }, "spec": { @@ -468,7 +476,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } }, "spec": { @@ -589,7 +598,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } }, "spec": { @@ -615,15 +625,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } }, "spec": { @@ -841,4 +848,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datavirt/datavirt63-secure-s2i.json b/datavirt/datavirt63-secure-s2i.json index 1758b1be..57ada89b 100644 --- a/datavirt/datavirt63-secure-s2i.json +++ b/datavirt/datavirt63-secure-s2i.json @@ -418,13 +418,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" }, "annotations": { "description": "The data virtualization services." @@ -438,7 +440,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" }, "annotations": { "description": "Route for application's http (REST) service." @@ -461,7 +464,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" }, "annotations": { "description": "Route for application's https (REST) service." @@ -487,7 +491,8 @@ "metadata": { "name": "jdbc-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" }, "annotations": { "description": "Route for application's JDBC service." @@ -512,7 +517,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } } }, @@ -522,7 +528,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } }, "spec": { @@ -622,7 +629,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } }, "spec": { @@ -648,15 +656,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "datavirt" } }, "spec": { @@ -961,4 +966,4 @@ } } ] -} +} \ No newline at end of file diff --git a/decisionserver/decisionserver64-amq-s2i.json b/decisionserver/decisionserver64-amq-s2i.json index 3006a726..df768f9e 100644 --- a/decisionserver/decisionserver64-amq-s2i.json +++ b/decisionserver/decisionserver64-amq-s2i.json @@ -241,13 +241,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" }, "annotations": { "description": "The web server's HTTP port.", @@ -266,13 +268,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" }, "annotations": { "description": "The web server's HTTPS port.", @@ -291,13 +295,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -311,7 +317,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" }, "annotations": { "description": "Route for application's HTTP service." @@ -331,7 +338,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" }, "annotations": { "description": "Route for application's HTTPS service." @@ -353,7 +361,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } } }, @@ -363,7 +372,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "spec": { @@ -435,7 +445,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "spec": { @@ -461,15 +472,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "spec": { @@ -612,7 +620,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -639,15 +648,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -749,4 +755,4 @@ } } ] -} +} \ No newline at end of file diff --git a/decisionserver/decisionserver64-basic-s2i.json b/decisionserver/decisionserver64-basic-s2i.json index eaee9c1a..018844fd 100644 --- a/decisionserver/decisionserver64-basic-s2i.json +++ b/decisionserver/decisionserver64-basic-s2i.json @@ -145,13 +145,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" }, "annotations": { "description": "The web server's http port." @@ -165,7 +167,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" }, "annotations": { "description": "Route for application's http service." @@ -184,7 +187,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } } }, @@ -194,7 +198,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "spec": { @@ -266,7 +271,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "spec": { @@ -292,15 +298,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "spec": { @@ -373,4 +376,4 @@ } } ] -} +} \ No newline at end of file diff --git a/decisionserver/decisionserver64-https-s2i.json b/decisionserver/decisionserver64-https-s2i.json index cb6eb170..c0718dc6 100644 --- a/decisionserver/decisionserver64-https-s2i.json +++ b/decisionserver/decisionserver64-https-s2i.json @@ -199,13 +199,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" }, "annotations": { "description": "The web server's http port." @@ -223,13 +225,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" }, "annotations": { "description": "The web server's https port." @@ -243,7 +247,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" }, "annotations": { "description": "Route for application's http service." @@ -263,7 +268,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" }, "annotations": { "description": "Route for application's https service." @@ -285,7 +291,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } } }, @@ -295,7 +302,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "spec": { @@ -367,7 +375,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "spec": { @@ -393,15 +402,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "decision-server" } }, "spec": { @@ -519,4 +525,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-amq-persistent-s2i.json b/eap/eap64-amq-persistent-s2i.json index 9ebbfd06..b6b8d768 100644 --- a/eap/eap64-amq-persistent-s2i.json +++ b/eap/eap64-amq-persistent-s2i.json @@ -276,13 +276,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's HTTP port.", @@ -301,13 +303,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's HTTPS port.", @@ -326,13 +330,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -346,7 +352,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's HTTP service." @@ -366,7 +373,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's HTTPS service." @@ -388,7 +396,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -398,7 +407,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -466,7 +476,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -492,15 +503,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -683,7 +691,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -713,15 +722,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -858,7 +864,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -873,4 +880,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-amq-s2i.json b/eap/eap64-amq-s2i.json index 6b0e1a30..37146136 100644 --- a/eap/eap64-amq-s2i.json +++ b/eap/eap64-amq-s2i.json @@ -262,13 +262,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's HTTP port.", @@ -287,13 +289,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's HTTPS port.", @@ -312,13 +316,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -332,7 +338,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's HTTP service." @@ -352,7 +359,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's HTTPS service." @@ -374,7 +382,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -384,7 +393,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -452,7 +462,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -478,15 +489,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -669,7 +677,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -696,15 +705,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -818,4 +824,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-basic-s2i.json b/eap/eap64-basic-s2i.json index 17fdd233..6c472d3c 100644 --- a/eap/eap64-basic-s2i.json +++ b/eap/eap64-basic-s2i.json @@ -142,13 +142,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port." @@ -162,7 +164,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -181,7 +184,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -191,7 +195,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -259,7 +264,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -285,15 +291,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -379,4 +382,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-https-s2i.json b/eap/eap64-https-s2i.json index 8616ac04..cf229557 100644 --- a/eap/eap64-https-s2i.json +++ b/eap/eap64-https-s2i.json @@ -219,13 +219,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port." @@ -243,13 +245,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port." @@ -263,7 +267,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -283,7 +288,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -305,7 +311,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -315,7 +322,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -383,7 +391,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -409,15 +418,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -575,4 +581,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-mongodb-persistent-s2i.json b/eap/eap64-mongodb-persistent-s2i.json index ea3b46d7..88e403e2 100644 --- a/eap/eap64-mongodb-persistent-s2i.json +++ b/eap/eap64-mongodb-persistent-s2i.json @@ -307,13 +307,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -332,13 +334,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -357,13 +361,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" }, "annotations": { "description": "The database server's port." @@ -377,7 +383,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -397,7 +404,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -419,7 +427,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -429,7 +438,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -497,7 +507,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -523,15 +534,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -730,7 +738,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -757,15 +766,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -837,7 +843,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -852,4 +859,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-mongodb-s2i.json b/eap/eap64-mongodb-s2i.json index 4aa9be28..30fb6d56 100644 --- a/eap/eap64-mongodb-s2i.json +++ b/eap/eap64-mongodb-s2i.json @@ -300,13 +300,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -325,13 +327,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -350,13 +354,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" }, "annotations": { "description": "The database server's port." @@ -370,7 +376,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -390,7 +397,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -412,7 +420,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -422,7 +431,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -490,7 +500,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -516,15 +527,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -723,7 +731,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -750,15 +759,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -811,4 +817,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-mysql-persistent-s2i.json b/eap/eap64-mysql-persistent-s2i.json index 304f1134..ec78b71f 100644 --- a/eap/eap64-mysql-persistent-s2i.json +++ b/eap/eap64-mysql-persistent-s2i.json @@ -311,13 +311,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -336,13 +338,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -361,13 +365,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -381,7 +387,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -401,7 +408,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -423,7 +431,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -433,7 +442,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -501,7 +511,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -527,15 +538,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -738,7 +746,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -765,15 +774,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -849,7 +855,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -864,4 +871,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-mysql-s2i.json b/eap/eap64-mysql-s2i.json index bc1cdaca..59d54710 100644 --- a/eap/eap64-mysql-s2i.json +++ b/eap/eap64-mysql-s2i.json @@ -304,13 +304,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -329,13 +331,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -354,13 +358,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -374,7 +380,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -394,7 +401,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -416,7 +424,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -426,7 +435,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -494,7 +504,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -520,15 +531,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -731,7 +739,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -758,15 +767,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -823,4 +829,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-postgresql-persistent-s2i.json b/eap/eap64-postgresql-persistent-s2i.json index d2e6ea25..27bf76f0 100644 --- a/eap/eap64-postgresql-persistent-s2i.json +++ b/eap/eap64-postgresql-persistent-s2i.json @@ -293,13 +293,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -318,13 +320,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -343,13 +347,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -363,7 +369,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -383,7 +390,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -405,7 +413,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -415,7 +424,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -483,7 +493,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -509,15 +520,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -720,7 +728,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -747,15 +756,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -823,7 +829,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -838,4 +845,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-postgresql-s2i.json b/eap/eap64-postgresql-s2i.json index 7a2d4009..ff2d4312 100644 --- a/eap/eap64-postgresql-s2i.json +++ b/eap/eap64-postgresql-s2i.json @@ -286,13 +286,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -311,13 +313,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -336,13 +340,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -356,7 +362,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -376,7 +383,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -398,7 +406,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -408,7 +417,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -476,7 +486,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -502,15 +513,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -713,7 +721,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -740,15 +749,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -797,4 +803,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-sso-s2i.json b/eap/eap64-sso-s2i.json index 368f147f..4d09cafb 100644 --- a/eap/eap64-sso-s2i.json +++ b/eap/eap64-sso-s2i.json @@ -347,13 +347,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port." @@ -371,13 +373,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port." @@ -391,7 +395,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -411,7 +416,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -433,7 +439,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -443,7 +450,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -515,7 +523,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -541,15 +550,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -813,4 +819,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-third-party-db-s2i.json b/eap/eap64-third-party-db-s2i.json index 701f4eee..933314ab 100644 --- a/eap/eap64-third-party-db-s2i.json +++ b/eap/eap64-third-party-db-s2i.json @@ -247,13 +247,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port." @@ -271,13 +273,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port." @@ -291,7 +295,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -311,7 +316,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -333,7 +339,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -343,7 +350,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -440,7 +448,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -466,15 +475,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -647,4 +653,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-amq-persistent-s2i.json b/eap/eap70-amq-persistent-s2i.json index d16756ba..97581bff 100644 --- a/eap/eap70-amq-persistent-s2i.json +++ b/eap/eap70-amq-persistent-s2i.json @@ -276,13 +276,16 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" + } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's HTTP port.", @@ -301,13 +304,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's HTTPS port.", @@ -326,13 +331,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -346,7 +353,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's HTTP service." @@ -366,7 +374,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's HTTPS service." @@ -388,7 +397,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -398,7 +408,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -466,7 +477,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -492,15 +504,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -683,7 +692,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -713,15 +723,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -858,7 +865,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -873,4 +881,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-amq-s2i.json b/eap/eap70-amq-s2i.json index 70323214..d21ede72 100644 --- a/eap/eap70-amq-s2i.json +++ b/eap/eap70-amq-s2i.json @@ -262,13 +262,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's HTTP port.", @@ -287,13 +289,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's HTTPS port.", @@ -312,13 +316,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -332,7 +338,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's HTTP service." @@ -352,7 +359,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's HTTPS service." @@ -374,7 +382,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -384,7 +393,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -452,7 +462,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -478,15 +489,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -669,7 +677,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -696,15 +705,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -818,4 +824,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-basic-s2i.json b/eap/eap70-basic-s2i.json index 312db197..e4adfc4b 100644 --- a/eap/eap70-basic-s2i.json +++ b/eap/eap70-basic-s2i.json @@ -142,13 +142,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port." @@ -162,7 +164,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -181,7 +184,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -191,7 +195,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -259,7 +264,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -285,15 +291,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -379,4 +382,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-https-s2i.json b/eap/eap70-https-s2i.json index 7c3b35f5..2a9793e0 100644 --- a/eap/eap70-https-s2i.json +++ b/eap/eap70-https-s2i.json @@ -219,13 +219,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port." @@ -243,13 +245,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port." @@ -263,7 +267,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -283,7 +288,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -305,7 +311,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -315,7 +322,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -383,7 +391,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -409,15 +418,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -575,4 +581,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-mongodb-persistent-s2i.json b/eap/eap70-mongodb-persistent-s2i.json index 205e451c..d12ff9d0 100644 --- a/eap/eap70-mongodb-persistent-s2i.json +++ b/eap/eap70-mongodb-persistent-s2i.json @@ -307,13 +307,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -332,13 +334,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -357,13 +361,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" }, "annotations": { "description": "The database server's port." @@ -377,7 +383,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -397,7 +404,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -419,7 +427,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -429,7 +438,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -497,7 +507,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -523,15 +534,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -730,7 +738,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -757,15 +766,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -837,7 +843,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -852,4 +859,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-mongodb-s2i.json b/eap/eap70-mongodb-s2i.json index 63b57d5d..7f73f121 100644 --- a/eap/eap70-mongodb-s2i.json +++ b/eap/eap70-mongodb-s2i.json @@ -300,13 +300,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -325,13 +327,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -350,13 +354,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" }, "annotations": { "description": "The database server's port." @@ -370,7 +376,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -390,7 +397,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -412,7 +420,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -422,7 +431,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -490,7 +500,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -516,15 +527,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -723,7 +731,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -750,15 +759,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -811,4 +817,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-mysql-persistent-s2i.json b/eap/eap70-mysql-persistent-s2i.json index f9f77f22..3fda85c8 100644 --- a/eap/eap70-mysql-persistent-s2i.json +++ b/eap/eap70-mysql-persistent-s2i.json @@ -311,13 +311,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -336,13 +338,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -361,13 +365,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -381,7 +387,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -401,7 +408,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -423,7 +431,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -433,7 +442,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -501,7 +511,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -527,15 +538,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -742,7 +750,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -769,15 +778,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -853,7 +859,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -868,4 +875,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-mysql-s2i.json b/eap/eap70-mysql-s2i.json index 8ea433a8..03ed812e 100644 --- a/eap/eap70-mysql-s2i.json +++ b/eap/eap70-mysql-s2i.json @@ -304,13 +304,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -329,13 +331,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -354,13 +358,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -374,7 +380,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -394,7 +401,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -416,7 +424,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -426,7 +435,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -494,7 +504,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -520,15 +531,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -735,7 +743,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -762,15 +771,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -827,4 +833,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-postgresql-persistent-s2i.json b/eap/eap70-postgresql-persistent-s2i.json index a2bc9d3b..8b31be69 100644 --- a/eap/eap70-postgresql-persistent-s2i.json +++ b/eap/eap70-postgresql-persistent-s2i.json @@ -293,13 +293,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -318,13 +320,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -343,13 +347,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -363,7 +369,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -383,7 +390,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -405,7 +413,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -415,7 +424,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -483,7 +493,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -509,15 +520,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -724,7 +732,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -751,15 +760,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -827,7 +833,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -842,4 +849,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-postgresql-s2i.json b/eap/eap70-postgresql-s2i.json index 66b0c737..09313852 100644 --- a/eap/eap70-postgresql-s2i.json +++ b/eap/eap70-postgresql-s2i.json @@ -286,13 +286,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -311,13 +313,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -336,13 +340,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -356,7 +362,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -376,7 +383,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -398,7 +406,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -408,7 +417,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -476,7 +486,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -502,15 +513,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -717,7 +725,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -744,15 +753,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -801,4 +807,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-sso-s2i.json b/eap/eap70-sso-s2i.json index 2201ff7f..d2983cce 100644 --- a/eap/eap70-sso-s2i.json +++ b/eap/eap70-sso-s2i.json @@ -347,13 +347,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port." @@ -371,13 +373,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port." @@ -391,7 +395,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -411,7 +416,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -433,7 +439,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -443,7 +450,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -515,7 +523,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -541,15 +550,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -813,4 +819,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-third-party-db-s2i.json b/eap/eap70-third-party-db-s2i.json index 3ca69f6c..12ebbbc7 100644 --- a/eap/eap70-third-party-db-s2i.json +++ b/eap/eap70-third-party-db-s2i.json @@ -247,13 +247,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port." @@ -271,13 +273,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port." @@ -291,7 +295,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -311,7 +316,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -333,7 +339,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -343,7 +350,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -440,7 +448,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -466,15 +475,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { diff --git a/eap/eap71-amq-persistent-s2i.json b/eap/eap71-amq-persistent-s2i.json index dbc1a801..425490b1 100644 --- a/eap/eap71-amq-persistent-s2i.json +++ b/eap/eap71-amq-persistent-s2i.json @@ -276,13 +276,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's HTTP port.", @@ -301,13 +303,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's HTTPS port.", @@ -326,13 +330,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -346,7 +352,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's HTTP service." @@ -366,7 +373,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's HTTPS service." @@ -388,7 +396,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -398,7 +407,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -466,7 +476,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -492,15 +503,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -683,7 +691,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -713,15 +722,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -858,7 +864,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -873,4 +880,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-amq-s2i.json b/eap/eap71-amq-s2i.json index 6e330eae..ecffcca6 100644 --- a/eap/eap71-amq-s2i.json +++ b/eap/eap71-amq-s2i.json @@ -262,13 +262,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's HTTP port.", @@ -287,13 +289,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's HTTPS port.", @@ -312,13 +316,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -332,7 +338,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's HTTP service." @@ -352,7 +359,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's HTTPS service." @@ -374,7 +382,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -384,7 +393,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -452,7 +462,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -478,15 +489,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -669,7 +677,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -696,15 +705,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -818,4 +824,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-basic-s2i.json b/eap/eap71-basic-s2i.json index 892ec468..877e5380 100644 --- a/eap/eap71-basic-s2i.json +++ b/eap/eap71-basic-s2i.json @@ -142,13 +142,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port." @@ -162,7 +164,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -181,7 +184,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -191,7 +195,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -259,7 +264,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -285,15 +291,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -379,4 +382,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-https-s2i.json b/eap/eap71-https-s2i.json index 7426830e..9326ed56 100644 --- a/eap/eap71-https-s2i.json +++ b/eap/eap71-https-s2i.json @@ -219,13 +219,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port." @@ -243,13 +245,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port." @@ -263,7 +267,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -283,7 +288,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -305,7 +311,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -315,7 +322,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -383,7 +391,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -409,15 +418,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -575,4 +581,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-mongodb-persistent-s2i.json b/eap/eap71-mongodb-persistent-s2i.json index fb7f27ac..ee4424a1 100644 --- a/eap/eap71-mongodb-persistent-s2i.json +++ b/eap/eap71-mongodb-persistent-s2i.json @@ -307,13 +307,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -332,13 +334,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -357,13 +361,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" }, "annotations": { "description": "The database server's port." @@ -377,7 +383,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -397,7 +404,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -419,7 +427,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -429,7 +438,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -497,7 +507,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -523,15 +534,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -730,7 +738,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -757,15 +766,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -837,7 +843,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -852,4 +859,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-mongodb-s2i.json b/eap/eap71-mongodb-s2i.json index 915c9ba0..8495eba9 100644 --- a/eap/eap71-mongodb-s2i.json +++ b/eap/eap71-mongodb-s2i.json @@ -300,13 +300,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -325,13 +327,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -350,13 +354,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" }, "annotations": { "description": "The database server's port." @@ -370,7 +376,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -390,7 +397,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -412,7 +420,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -422,7 +431,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -490,7 +500,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -516,15 +527,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -723,7 +731,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -750,15 +759,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -811,4 +817,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-mysql-persistent-s2i.json b/eap/eap71-mysql-persistent-s2i.json index 6af9e5f5..3ba012fd 100644 --- a/eap/eap71-mysql-persistent-s2i.json +++ b/eap/eap71-mysql-persistent-s2i.json @@ -311,13 +311,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -336,13 +338,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -361,13 +365,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -381,7 +387,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -401,7 +408,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -423,7 +431,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -433,7 +442,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -501,7 +511,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -527,15 +538,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -742,7 +750,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -769,15 +778,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -853,7 +859,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -868,4 +875,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-mysql-s2i.json b/eap/eap71-mysql-s2i.json index c7d14d3c..97b64526 100644 --- a/eap/eap71-mysql-s2i.json +++ b/eap/eap71-mysql-s2i.json @@ -304,13 +304,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -329,13 +331,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -354,13 +358,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -374,7 +380,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -394,7 +401,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -416,7 +424,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -426,7 +435,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -494,7 +504,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -520,15 +531,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -735,7 +743,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -762,15 +771,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -827,4 +833,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-postgresql-persistent-s2i.json b/eap/eap71-postgresql-persistent-s2i.json index a8d77b0a..4087cddb 100644 --- a/eap/eap71-postgresql-persistent-s2i.json +++ b/eap/eap71-postgresql-persistent-s2i.json @@ -293,13 +293,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -318,13 +320,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -343,13 +347,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -363,7 +369,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -383,7 +390,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -405,7 +413,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -415,7 +424,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -483,7 +493,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -509,15 +520,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -724,7 +732,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -751,15 +760,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -827,7 +833,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -842,4 +849,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-postgresql-s2i.json b/eap/eap71-postgresql-s2i.json index d87f05ea..4c47f688 100644 --- a/eap/eap71-postgresql-s2i.json +++ b/eap/eap71-postgresql-s2i.json @@ -286,13 +286,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port.", @@ -311,13 +313,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port.", @@ -336,13 +340,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -356,7 +362,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -376,7 +383,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -398,7 +406,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -408,7 +417,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -476,7 +486,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -502,15 +513,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -717,7 +725,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -744,15 +753,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -801,4 +807,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-sso-s2i.json b/eap/eap71-sso-s2i.json index 96b3dffc..9540774f 100644 --- a/eap/eap71-sso-s2i.json +++ b/eap/eap71-sso-s2i.json @@ -347,13 +347,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port." @@ -371,13 +373,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port." @@ -391,7 +395,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -411,7 +416,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -433,7 +439,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -443,7 +450,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -515,7 +523,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -541,15 +550,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -813,4 +819,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-third-party-db-s2i.json b/eap/eap71-third-party-db-s2i.json index a2a7264f..70d4e4ff 100644 --- a/eap/eap71-third-party-db-s2i.json +++ b/eap/eap71-third-party-db-s2i.json @@ -247,13 +247,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's http port." @@ -271,13 +273,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "The web server's https port." @@ -291,7 +295,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's http service." @@ -311,7 +316,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" }, "annotations": { "description": "Route for application's https service." @@ -333,7 +339,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } } }, @@ -343,7 +350,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -440,7 +448,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -466,15 +475,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "eap" } }, "spec": { @@ -647,4 +653,4 @@ } } ] -} +} \ No newline at end of file diff --git a/openjdk/openjdk18-web-basic-s2i.json b/openjdk/openjdk18-web-basic-s2i.json index 6336f039..8c88298f 100644 --- a/openjdk/openjdk18-web-basic-s2i.json +++ b/openjdk/openjdk18-web-basic-s2i.json @@ -92,13 +92,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "openjdk18" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "openjdk18" }, "annotations": { "description": "The application's http port." @@ -112,7 +114,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "openjdk18" }, "annotations": { "description": "Route for application's http service." @@ -131,7 +134,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "openjdk18" } } }, @@ -141,7 +145,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "openjdk18" } }, "spec": { @@ -199,7 +204,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "openjdk18" } }, "spec": { @@ -225,15 +231,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "openjdk18" } }, "spec": { @@ -269,4 +272,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-amq-mysql-persistent-s2i.json b/processserver/processserver64-amq-mysql-persistent-s2i.json index 9ef04ae7..c94b8710 100644 --- a/processserver/processserver64-amq-mysql-persistent-s2i.json +++ b/processserver/processserver64-amq-mysql-persistent-s2i.json @@ -368,13 +368,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's http port.", @@ -393,13 +395,16 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" + } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's https port.", @@ -418,13 +423,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -442,13 +449,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -462,7 +471,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's http service." @@ -482,7 +492,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's https service." @@ -504,7 +515,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } } }, @@ -514,7 +526,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -586,7 +599,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -612,15 +626,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -851,7 +862,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -878,15 +890,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -962,7 +971,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -982,7 +992,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -1009,15 +1020,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -1142,7 +1150,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -1157,4 +1166,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-amq-mysql-s2i.json b/processserver/processserver64-amq-mysql-s2i.json index 4cb45db4..17f89341 100644 --- a/processserver/processserver64-amq-mysql-s2i.json +++ b/processserver/processserver64-amq-mysql-s2i.json @@ -354,13 +354,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's http port.", @@ -379,13 +381,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's https port.", @@ -404,13 +408,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -428,13 +434,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -448,7 +456,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's http service." @@ -468,7 +477,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's https service." @@ -490,7 +500,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } } }, @@ -500,7 +511,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -572,7 +584,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -598,15 +611,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -801,7 +811,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -828,15 +839,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -898,7 +906,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -925,15 +934,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { diff --git a/processserver/processserver64-amq-postgresql-persistent-s2i.json b/processserver/processserver64-amq-postgresql-persistent-s2i.json index 56fefcc0..a2ec2249 100644 --- a/processserver/processserver64-amq-postgresql-persistent-s2i.json +++ b/processserver/processserver64-amq-postgresql-persistent-s2i.json @@ -350,13 +350,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's http port.", @@ -375,13 +377,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's https port.", @@ -400,13 +404,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -424,13 +430,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -444,7 +452,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's http service." @@ -464,7 +473,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's https service." @@ -486,7 +496,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } } }, @@ -496,7 +507,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -568,7 +580,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -594,15 +607,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -833,7 +843,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -860,15 +871,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -932,7 +940,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -952,7 +961,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -979,15 +989,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -1112,7 +1119,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -1127,4 +1135,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-amq-postgresql-s2i.json b/processserver/processserver64-amq-postgresql-s2i.json index bb8d2df2..76a77340 100644 --- a/processserver/processserver64-amq-postgresql-s2i.json +++ b/processserver/processserver64-amq-postgresql-s2i.json @@ -337,13 +337,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's http port.", @@ -362,13 +364,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's https port.", @@ -387,13 +391,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -411,13 +417,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -431,7 +439,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's http service." @@ -451,7 +460,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's https service." @@ -473,7 +483,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } } }, @@ -483,7 +494,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -555,7 +567,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -581,15 +594,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -784,7 +794,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -811,15 +822,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -869,7 +877,8 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -896,15 +905,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "amq" } }, "spec": { @@ -1006,4 +1012,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-basic-s2i.json b/processserver/processserver64-basic-s2i.json index 1b7cc8cf..96d65cdc 100644 --- a/processserver/processserver64-basic-s2i.json +++ b/processserver/processserver64-basic-s2i.json @@ -156,13 +156,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's http port." @@ -176,7 +178,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's http service." @@ -195,7 +198,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } } }, @@ -205,7 +209,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -277,7 +282,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -303,15 +309,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -384,4 +387,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-mysql-persistent-s2i.json b/processserver/processserver64-mysql-persistent-s2i.json index 1a4d0887..aef0ceb4 100644 --- a/processserver/processserver64-mysql-persistent-s2i.json +++ b/processserver/processserver64-mysql-persistent-s2i.json @@ -305,13 +305,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's http port.", @@ -330,13 +332,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's https port.", @@ -355,13 +359,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -375,7 +381,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's http service." @@ -395,7 +402,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's https service." @@ -417,7 +425,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } } }, @@ -427,7 +436,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -499,7 +509,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -525,15 +536,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -736,7 +744,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -763,15 +772,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -847,7 +853,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -862,4 +869,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-mysql-s2i.json b/processserver/processserver64-mysql-s2i.json index 7c491d83..679be93a 100644 --- a/processserver/processserver64-mysql-s2i.json +++ b/processserver/processserver64-mysql-s2i.json @@ -297,13 +297,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's http port.", @@ -322,13 +324,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's https port.", @@ -347,13 +351,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -367,7 +373,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's http service." @@ -387,7 +394,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's https service." @@ -409,7 +417,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } } }, @@ -419,7 +428,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -491,7 +501,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -517,15 +528,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -692,7 +700,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -719,15 +728,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -784,4 +790,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-postgresql-persistent-s2i.json b/processserver/processserver64-postgresql-persistent-s2i.json index 8965ea41..bb7df4ff 100644 --- a/processserver/processserver64-postgresql-persistent-s2i.json +++ b/processserver/processserver64-postgresql-persistent-s2i.json @@ -286,13 +286,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's http port.", @@ -311,13 +313,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's https port.", @@ -336,13 +340,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -356,7 +362,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's http service." @@ -376,7 +383,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's https service." @@ -398,7 +406,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } } }, @@ -408,7 +417,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -480,7 +490,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -506,15 +517,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -717,7 +725,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -744,15 +753,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -816,7 +822,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -831,4 +838,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-postgresql-s2i.json b/processserver/processserver64-postgresql-s2i.json index e21f0ce4..0139d73b 100644 --- a/processserver/processserver64-postgresql-s2i.json +++ b/processserver/processserver64-postgresql-s2i.json @@ -279,13 +279,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's http port.", @@ -304,13 +306,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "The web server's https port.", @@ -329,13 +333,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -349,7 +355,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's http service." @@ -369,7 +376,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" }, "annotations": { "description": "Route for application's https service." @@ -391,7 +399,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } } }, @@ -401,7 +410,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -473,7 +483,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -499,15 +510,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "intelligent-process-server" } }, "spec": { @@ -674,7 +682,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -701,15 +710,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -754,4 +760,4 @@ } } ] -} +} \ No newline at end of file diff --git a/sso/sso71-https.json b/sso/sso71-https.json index 26dd2662..617a002e 100644 --- a/sso/sso71-https.json +++ b/sso/sso71-https.json @@ -216,13 +216,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" }, "annotations": { "description": "The web server's http port." @@ -240,13 +242,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" }, "annotations": { "description": "The web server's https port." @@ -260,7 +264,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" }, "annotations": { "description": "Route for application's http service." @@ -280,7 +285,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" }, "annotations": { "description": "Route for application's https service." @@ -302,7 +308,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "spec": { @@ -329,15 +336,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "spec": { @@ -546,4 +550,4 @@ } } ] -} +} \ No newline at end of file diff --git a/sso/sso71-mysql-persistent.json b/sso/sso71-mysql-persistent.json index 7092bb65..6aa0437d 100644 --- a/sso/sso71-mysql-persistent.json +++ b/sso/sso71-mysql-persistent.json @@ -290,13 +290,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" }, "annotations": { "description": "The web server's http port.", @@ -315,13 +317,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" }, "annotations": { "description": "The web server's https port.", @@ -340,13 +344,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -360,7 +366,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" }, "annotations": { "description": "Route for application's http service." @@ -380,7 +387,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" }, "annotations": { "description": "Route for application's https service." @@ -402,7 +410,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "spec": { @@ -429,15 +438,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "spec": { @@ -675,7 +681,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -702,15 +709,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -786,7 +790,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -801,4 +806,4 @@ } } ] -} +} \ No newline at end of file diff --git a/sso/sso71-mysql.json b/sso/sso71-mysql.json index d90f0a0c..bc465284 100644 --- a/sso/sso71-mysql.json +++ b/sso/sso71-mysql.json @@ -283,14 +283,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}", - "component": "server" + "component": "sso" }, "annotations": { "description": "The web server's http port.", @@ -309,14 +310,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}", - "component": "server" + "component": "sso" }, "annotations": { "description": "The web server's https port.", @@ -335,14 +337,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { "application": "${APPLICATION_NAME}", - "component": "database" + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -357,7 +360,7 @@ "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}", - "component": "server" + "component": "sso" }, "annotations": { "description": "Route for application's http service." @@ -378,7 +381,7 @@ "name": "secure-${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}", - "component": "server" + "component": "sso" }, "annotations": { "description": "Route for application's https service." @@ -401,7 +404,7 @@ "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}", - "component": "server" + "component": "sso" } }, "spec": { @@ -428,16 +431,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}", - "component": "server" + "component": "sso" } }, "spec": { @@ -676,7 +675,7 @@ "name": "${APPLICATION_NAME}-mysql", "labels": { "application": "${APPLICATION_NAME}", - "component": "database" + "component": "mysql" } }, "spec": { @@ -703,16 +702,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", "application": "${APPLICATION_NAME}", - "component": "database" + "component": "mysql" } }, "spec": { @@ -769,4 +764,4 @@ } } ] -} +} \ No newline at end of file diff --git a/sso/sso71-postgresql-persistent.json b/sso/sso71-postgresql-persistent.json index b1077db9..16728a6f 100644 --- a/sso/sso71-postgresql-persistent.json +++ b/sso/sso71-postgresql-persistent.json @@ -272,13 +272,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" }, "annotations": { "description": "The web server's http port.", @@ -297,13 +299,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" }, "annotations": { "description": "The web server's https port.", @@ -322,13 +326,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -342,7 +348,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" }, "annotations": { "description": "Route for application's http service." @@ -362,7 +369,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" }, "annotations": { "description": "Route for application's https service." @@ -384,7 +392,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "spec": { @@ -411,15 +420,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "spec": { @@ -657,7 +663,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -684,15 +691,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -760,7 +764,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -775,4 +780,4 @@ } } ] -} +} \ No newline at end of file diff --git a/sso/sso71-postgresql.json b/sso/sso71-postgresql.json index 0955d712..7289e40f 100644 --- a/sso/sso71-postgresql.json +++ b/sso/sso71-postgresql.json @@ -265,14 +265,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}", - "component": "server" + "component": "sso" }, "annotations": { "description": "The web server's http port.", @@ -291,14 +292,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "sso" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}", - "component": "server" + "component": "sso" }, "annotations": { "description": "The web server's https port.", @@ -317,14 +319,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { "application": "${APPLICATION_NAME}", - "component": "database" + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -339,7 +342,7 @@ "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}", - "component": "server" + "component": "sso" }, "annotations": { "description": "Route for application's http service." @@ -360,7 +363,7 @@ "name": "secure-${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}", - "component": "server" + "component": "sso" }, "annotations": { "description": "Route for application's https service." @@ -383,7 +386,7 @@ "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}", - "component": "server" + "component": "sso" } }, "spec": { @@ -410,16 +413,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}", - "component": "server" + "component": "sso" } }, "spec": { @@ -658,7 +657,7 @@ "name": "${APPLICATION_NAME}-postgresql", "labels": { "application": "${APPLICATION_NAME}", - "component": "database" + "component": "postgresql" } }, "spec": { @@ -685,16 +684,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", "application": "${APPLICATION_NAME}", - "component": "database" + "component": "postgresql" } }, "spec": { @@ -743,4 +738,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat7-basic-s2i.json b/webserver/jws31-tomcat7-basic-s2i.json index 42e35253..0267e199 100644 --- a/webserver/jws31-tomcat7-basic-s2i.json +++ b/webserver/jws31-tomcat7-basic-s2i.json @@ -118,13 +118,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port." @@ -138,7 +140,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -157,7 +160,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -167,7 +171,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -235,7 +240,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -261,15 +267,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -317,4 +320,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat7-https-s2i.json b/webserver/jws31-tomcat7-https-s2i.json index b0a81d9c..eacbe27e 100644 --- a/webserver/jws31-tomcat7-https-s2i.json +++ b/webserver/jws31-tomcat7-https-s2i.json @@ -157,13 +157,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port." @@ -181,13 +183,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port." @@ -201,7 +205,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -221,7 +226,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -243,7 +249,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -253,7 +260,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -321,7 +329,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -347,15 +356,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -440,4 +446,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat7-mongodb-persistent-s2i.json b/webserver/jws31-tomcat7-mongodb-persistent-s2i.json index 565f9782..e10acbf5 100644 --- a/webserver/jws31-tomcat7-mongodb-persistent-s2i.json +++ b/webserver/jws31-tomcat7-mongodb-persistent-s2i.json @@ -244,13 +244,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port.", @@ -269,13 +271,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port.", @@ -294,13 +298,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" }, "annotations": { "description": "The database server's port." @@ -314,7 +320,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -334,7 +341,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -356,7 +364,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -366,7 +375,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -434,7 +444,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -460,15 +471,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -594,7 +602,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -621,15 +630,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -701,7 +707,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -716,4 +723,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat7-mongodb-s2i.json b/webserver/jws31-tomcat7-mongodb-s2i.json index fc473f5c..b614062a 100644 --- a/webserver/jws31-tomcat7-mongodb-s2i.json +++ b/webserver/jws31-tomcat7-mongodb-s2i.json @@ -234,13 +234,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port.", @@ -259,13 +261,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port.", @@ -284,13 +288,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" }, "annotations": { "description": "The database server's port." @@ -304,7 +310,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -324,7 +331,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -346,7 +354,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -356,7 +365,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -424,7 +434,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -450,15 +461,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -584,7 +592,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -611,15 +620,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -672,4 +678,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat7-mysql-persistent-s2i.json b/webserver/jws31-tomcat7-mysql-persistent-s2i.json index 1223acd0..1a0399a8 100644 --- a/webserver/jws31-tomcat7-mysql-persistent-s2i.json +++ b/webserver/jws31-tomcat7-mysql-persistent-s2i.json @@ -249,13 +249,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port.", @@ -274,13 +276,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port.", @@ -299,13 +303,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -319,7 +325,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -339,7 +346,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -361,7 +369,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -371,7 +380,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -439,7 +449,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -465,15 +476,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -595,7 +603,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -622,15 +631,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -705,7 +711,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -720,4 +727,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat7-mysql-s2i.json b/webserver/jws31-tomcat7-mysql-s2i.json index 39becd41..9fbbc072 100644 --- a/webserver/jws31-tomcat7-mysql-s2i.json +++ b/webserver/jws31-tomcat7-mysql-s2i.json @@ -238,13 +238,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port.", @@ -263,13 +265,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port.", @@ -288,13 +292,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -308,7 +314,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -328,7 +335,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -350,7 +358,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -360,7 +369,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -428,7 +438,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -454,15 +465,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -584,7 +592,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -611,15 +620,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -675,4 +681,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat7-postgresql-persistent-s2i.json b/webserver/jws31-tomcat7-postgresql-persistent-s2i.json index 77f4f8c9..8a676cd2 100644 --- a/webserver/jws31-tomcat7-postgresql-persistent-s2i.json +++ b/webserver/jws31-tomcat7-postgresql-persistent-s2i.json @@ -230,13 +230,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port.", @@ -255,13 +257,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port.", @@ -280,13 +284,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -300,7 +306,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -320,7 +327,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -342,7 +350,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -352,7 +361,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -420,7 +430,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -446,15 +457,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -576,7 +584,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -603,15 +612,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -678,7 +684,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -693,4 +700,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat7-postgresql-s2i.json b/webserver/jws31-tomcat7-postgresql-s2i.json index 6d1d7aef..ec33826f 100644 --- a/webserver/jws31-tomcat7-postgresql-s2i.json +++ b/webserver/jws31-tomcat7-postgresql-s2i.json @@ -220,13 +220,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port.", @@ -245,13 +247,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port.", @@ -270,13 +274,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -290,7 +296,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -310,7 +317,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -332,7 +340,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -342,7 +351,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -410,7 +420,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -436,15 +447,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -566,7 +574,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -593,15 +602,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -649,4 +655,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat8-basic-s2i.json b/webserver/jws31-tomcat8-basic-s2i.json index 9e7dc348..cdd8194f 100644 --- a/webserver/jws31-tomcat8-basic-s2i.json +++ b/webserver/jws31-tomcat8-basic-s2i.json @@ -121,13 +121,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port." @@ -141,7 +143,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -160,7 +163,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -170,7 +174,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -238,7 +243,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -264,15 +270,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -320,4 +323,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat8-https-s2i.json b/webserver/jws31-tomcat8-https-s2i.json index 8fd5d9fa..56ce677e 100644 --- a/webserver/jws31-tomcat8-https-s2i.json +++ b/webserver/jws31-tomcat8-https-s2i.json @@ -157,13 +157,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port." @@ -181,13 +183,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port." @@ -201,7 +205,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -221,7 +226,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -243,7 +249,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -253,7 +260,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -321,7 +329,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -347,15 +356,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -440,4 +446,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat8-mongodb-persistent-s2i.json b/webserver/jws31-tomcat8-mongodb-persistent-s2i.json index f4b11ccf..1889eb79 100644 --- a/webserver/jws31-tomcat8-mongodb-persistent-s2i.json +++ b/webserver/jws31-tomcat8-mongodb-persistent-s2i.json @@ -245,13 +245,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port.", @@ -270,13 +272,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port.", @@ -295,13 +299,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" }, "annotations": { "description": "The database server's port." @@ -315,7 +321,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -335,7 +342,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -357,7 +365,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -367,7 +376,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -435,7 +445,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -461,15 +472,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -595,7 +603,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -622,15 +631,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -702,7 +708,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -717,4 +724,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat8-mongodb-s2i.json b/webserver/jws31-tomcat8-mongodb-s2i.json index e2f69f15..35125407 100644 --- a/webserver/jws31-tomcat8-mongodb-s2i.json +++ b/webserver/jws31-tomcat8-mongodb-s2i.json @@ -234,13 +234,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port.", @@ -259,13 +261,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port.", @@ -284,13 +288,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" }, "annotations": { "description": "The database server's port." @@ -304,7 +310,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -324,7 +331,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -346,7 +354,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -356,7 +365,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -424,7 +434,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -450,15 +461,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -584,7 +592,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -611,15 +620,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mongodb" } }, "spec": { @@ -672,4 +678,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat8-mysql-persistent-s2i.json b/webserver/jws31-tomcat8-mysql-persistent-s2i.json index 579071cb..216ba6b8 100644 --- a/webserver/jws31-tomcat8-mysql-persistent-s2i.json +++ b/webserver/jws31-tomcat8-mysql-persistent-s2i.json @@ -248,13 +248,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port.", @@ -273,13 +275,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port.", @@ -298,13 +302,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -318,7 +324,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -338,7 +345,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -360,7 +368,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -370,7 +379,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -438,7 +448,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -464,15 +475,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -594,7 +602,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -621,15 +630,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -704,7 +710,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -719,4 +726,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat8-mysql-s2i.json b/webserver/jws31-tomcat8-mysql-s2i.json index e84d6160..b2655170 100644 --- a/webserver/jws31-tomcat8-mysql-s2i.json +++ b/webserver/jws31-tomcat8-mysql-s2i.json @@ -238,13 +238,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port.", @@ -263,13 +265,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port.", @@ -288,13 +292,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" }, "annotations": { "description": "The database server's port." @@ -308,7 +314,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -328,7 +335,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -350,7 +358,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -360,7 +369,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -428,7 +438,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -454,15 +465,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -584,7 +592,8 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -611,15 +620,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "mysql" } }, "spec": { @@ -675,4 +681,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat8-postgresql-persistent-s2i.json b/webserver/jws31-tomcat8-postgresql-persistent-s2i.json index 83a6ca19..215906e1 100644 --- a/webserver/jws31-tomcat8-postgresql-persistent-s2i.json +++ b/webserver/jws31-tomcat8-postgresql-persistent-s2i.json @@ -227,13 +227,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port.", @@ -252,13 +254,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port.", @@ -277,13 +281,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -297,7 +303,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -317,7 +324,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -339,7 +347,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -349,7 +358,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -417,7 +427,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -443,15 +454,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -573,7 +581,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -600,15 +609,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -675,7 +681,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql-claim", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -690,4 +697,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat8-postgresql-s2i.json b/webserver/jws31-tomcat8-postgresql-s2i.json index e28cf8a0..b85ee715 100644 --- a/webserver/jws31-tomcat8-postgresql-s2i.json +++ b/webserver/jws31-tomcat8-postgresql-s2i.json @@ -220,13 +220,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's http port.", @@ -245,13 +247,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "The web server's https port.", @@ -270,13 +274,15 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" }, "annotations": { "description": "The database server's port." @@ -290,7 +296,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's http service." @@ -310,7 +317,8 @@ "metadata": { "name": "secure-${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" }, "annotations": { "description": "Route for application's https service." @@ -332,7 +340,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } } }, @@ -342,7 +351,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -410,7 +420,8 @@ "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -436,15 +447,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "webserver" } }, "spec": { @@ -565,7 +573,8 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -592,15 +601,12 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}", + "component": "postgresql" } }, "spec": { @@ -647,4 +653,4 @@ } } ] -} +} \ No newline at end of file