From f874c8eb7cb901dc4b8c13130f3ee55232a48001 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 --- amq/amq62-basic.json | 22 +++++------ amq/amq62-persistent-ssl.json | 38 ++++++++----------- amq/amq62-persistent.json | 30 ++++++--------- amq/amq62-ssl.json | 30 +++++++-------- amq/amq63-basic.json | 22 +++++------ amq/amq63-persistent-ssl.json | 38 ++++++++----------- amq/amq63-persistent.json | 30 ++++++--------- amq/amq63-ssl.json | 30 +++++++-------- datagrid/datagrid65-basic.json | 12 ++---- datagrid/datagrid65-https.json | 14 +++---- datagrid/datagrid65-mysql-persistent.json | 26 +++++-------- datagrid/datagrid65-mysql.json | 26 +++++-------- .../datagrid65-postgresql-persistent.json | 26 +++++-------- datagrid/datagrid65-postgresql.json | 26 +++++-------- datagrid/datagrid71-basic.json | 12 ++---- datagrid/datagrid71-https.json | 14 +++---- datagrid/datagrid71-mysql-persistent.json | 26 +++++-------- datagrid/datagrid71-mysql.json | 26 +++++-------- .../datagrid71-postgresql-persistent.json | 26 +++++-------- datagrid/datagrid71-postgresql.json | 24 ++++-------- datavirt/datavirt63-basic-s2i.json | 8 +--- .../datavirt63-extensions-support-s2i.json | 8 +--- datavirt/datavirt63-secure-s2i.json | 8 +--- decisionserver/decisionserver64-amq-s2i.json | 22 ++++------- .../decisionserver64-basic-s2i.json | 8 +--- .../decisionserver64-https-s2i.json | 10 ++--- eap/eap64-amq-persistent-s2i.json | 22 ++++------- eap/eap64-amq-s2i.json | 22 ++++------- eap/eap64-basic-s2i.json | 8 +--- eap/eap64-https-s2i.json | 10 ++--- eap/eap64-mongodb-persistent-s2i.json | 22 ++++------- eap/eap64-mongodb-s2i.json | 22 ++++------- eap/eap64-mysql-persistent-s2i.json | 22 ++++------- eap/eap64-mysql-s2i.json | 22 ++++------- eap/eap64-postgresql-persistent-s2i.json | 22 ++++------- eap/eap64-postgresql-s2i.json | 22 ++++------- eap/eap64-sso-s2i.json | 10 ++--- eap/eap64-third-party-db-s2i.json | 10 ++--- eap/eap70-amq-persistent-s2i.json | 22 ++++------- eap/eap70-amq-s2i.json | 22 ++++------- eap/eap70-basic-s2i.json | 8 +--- eap/eap70-https-s2i.json | 10 ++--- eap/eap70-mongodb-persistent-s2i.json | 22 ++++------- eap/eap70-mongodb-s2i.json | 22 ++++------- eap/eap70-mysql-persistent-s2i.json | 22 ++++------- eap/eap70-mysql-s2i.json | 22 ++++------- eap/eap70-postgresql-persistent-s2i.json | 22 ++++------- eap/eap70-postgresql-s2i.json | 22 ++++------- eap/eap70-sso-s2i.json | 10 ++--- eap/eap70-third-party-db-s2i.json | 8 +--- eap/eap71-amq-persistent-s2i.json | 22 ++++------- eap/eap71-amq-s2i.json | 22 ++++------- eap/eap71-basic-s2i.json | 8 +--- eap/eap71-https-s2i.json | 10 ++--- eap/eap71-mongodb-persistent-s2i.json | 22 ++++------- eap/eap71-mongodb-s2i.json | 22 ++++------- eap/eap71-mysql-persistent-s2i.json | 22 ++++------- eap/eap71-mysql-s2i.json | 22 ++++------- eap/eap71-postgresql-persistent-s2i.json | 22 ++++------- eap/eap71-postgresql-s2i.json | 22 ++++------- eap/eap71-sso-s2i.json | 10 ++--- eap/eap71-third-party-db-s2i.json | 10 ++--- openjdk/openjdk18-web-basic-s2i.json | 8 +--- ...cessserver64-amq-mysql-persistent-s2i.json | 34 ++++++----------- .../processserver64-amq-mysql-s2i.json | 32 +++++----------- ...erver64-amq-postgresql-persistent-s2i.json | 34 ++++++----------- .../processserver64-amq-postgresql-s2i.json | 34 ++++++----------- processserver/processserver64-basic-s2i.json | 8 +--- .../processserver64-mysql-persistent-s2i.json | 22 ++++------- processserver/processserver64-mysql-s2i.json | 20 +++------- ...essserver64-postgresql-persistent-s2i.json | 22 ++++------- .../processserver64-postgresql-s2i.json | 20 +++------- sso/sso71-https.json | 10 ++--- sso/sso71-mysql-persistent.json | 22 ++++------- sso/sso71-mysql.json | 22 ++++------- sso/sso71-postgresql-persistent.json | 22 ++++------- sso/sso71-postgresql.json | 22 ++++------- webserver/jws31-tomcat7-basic-s2i.json | 8 +--- webserver/jws31-tomcat7-https-s2i.json | 10 ++--- .../jws31-tomcat7-mongodb-persistent-s2i.json | 20 +++------- webserver/jws31-tomcat7-mongodb-s2i.json | 22 ++++------- .../jws31-tomcat7-mysql-persistent-s2i.json | 20 +++------- webserver/jws31-tomcat7-mysql-s2i.json | 22 ++++------- ...s31-tomcat7-postgresql-persistent-s2i.json | 22 ++++------- webserver/jws31-tomcat7-postgresql-s2i.json | 22 ++++------- webserver/jws31-tomcat8-basic-s2i.json | 8 +--- webserver/jws31-tomcat8-https-s2i.json | 10 ++--- .../jws31-tomcat8-mongodb-persistent-s2i.json | 22 ++++------- webserver/jws31-tomcat8-mongodb-s2i.json | 22 ++++------- .../jws31-tomcat8-mysql-persistent-s2i.json | 22 ++++------- webserver/jws31-tomcat8-mysql-s2i.json | 22 ++++------- ...s31-tomcat8-postgresql-persistent-s2i.json | 22 ++++------- webserver/jws31-tomcat8-postgresql-s2i.json | 22 ++++------- 93 files changed, 599 insertions(+), 1231 deletions(-) diff --git a/amq/amq62-basic.json b/amq/amq62-basic.json index f6400599..83db69cb 100644 --- a/amq/amq62-basic.json +++ b/amq/amq62-basic.json @@ -102,7 +102,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -126,7 +126,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -150,7 +150,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -174,7 +174,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -192,7 +192,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}" } @@ -210,7 +210,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -224,14 +224,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", "application": "${APPLICATION_NAME}" } }, @@ -239,7 +235,7 @@ "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-62", "imagePullPolicy": "Always", "readinessProbe": { @@ -331,4 +327,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq62-persistent-ssl.json b/amq/amq62-persistent-ssl.json index 945317fb..fa98927b 100644 --- a/amq/amq62-persistent-ssl.json +++ b/amq/amq62-persistent-ssl.json @@ -151,7 +151,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -175,7 +175,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -199,7 +199,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -223,7 +223,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -247,7 +247,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -271,7 +271,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -295,7 +295,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -319,7 +319,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -337,7 +337,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}" } @@ -355,7 +355,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -369,14 +369,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", "application": "${APPLICATION_NAME}" } }, @@ -385,7 +381,7 @@ "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-62", "imagePullPolicy": "Always", "volumeMounts": [ @@ -551,7 +547,7 @@ "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-drainer" } }, "spec": { @@ -578,15 +574,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-drainer" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-drainer", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-drainer" } }, "spec": { @@ -674,4 +666,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq62-persistent.json b/amq/amq62-persistent.json index 87fa8dd9..cd5a7f24 100644 --- a/amq/amq62-persistent.json +++ b/amq/amq62-persistent.json @@ -116,7 +116,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -140,7 +140,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -164,7 +164,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -188,7 +188,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -206,7 +206,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}" } @@ -224,7 +224,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -238,14 +238,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", "application": "${APPLICATION_NAME}" } }, @@ -253,7 +249,7 @@ "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-62", "imagePullPolicy": "Always", "volumeMounts": [ @@ -368,7 +364,7 @@ "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-drainer" } }, "spec": { @@ -395,15 +391,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-drainer" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-drainer", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-drainer" } }, "spec": { @@ -491,4 +483,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq62-ssl.json b/amq/amq62-ssl.json index 8bccfa18..d4fdfb3d 100644 --- a/amq/amq62-ssl.json +++ b/amq/amq62-ssl.json @@ -137,7 +137,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -161,7 +161,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -185,7 +185,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -209,7 +209,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -233,7 +233,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -257,7 +257,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -281,7 +281,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -305,7 +305,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -323,7 +323,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}" } @@ -341,7 +341,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -355,14 +355,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", "application": "${APPLICATION_NAME}" } }, @@ -371,7 +367,7 @@ "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-62", "imagePullPolicy": "Always", "volumeMounts": [ @@ -518,4 +514,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq63-basic.json b/amq/amq63-basic.json index c26ce616..b241c23f 100644 --- a/amq/amq63-basic.json +++ b/amq/amq63-basic.json @@ -102,7 +102,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -126,7 +126,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -150,7 +150,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -174,7 +174,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -192,7 +192,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}" } @@ -210,7 +210,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -224,14 +224,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", "application": "${APPLICATION_NAME}" } }, @@ -239,7 +235,7 @@ "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-63", "imagePullPolicy": "Always", "readinessProbe": { @@ -331,4 +327,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq63-persistent-ssl.json b/amq/amq63-persistent-ssl.json index 64ae10e6..09e087f2 100644 --- a/amq/amq63-persistent-ssl.json +++ b/amq/amq63-persistent-ssl.json @@ -151,7 +151,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -175,7 +175,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -199,7 +199,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -223,7 +223,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -247,7 +247,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -271,7 +271,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -295,7 +295,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -319,7 +319,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -337,7 +337,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}" } @@ -355,7 +355,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -369,14 +369,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", "application": "${APPLICATION_NAME}" } }, @@ -385,7 +381,7 @@ "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-63", "imagePullPolicy": "Always", "volumeMounts": [ @@ -551,7 +547,7 @@ "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-drainer" } }, "spec": { @@ -578,15 +574,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-drainer" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-drainer", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-drainer" } }, "spec": { @@ -674,4 +666,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq63-persistent.json b/amq/amq63-persistent.json index f5c0c1e6..3eec639f 100644 --- a/amq/amq63-persistent.json +++ b/amq/amq63-persistent.json @@ -116,7 +116,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -140,7 +140,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -164,7 +164,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -188,7 +188,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -206,7 +206,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}" } @@ -224,7 +224,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -238,14 +238,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", "application": "${APPLICATION_NAME}" } }, @@ -253,7 +249,7 @@ "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-63", "imagePullPolicy": "Always", "volumeMounts": [ @@ -368,7 +364,7 @@ "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-drainer" } }, "spec": { @@ -395,15 +391,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-drainer" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-drainer", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-drainer", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-drainer" } }, "spec": { @@ -491,4 +483,4 @@ } } ] -} +} \ No newline at end of file diff --git a/amq/amq63-ssl.json b/amq/amq63-ssl.json index a664aa86..83c4fb86 100644 --- a/amq/amq63-ssl.json +++ b/amq/amq63-ssl.json @@ -137,7 +137,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -161,7 +161,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -185,7 +185,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -209,7 +209,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -233,7 +233,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -257,7 +257,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -281,7 +281,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -305,7 +305,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -323,7 +323,7 @@ "kind": "DeploymentConfig", "apiVersion": "v1", "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}" } @@ -341,7 +341,7 @@ "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}-amq" + "${APPLICATION_NAME}" ], "from": { "kind": "ImageStreamTag", @@ -355,14 +355,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", "application": "${APPLICATION_NAME}" } }, @@ -371,7 +367,7 @@ "terminationGracePeriodSeconds": 60, "containers": [ { - "name": "${APPLICATION_NAME}-amq", + "name": "${APPLICATION_NAME}", "image": "jboss-amq-63", "imagePullPolicy": "Always", "volumeMounts": [ @@ -518,4 +514,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid65-basic.json b/datagrid/datagrid65-basic.json index dce763ea..070fb145 100644 --- a/datagrid/datagrid65-basic.json +++ b/datagrid/datagrid65-basic.json @@ -122,7 +122,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -146,7 +146,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -170,7 +170,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -236,14 +236,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -369,4 +365,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid65-https.json b/datagrid/datagrid65-https.json index ea278b00..44e0a59b 100644 --- a/datagrid/datagrid65-https.json +++ b/datagrid/datagrid65-https.json @@ -185,7 +185,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -209,7 +209,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -233,7 +233,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -257,7 +257,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -346,14 +346,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -551,4 +547,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid65-mysql-persistent.json b/datagrid/datagrid65-mysql-persistent.json index a934e705..8b2b23e8 100644 --- a/datagrid/datagrid65-mysql-persistent.json +++ b/datagrid/datagrid65-mysql-persistent.json @@ -277,7 +277,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -302,7 +302,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -327,7 +327,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -352,7 +352,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -377,13 +377,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -466,14 +466,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -728,7 +724,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -755,15 +751,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -853,4 +845,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid65-mysql.json b/datagrid/datagrid65-mysql.json index 6931c68f..0df475de 100644 --- a/datagrid/datagrid65-mysql.json +++ b/datagrid/datagrid65-mysql.json @@ -270,7 +270,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -295,7 +295,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -320,7 +320,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -345,7 +345,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -370,13 +370,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -459,14 +459,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -721,7 +717,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -748,15 +744,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -812,4 +804,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid65-postgresql-persistent.json b/datagrid/datagrid65-postgresql-persistent.json index 3d52fa9e..b96b35bf 100644 --- a/datagrid/datagrid65-postgresql-persistent.json +++ b/datagrid/datagrid65-postgresql-persistent.json @@ -259,7 +259,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -284,7 +284,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -309,7 +309,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -333,7 +333,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -357,13 +357,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -446,14 +446,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -708,7 +704,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -735,15 +731,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -825,4 +817,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid65-postgresql.json b/datagrid/datagrid65-postgresql.json index bc6e7b17..c99ee5c7 100644 --- a/datagrid/datagrid65-postgresql.json +++ b/datagrid/datagrid65-postgresql.json @@ -252,7 +252,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -277,7 +277,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -302,7 +302,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -326,7 +326,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -350,13 +350,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -439,14 +439,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -701,7 +697,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -728,15 +724,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -784,4 +776,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid71-basic.json b/datagrid/datagrid71-basic.json index 8fa90b49..c40cb68c 100644 --- a/datagrid/datagrid71-basic.json +++ b/datagrid/datagrid71-basic.json @@ -122,7 +122,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -146,7 +146,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -170,7 +170,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -236,14 +236,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -369,4 +365,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid71-https.json b/datagrid/datagrid71-https.json index afa35373..e94d47e7 100644 --- a/datagrid/datagrid71-https.json +++ b/datagrid/datagrid71-https.json @@ -185,7 +185,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -209,7 +209,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -233,7 +233,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -257,7 +257,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -346,14 +346,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -551,4 +547,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid71-mysql-persistent.json b/datagrid/datagrid71-mysql-persistent.json index cb1c0040..c14a9011 100644 --- a/datagrid/datagrid71-mysql-persistent.json +++ b/datagrid/datagrid71-mysql-persistent.json @@ -277,7 +277,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -302,7 +302,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -327,7 +327,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -352,7 +352,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -377,13 +377,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -466,14 +466,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -728,7 +724,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -755,15 +751,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -853,4 +845,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid71-mysql.json b/datagrid/datagrid71-mysql.json index 307ac2c3..3e42f1a7 100644 --- a/datagrid/datagrid71-mysql.json +++ b/datagrid/datagrid71-mysql.json @@ -270,7 +270,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -295,7 +295,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -320,7 +320,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -345,7 +345,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -370,13 +370,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -459,14 +459,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -721,7 +717,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -748,15 +744,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -812,4 +804,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid71-postgresql-persistent.json b/datagrid/datagrid71-postgresql-persistent.json index 96045f47..ac2c52fa 100644 --- a/datagrid/datagrid71-postgresql-persistent.json +++ b/datagrid/datagrid71-postgresql-persistent.json @@ -259,7 +259,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -284,7 +284,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -309,7 +309,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -333,7 +333,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -357,13 +357,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -446,14 +446,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -708,7 +704,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -735,15 +731,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -825,4 +817,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datagrid/datagrid71-postgresql.json b/datagrid/datagrid71-postgresql.json index 47f48f65..bc50135e 100644 --- a/datagrid/datagrid71-postgresql.json +++ b/datagrid/datagrid71-postgresql.json @@ -252,7 +252,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -277,7 +277,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -302,7 +302,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -326,7 +326,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -350,13 +350,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -439,14 +439,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -701,7 +697,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -728,15 +724,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { diff --git a/datavirt/datavirt63-basic-s2i.json b/datavirt/datavirt63-basic-s2i.json index 13903526..11a781a2 100644 --- a/datavirt/datavirt63-basic-s2i.json +++ b/datavirt/datavirt63-basic-s2i.json @@ -181,7 +181,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -359,14 +359,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -487,4 +483,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datavirt/datavirt63-extensions-support-s2i.json b/datavirt/datavirt63-extensions-support-s2i.json index be3916fd..b0be6860 100644 --- a/datavirt/datavirt63-extensions-support-s2i.json +++ b/datavirt/datavirt63-extensions-support-s2i.json @@ -301,7 +301,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -611,14 +611,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -837,4 +833,4 @@ } } ] -} +} \ No newline at end of file diff --git a/datavirt/datavirt63-secure-s2i.json b/datavirt/datavirt63-secure-s2i.json index 5fde056c..f9df50a9 100644 --- a/datavirt/datavirt63-secure-s2i.json +++ b/datavirt/datavirt63-secure-s2i.json @@ -414,7 +414,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -644,14 +644,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -957,4 +953,4 @@ } } ] -} +} \ No newline at end of file diff --git a/decisionserver/decisionserver64-amq-s2i.json b/decisionserver/decisionserver64-amq-s2i.json index e957c16d..52fa8e77 100644 --- a/decisionserver/decisionserver64-amq-s2i.json +++ b/decisionserver/decisionserver64-amq-s2i.json @@ -237,7 +237,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -262,7 +262,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -287,13 +287,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}-amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -457,14 +457,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -608,7 +604,7 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -635,15 +631,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -745,4 +737,4 @@ } } ] -} +} \ No newline at end of file diff --git a/decisionserver/decisionserver64-basic-s2i.json b/decisionserver/decisionserver64-basic-s2i.json index ae857e96..5fba6743 100644 --- a/decisionserver/decisionserver64-basic-s2i.json +++ b/decisionserver/decisionserver64-basic-s2i.json @@ -145,7 +145,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -292,14 +292,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -373,4 +369,4 @@ } } ] -} +} \ No newline at end of file diff --git a/decisionserver/decisionserver64-https-s2i.json b/decisionserver/decisionserver64-https-s2i.json index 97bb028a..f67ea95d 100644 --- a/decisionserver/decisionserver64-https-s2i.json +++ b/decisionserver/decisionserver64-https-s2i.json @@ -194,7 +194,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -218,7 +218,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -388,14 +388,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -514,4 +510,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-amq-persistent-s2i.json b/eap/eap64-amq-persistent-s2i.json index 5e1ce234..009063ce 100644 --- a/eap/eap64-amq-persistent-s2i.json +++ b/eap/eap64-amq-persistent-s2i.json @@ -272,7 +272,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -297,7 +297,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -322,13 +322,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}-amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -488,14 +488,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -679,7 +675,7 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -709,15 +705,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -869,4 +861,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-amq-s2i.json b/eap/eap64-amq-s2i.json index 8b44eaf6..8ecccda1 100644 --- a/eap/eap64-amq-s2i.json +++ b/eap/eap64-amq-s2i.json @@ -258,7 +258,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -283,7 +283,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -308,13 +308,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}-amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -474,14 +474,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -665,7 +661,7 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -692,15 +688,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -814,4 +806,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-basic-s2i.json b/eap/eap64-basic-s2i.json index 96263f8c..13e601f4 100644 --- a/eap/eap64-basic-s2i.json +++ b/eap/eap64-basic-s2i.json @@ -138,7 +138,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -281,14 +281,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -375,4 +371,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-https-s2i.json b/eap/eap64-https-s2i.json index 6d5de69a..d9a57707 100644 --- a/eap/eap64-https-s2i.json +++ b/eap/eap64-https-s2i.json @@ -215,7 +215,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -239,7 +239,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -405,14 +405,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -571,4 +567,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-mongodb-persistent-s2i.json b/eap/eap64-mongodb-persistent-s2i.json index d9dceb76..5eccb116 100644 --- a/eap/eap64-mongodb-persistent-s2i.json +++ b/eap/eap64-mongodb-persistent-s2i.json @@ -303,7 +303,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -328,7 +328,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -353,13 +353,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}-mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" }, "annotations": { "description": "The database server's port." @@ -519,14 +519,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -726,7 +722,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -753,15 +749,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -848,4 +840,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-mongodb-s2i.json b/eap/eap64-mongodb-s2i.json index 9e5d038f..49bf96b0 100644 --- a/eap/eap64-mongodb-s2i.json +++ b/eap/eap64-mongodb-s2i.json @@ -296,7 +296,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -321,7 +321,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -346,13 +346,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}-mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" }, "annotations": { "description": "The database server's port." @@ -512,14 +512,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -719,7 +715,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -746,15 +742,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -807,4 +799,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-mysql-persistent-s2i.json b/eap/eap64-mysql-persistent-s2i.json index 0a89cba5..aff00f07 100644 --- a/eap/eap64-mysql-persistent-s2i.json +++ b/eap/eap64-mysql-persistent-s2i.json @@ -307,7 +307,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -332,7 +332,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -357,13 +357,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -523,14 +523,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -734,7 +730,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -761,15 +757,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -860,4 +852,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-mysql-s2i.json b/eap/eap64-mysql-s2i.json index 9600cef9..cdf4ee35 100644 --- a/eap/eap64-mysql-s2i.json +++ b/eap/eap64-mysql-s2i.json @@ -300,7 +300,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -325,7 +325,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -350,13 +350,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -516,14 +516,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -727,7 +723,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -754,15 +750,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -819,4 +811,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-postgresql-persistent-s2i.json b/eap/eap64-postgresql-persistent-s2i.json index b3265b8a..40e169f0 100644 --- a/eap/eap64-postgresql-persistent-s2i.json +++ b/eap/eap64-postgresql-persistent-s2i.json @@ -289,7 +289,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -314,7 +314,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -339,13 +339,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -505,14 +505,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -716,7 +712,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -743,15 +739,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -834,4 +826,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-postgresql-s2i.json b/eap/eap64-postgresql-s2i.json index cd84b892..f6de1fec 100644 --- a/eap/eap64-postgresql-s2i.json +++ b/eap/eap64-postgresql-s2i.json @@ -282,7 +282,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -307,7 +307,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -332,13 +332,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -498,14 +498,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -709,7 +705,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -736,15 +732,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -793,4 +785,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap64-sso-s2i.json b/eap/eap64-sso-s2i.json index 4c27c28d..12de6d1b 100644 --- a/eap/eap64-sso-s2i.json +++ b/eap/eap64-sso-s2i.json @@ -343,7 +343,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -367,7 +367,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -537,14 +537,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -809,4 +805,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 33d50d29..b9319a9f 100644 --- a/eap/eap64-third-party-db-s2i.json +++ b/eap/eap64-third-party-db-s2i.json @@ -243,7 +243,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -267,7 +267,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -462,14 +462,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -643,4 +639,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-amq-persistent-s2i.json b/eap/eap70-amq-persistent-s2i.json index 97d3498d..d0398577 100644 --- a/eap/eap70-amq-persistent-s2i.json +++ b/eap/eap70-amq-persistent-s2i.json @@ -272,7 +272,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -297,7 +297,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -322,13 +322,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}-amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -488,14 +488,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -679,7 +675,7 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -709,15 +705,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -869,4 +861,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-amq-s2i.json b/eap/eap70-amq-s2i.json index d21dfe0c..c1e5eeeb 100644 --- a/eap/eap70-amq-s2i.json +++ b/eap/eap70-amq-s2i.json @@ -258,7 +258,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -283,7 +283,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -308,13 +308,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}-amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -474,14 +474,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -665,7 +661,7 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -692,15 +688,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -814,4 +806,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-basic-s2i.json b/eap/eap70-basic-s2i.json index 14b7389b..6513bdfa 100644 --- a/eap/eap70-basic-s2i.json +++ b/eap/eap70-basic-s2i.json @@ -138,7 +138,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -281,14 +281,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -375,4 +371,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-https-s2i.json b/eap/eap70-https-s2i.json index 7f51c699..1839e4c7 100644 --- a/eap/eap70-https-s2i.json +++ b/eap/eap70-https-s2i.json @@ -215,7 +215,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -239,7 +239,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -405,14 +405,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -571,4 +567,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-mongodb-persistent-s2i.json b/eap/eap70-mongodb-persistent-s2i.json index 495e0b3f..69693b42 100644 --- a/eap/eap70-mongodb-persistent-s2i.json +++ b/eap/eap70-mongodb-persistent-s2i.json @@ -303,7 +303,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -328,7 +328,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -353,13 +353,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}-mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" }, "annotations": { "description": "The database server's port." @@ -519,14 +519,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -726,7 +722,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -753,15 +749,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -848,4 +840,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-mongodb-s2i.json b/eap/eap70-mongodb-s2i.json index de8623da..055dc160 100644 --- a/eap/eap70-mongodb-s2i.json +++ b/eap/eap70-mongodb-s2i.json @@ -296,7 +296,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -321,7 +321,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -346,13 +346,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}-mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" }, "annotations": { "description": "The database server's port." @@ -512,14 +512,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -719,7 +715,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -746,15 +742,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -807,4 +799,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-mysql-persistent-s2i.json b/eap/eap70-mysql-persistent-s2i.json index 99872d02..17c5178f 100644 --- a/eap/eap70-mysql-persistent-s2i.json +++ b/eap/eap70-mysql-persistent-s2i.json @@ -307,7 +307,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -332,7 +332,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -357,13 +357,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -523,14 +523,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -738,7 +734,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -765,15 +761,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -864,4 +856,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-mysql-s2i.json b/eap/eap70-mysql-s2i.json index 11dd4fe3..61b3431c 100644 --- a/eap/eap70-mysql-s2i.json +++ b/eap/eap70-mysql-s2i.json @@ -300,7 +300,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -325,7 +325,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -350,13 +350,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -516,14 +516,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -731,7 +727,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -758,15 +754,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -823,4 +815,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-postgresql-persistent-s2i.json b/eap/eap70-postgresql-persistent-s2i.json index 064b0880..1d3d0ce1 100644 --- a/eap/eap70-postgresql-persistent-s2i.json +++ b/eap/eap70-postgresql-persistent-s2i.json @@ -289,7 +289,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -314,7 +314,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -339,13 +339,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -505,14 +505,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -720,7 +716,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -747,15 +743,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -838,4 +830,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-postgresql-s2i.json b/eap/eap70-postgresql-s2i.json index 3d17f2aa..66865737 100644 --- a/eap/eap70-postgresql-s2i.json +++ b/eap/eap70-postgresql-s2i.json @@ -282,7 +282,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -307,7 +307,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -332,13 +332,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -498,14 +498,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -713,7 +709,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -740,15 +736,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -797,4 +789,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap70-sso-s2i.json b/eap/eap70-sso-s2i.json index 3b2a9ed5..63a9a77d 100644 --- a/eap/eap70-sso-s2i.json +++ b/eap/eap70-sso-s2i.json @@ -343,7 +343,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -367,7 +367,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -537,14 +537,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -809,4 +805,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 cea981a5..da9e0baf 100644 --- a/eap/eap70-third-party-db-s2i.json +++ b/eap/eap70-third-party-db-s2i.json @@ -243,7 +243,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -267,7 +267,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -462,14 +462,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, diff --git a/eap/eap71-amq-persistent-s2i.json b/eap/eap71-amq-persistent-s2i.json index 7de7b556..6d6bcdd5 100644 --- a/eap/eap71-amq-persistent-s2i.json +++ b/eap/eap71-amq-persistent-s2i.json @@ -272,7 +272,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -297,7 +297,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -322,13 +322,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}-amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -488,14 +488,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -679,7 +675,7 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -709,15 +705,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -869,4 +861,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-amq-s2i.json b/eap/eap71-amq-s2i.json index 4fd3ac60..fb7b65d8 100644 --- a/eap/eap71-amq-s2i.json +++ b/eap/eap71-amq-s2i.json @@ -258,7 +258,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -283,7 +283,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -308,13 +308,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}-amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -474,14 +474,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -665,7 +661,7 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -692,15 +688,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -814,4 +806,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-basic-s2i.json b/eap/eap71-basic-s2i.json index 50809df7..9c3b2bbf 100644 --- a/eap/eap71-basic-s2i.json +++ b/eap/eap71-basic-s2i.json @@ -138,7 +138,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -281,14 +281,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -375,4 +371,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-https-s2i.json b/eap/eap71-https-s2i.json index 389f4d06..d6667dbe 100644 --- a/eap/eap71-https-s2i.json +++ b/eap/eap71-https-s2i.json @@ -215,7 +215,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -239,7 +239,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -405,14 +405,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -571,4 +567,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-mongodb-persistent-s2i.json b/eap/eap71-mongodb-persistent-s2i.json index 8e9c2bdd..c58bacc0 100644 --- a/eap/eap71-mongodb-persistent-s2i.json +++ b/eap/eap71-mongodb-persistent-s2i.json @@ -303,7 +303,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -328,7 +328,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -353,13 +353,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}-mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" }, "annotations": { "description": "The database server's port." @@ -519,14 +519,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -726,7 +722,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -753,15 +749,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -848,4 +840,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-mongodb-s2i.json b/eap/eap71-mongodb-s2i.json index 27a4be77..13f91556 100644 --- a/eap/eap71-mongodb-s2i.json +++ b/eap/eap71-mongodb-s2i.json @@ -296,7 +296,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -321,7 +321,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -346,13 +346,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}-mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" }, "annotations": { "description": "The database server's port." @@ -512,14 +512,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -719,7 +715,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -746,15 +742,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -807,4 +799,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-mysql-persistent-s2i.json b/eap/eap71-mysql-persistent-s2i.json index 0adaf5a4..433fcf8d 100644 --- a/eap/eap71-mysql-persistent-s2i.json +++ b/eap/eap71-mysql-persistent-s2i.json @@ -307,7 +307,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -332,7 +332,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -357,13 +357,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -523,14 +523,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -738,7 +734,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -765,15 +761,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -864,4 +856,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-mysql-s2i.json b/eap/eap71-mysql-s2i.json index b838ab1f..b4536ff9 100644 --- a/eap/eap71-mysql-s2i.json +++ b/eap/eap71-mysql-s2i.json @@ -300,7 +300,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -325,7 +325,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -350,13 +350,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -516,14 +516,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -731,7 +727,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -758,15 +754,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -823,4 +815,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-postgresql-persistent-s2i.json b/eap/eap71-postgresql-persistent-s2i.json index a720c2b6..ead5f026 100644 --- a/eap/eap71-postgresql-persistent-s2i.json +++ b/eap/eap71-postgresql-persistent-s2i.json @@ -289,7 +289,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -314,7 +314,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -339,13 +339,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -505,14 +505,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -720,7 +716,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -747,15 +743,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -838,4 +830,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-postgresql-s2i.json b/eap/eap71-postgresql-s2i.json index 9679eb25..42cddac4 100644 --- a/eap/eap71-postgresql-s2i.json +++ b/eap/eap71-postgresql-s2i.json @@ -282,7 +282,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -307,7 +307,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -332,13 +332,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -498,14 +498,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -713,7 +709,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -740,15 +736,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -797,4 +789,4 @@ } } ] -} +} \ No newline at end of file diff --git a/eap/eap71-sso-s2i.json b/eap/eap71-sso-s2i.json index b51ac5ed..43385c91 100644 --- a/eap/eap71-sso-s2i.json +++ b/eap/eap71-sso-s2i.json @@ -343,7 +343,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -367,7 +367,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -537,14 +537,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -809,4 +805,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 213dd12d..24e4c6d1 100644 --- a/eap/eap71-third-party-db-s2i.json +++ b/eap/eap71-third-party-db-s2i.json @@ -243,7 +243,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -267,7 +267,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -462,14 +462,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -643,4 +639,4 @@ } } ] -} +} \ No newline at end of file diff --git a/openjdk/openjdk18-web-basic-s2i.json b/openjdk/openjdk18-web-basic-s2i.json index 75187d70..6cb25e23 100644 --- a/openjdk/openjdk18-web-basic-s2i.json +++ b/openjdk/openjdk18-web-basic-s2i.json @@ -88,7 +88,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -221,14 +221,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -265,4 +261,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 3be61cc2..79362678 100644 --- a/processserver/processserver64-amq-mysql-persistent-s2i.json +++ b/processserver/processserver64-amq-mysql-persistent-s2i.json @@ -364,7 +364,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -389,7 +389,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -414,13 +414,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -438,13 +438,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}-amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -608,14 +608,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -847,7 +843,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -874,15 +870,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -978,7 +970,7 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -1005,15 +997,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -1153,4 +1141,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-amq-mysql-s2i.json b/processserver/processserver64-amq-mysql-s2i.json index 53e777aa..43931d4b 100644 --- a/processserver/processserver64-amq-mysql-s2i.json +++ b/processserver/processserver64-amq-mysql-s2i.json @@ -350,7 +350,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -375,7 +375,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -400,13 +400,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -424,13 +424,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}-amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -594,14 +594,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -797,7 +793,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -824,15 +820,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -894,7 +886,7 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -921,15 +913,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { diff --git a/processserver/processserver64-amq-postgresql-persistent-s2i.json b/processserver/processserver64-amq-postgresql-persistent-s2i.json index c8a3814a..462da330 100644 --- a/processserver/processserver64-amq-postgresql-persistent-s2i.json +++ b/processserver/processserver64-amq-postgresql-persistent-s2i.json @@ -346,7 +346,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -371,7 +371,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -396,13 +396,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -420,13 +420,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}-amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -590,14 +590,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -829,7 +825,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -856,15 +852,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -948,7 +940,7 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -975,15 +967,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -1123,4 +1111,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-amq-postgresql-s2i.json b/processserver/processserver64-amq-postgresql-s2i.json index e70730fe..cdba6576 100644 --- a/processserver/processserver64-amq-postgresql-s2i.json +++ b/processserver/processserver64-amq-postgresql-s2i.json @@ -332,7 +332,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -357,7 +357,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -382,13 +382,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -406,13 +406,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" + "application": "${APPLICATION_NAME}-amq" } }, "metadata": { "name": "${APPLICATION_NAME}-amq-tcp", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" }, "annotations": { "description": "The broker's OpenWire port." @@ -576,14 +576,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -779,7 +775,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -806,15 +802,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -864,7 +856,7 @@ "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -891,15 +883,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-amq" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-amq", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-amq", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-amq" } }, "spec": { @@ -1001,4 +989,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-basic-s2i.json b/processserver/processserver64-basic-s2i.json index 81e0c2e9..de68e7dd 100644 --- a/processserver/processserver64-basic-s2i.json +++ b/processserver/processserver64-basic-s2i.json @@ -152,7 +152,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -299,14 +299,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -380,4 +376,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-mysql-persistent-s2i.json b/processserver/processserver64-mysql-persistent-s2i.json index 0e1b8c82..9325af91 100644 --- a/processserver/processserver64-mysql-persistent-s2i.json +++ b/processserver/processserver64-mysql-persistent-s2i.json @@ -300,7 +300,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -325,7 +325,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -350,13 +350,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -520,14 +520,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -731,7 +727,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -758,15 +754,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -857,4 +849,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-mysql-s2i.json b/processserver/processserver64-mysql-s2i.json index 83474d98..716f4f97 100644 --- a/processserver/processserver64-mysql-s2i.json +++ b/processserver/processserver64-mysql-s2i.json @@ -293,7 +293,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -318,7 +318,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -343,7 +343,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { @@ -513,14 +513,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -688,7 +684,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -715,15 +711,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -780,4 +772,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-postgresql-persistent-s2i.json b/processserver/processserver64-postgresql-persistent-s2i.json index a13daed9..ad866a9f 100644 --- a/processserver/processserver64-postgresql-persistent-s2i.json +++ b/processserver/processserver64-postgresql-persistent-s2i.json @@ -282,7 +282,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -307,7 +307,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -332,13 +332,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -502,14 +502,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -713,7 +709,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -740,15 +736,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -827,4 +819,4 @@ } } ] -} +} \ No newline at end of file diff --git a/processserver/processserver64-postgresql-s2i.json b/processserver/processserver64-postgresql-s2i.json index 79af50ab..8792f1f9 100644 --- a/processserver/processserver64-postgresql-s2i.json +++ b/processserver/processserver64-postgresql-s2i.json @@ -275,7 +275,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -300,7 +300,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -325,13 +325,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -495,14 +495,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -670,7 +666,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -697,14 +693,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", "application": "${APPLICATION_NAME}" } }, @@ -750,4 +742,4 @@ } } ] -} +} \ No newline at end of file diff --git a/sso/sso71-https.json b/sso/sso71-https.json index e5b74cb4..91cf3946 100644 --- a/sso/sso71-https.json +++ b/sso/sso71-https.json @@ -212,7 +212,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -236,7 +236,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -325,14 +325,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -541,4 +537,4 @@ } } ] -} +} \ No newline at end of file diff --git a/sso/sso71-mysql-persistent.json b/sso/sso71-mysql-persistent.json index 8ca75ac1..9e756ab2 100644 --- a/sso/sso71-mysql-persistent.json +++ b/sso/sso71-mysql-persistent.json @@ -286,7 +286,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -311,7 +311,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -336,13 +336,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -425,14 +425,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -670,7 +666,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -697,15 +693,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -796,4 +788,4 @@ } } ] -} +} \ No newline at end of file diff --git a/sso/sso71-mysql.json b/sso/sso71-mysql.json index 90fb7f6d..39f7b492 100644 --- a/sso/sso71-mysql.json +++ b/sso/sso71-mysql.json @@ -279,7 +279,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -305,7 +305,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -331,13 +331,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}", + "application": "${APPLICATION_NAME}-mysql", "component": "database" }, "annotations": { @@ -424,14 +424,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}", "component": "server" } @@ -670,7 +666,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}", + "application": "${APPLICATION_NAME}-mysql", "component": "database" } }, @@ -698,15 +694,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}", + "application": "${APPLICATION_NAME}-mysql", "component": "database" } }, @@ -764,4 +756,4 @@ } } ] -} +} \ No newline at end of file diff --git a/sso/sso71-postgresql-persistent.json b/sso/sso71-postgresql-persistent.json index c624e818..f7fa28c1 100644 --- a/sso/sso71-postgresql-persistent.json +++ b/sso/sso71-postgresql-persistent.json @@ -268,7 +268,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -293,7 +293,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -318,13 +318,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -407,14 +407,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -652,7 +648,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -679,15 +675,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -770,4 +762,4 @@ } } ] -} +} \ No newline at end of file diff --git a/sso/sso71-postgresql.json b/sso/sso71-postgresql.json index f4ac1006..d75141b1 100644 --- a/sso/sso71-postgresql.json +++ b/sso/sso71-postgresql.json @@ -261,7 +261,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -287,7 +287,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -313,13 +313,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}", + "application": "${APPLICATION_NAME}-postgresql", "component": "database" }, "annotations": { @@ -406,14 +406,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}", "component": "server" } @@ -652,7 +648,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}", + "application": "${APPLICATION_NAME}-postgresql", "component": "database" } }, @@ -680,15 +676,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}", + "application": "${APPLICATION_NAME}-postgresql", "component": "database" } }, @@ -738,4 +730,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat7-basic-s2i.json b/webserver/jws31-tomcat7-basic-s2i.json index 945b6c03..23905f85 100644 --- a/webserver/jws31-tomcat7-basic-s2i.json +++ b/webserver/jws31-tomcat7-basic-s2i.json @@ -117,7 +117,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -260,14 +260,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -316,4 +312,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat7-https-s2i.json b/webserver/jws31-tomcat7-https-s2i.json index 0fcac08a..8c237fd3 100644 --- a/webserver/jws31-tomcat7-https-s2i.json +++ b/webserver/jws31-tomcat7-https-s2i.json @@ -152,7 +152,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -176,7 +176,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -342,14 +342,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -435,4 +431,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 b0522d6d..94aca73c 100644 --- a/webserver/jws31-tomcat7-mongodb-persistent-s2i.json +++ b/webserver/jws31-tomcat7-mongodb-persistent-s2i.json @@ -240,7 +240,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -265,7 +265,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -290,13 +290,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}-mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" }, "annotations": { "description": "The database server's port." @@ -456,14 +456,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -617,15 +613,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -712,4 +704,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat7-mongodb-s2i.json b/webserver/jws31-tomcat7-mongodb-s2i.json index 86ddb907..e586a1dc 100644 --- a/webserver/jws31-tomcat7-mongodb-s2i.json +++ b/webserver/jws31-tomcat7-mongodb-s2i.json @@ -233,7 +233,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -258,7 +258,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -283,13 +283,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}-mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" }, "annotations": { "description": "The database server's port." @@ -449,14 +449,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -583,7 +579,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -610,15 +606,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -671,4 +663,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 63534c9d..1c274a16 100644 --- a/webserver/jws31-tomcat7-mysql-persistent-s2i.json +++ b/webserver/jws31-tomcat7-mysql-persistent-s2i.json @@ -244,7 +244,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -269,7 +269,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -294,7 +294,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { @@ -460,14 +460,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -590,7 +586,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -617,15 +613,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -715,4 +707,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat7-mysql-s2i.json b/webserver/jws31-tomcat7-mysql-s2i.json index 358bf473..7536bb4b 100644 --- a/webserver/jws31-tomcat7-mysql-s2i.json +++ b/webserver/jws31-tomcat7-mysql-s2i.json @@ -237,7 +237,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -262,7 +262,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -287,13 +287,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -453,14 +453,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -583,7 +579,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -610,15 +606,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -674,4 +666,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 54525494..0d8d30c6 100644 --- a/webserver/jws31-tomcat7-postgresql-persistent-s2i.json +++ b/webserver/jws31-tomcat7-postgresql-persistent-s2i.json @@ -226,7 +226,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -251,7 +251,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -276,13 +276,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -442,14 +442,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -572,7 +568,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -599,15 +595,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -689,4 +681,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat7-postgresql-s2i.json b/webserver/jws31-tomcat7-postgresql-s2i.json index 0eb09204..76368cc5 100644 --- a/webserver/jws31-tomcat7-postgresql-s2i.json +++ b/webserver/jws31-tomcat7-postgresql-s2i.json @@ -219,7 +219,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -244,7 +244,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -269,13 +269,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -435,14 +435,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -565,7 +561,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -592,15 +588,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -648,4 +640,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat8-basic-s2i.json b/webserver/jws31-tomcat8-basic-s2i.json index 0d6081ee..c1d4c35a 100644 --- a/webserver/jws31-tomcat8-basic-s2i.json +++ b/webserver/jws31-tomcat8-basic-s2i.json @@ -117,7 +117,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -260,14 +260,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -316,4 +312,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat8-https-s2i.json b/webserver/jws31-tomcat8-https-s2i.json index 184036a8..be3fd058 100644 --- a/webserver/jws31-tomcat8-https-s2i.json +++ b/webserver/jws31-tomcat8-https-s2i.json @@ -152,7 +152,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -176,7 +176,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -342,14 +342,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -435,4 +431,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 aae2cb2a..6365de4c 100644 --- a/webserver/jws31-tomcat8-mongodb-persistent-s2i.json +++ b/webserver/jws31-tomcat8-mongodb-persistent-s2i.json @@ -240,7 +240,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -265,7 +265,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -290,13 +290,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}-mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" }, "annotations": { "description": "The database server's port." @@ -456,14 +456,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -590,7 +586,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -617,15 +613,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -712,4 +704,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat8-mongodb-s2i.json b/webserver/jws31-tomcat8-mongodb-s2i.json index bd3aa8a7..6bfaccd4 100644 --- a/webserver/jws31-tomcat8-mongodb-s2i.json +++ b/webserver/jws31-tomcat8-mongodb-s2i.json @@ -233,7 +233,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -258,7 +258,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -283,13 +283,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" + "application": "${APPLICATION_NAME}-mongodb" } }, "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" }, "annotations": { "description": "The database server's port." @@ -449,14 +449,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -583,7 +579,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -610,15 +606,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mongodb", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mongodb", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mongodb" } }, "spec": { @@ -671,4 +663,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 5a7c6c9d..466c52ea 100644 --- a/webserver/jws31-tomcat8-mysql-persistent-s2i.json +++ b/webserver/jws31-tomcat8-mysql-persistent-s2i.json @@ -244,7 +244,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -269,7 +269,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -294,13 +294,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -460,14 +460,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -590,7 +586,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -617,15 +613,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -715,4 +707,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat8-mysql-s2i.json b/webserver/jws31-tomcat8-mysql-s2i.json index c4fbe23b..9ac96a83 100644 --- a/webserver/jws31-tomcat8-mysql-s2i.json +++ b/webserver/jws31-tomcat8-mysql-s2i.json @@ -237,7 +237,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -262,7 +262,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -287,13 +287,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" + "application": "${APPLICATION_NAME}-mysql" } }, "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" }, "annotations": { "description": "The database server's port." @@ -453,14 +453,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -583,7 +579,7 @@ "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -610,15 +606,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-mysql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-mysql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-mysql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-mysql" } }, "spec": { @@ -674,4 +666,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 3a9a5407..25a1f092 100644 --- a/webserver/jws31-tomcat8-postgresql-persistent-s2i.json +++ b/webserver/jws31-tomcat8-postgresql-persistent-s2i.json @@ -226,7 +226,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -251,7 +251,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -276,13 +276,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresq" }, "annotations": { "description": "The database server's port." @@ -442,14 +442,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -572,7 +568,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresq" } }, "spec": { @@ -599,15 +595,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -689,4 +681,4 @@ } } ] -} +} \ No newline at end of file diff --git a/webserver/jws31-tomcat8-postgresql-s2i.json b/webserver/jws31-tomcat8-postgresql-s2i.json index 2dc1115e..d4d9b566 100644 --- a/webserver/jws31-tomcat8-postgresql-s2i.json +++ b/webserver/jws31-tomcat8-postgresql-s2i.json @@ -219,7 +219,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -244,7 +244,7 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}" } }, "metadata": { @@ -269,13 +269,13 @@ } ], "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" + "application": "${APPLICATION_NAME}-postgresql" } }, "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" }, "annotations": { "description": "The database server's port." @@ -435,14 +435,10 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}", "labels": { - "deploymentConfig": "${APPLICATION_NAME}", "application": "${APPLICATION_NAME}" } }, @@ -564,7 +560,7 @@ "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -591,15 +587,11 @@ } ], "replicas": 1, - "selector": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, "template": { "metadata": { "name": "${APPLICATION_NAME}-postgresql", "labels": { - "deploymentConfig": "${APPLICATION_NAME}-postgresql", - "application": "${APPLICATION_NAME}" + "application": "${APPLICATION_NAME}-postgresql" } }, "spec": { @@ -646,4 +638,4 @@ } } ] -} +} \ No newline at end of file