Skip to content

Commit

Permalink
[CLOUD-1167] - Remove deploymentConfig label from all templates
Browse files Browse the repository at this point in the history
  • Loading branch information
@spolti
spolti committed Oct 2, 2017
1 parent 557eba5 commit f874c8e
Show file tree
Hide file tree
Showing 93 changed files with 599 additions and 1,231 deletions.
22 changes: 9 additions & 13 deletions amq/amq62-basic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -126,7 +126,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -150,7 +150,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -174,7 +174,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -192,7 +192,7 @@
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"labels": {
"application": "${APPLICATION_NAME}"
}
Expand All @@ -210,7 +210,7 @@
"imageChangeParams": {
"automatic": true,
"containerNames": [
"${APPLICATION_NAME}-amq"
"${APPLICATION_NAME}"
],
"from": {
"kind": "ImageStreamTag",
Expand All @@ -224,22 +224,18 @@
}
],
"replicas": 1,
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
},
"template": {
"metadata": {
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"labels": {
"deploymentConfig": "${APPLICATION_NAME}-amq",
"application": "${APPLICATION_NAME}"
}
},
"spec": {
"terminationGracePeriodSeconds": 60,
"containers": [
{
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"image": "jboss-amq-62",
"imagePullPolicy": "Always",
"readinessProbe": {
Expand Down Expand Up @@ -331,4 +327,4 @@
}
}
]
}
}
38 changes: 15 additions & 23 deletions amq/amq62-persistent-ssl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -175,7 +175,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -199,7 +199,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -223,7 +223,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -247,7 +247,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -271,7 +271,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -295,7 +295,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -319,7 +319,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -337,7 +337,7 @@
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"labels": {
"application": "${APPLICATION_NAME}"
}
Expand All @@ -355,7 +355,7 @@
"imageChangeParams": {
"automatic": true,
"containerNames": [
"${APPLICATION_NAME}-amq"
"${APPLICATION_NAME}"
],
"from": {
"kind": "ImageStreamTag",
Expand All @@ -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}"
}
},
Expand All @@ -385,7 +381,7 @@
"terminationGracePeriodSeconds": 60,
"containers": [
{
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"image": "jboss-amq-62",
"imagePullPolicy": "Always",
"volumeMounts": [
Expand Down Expand Up @@ -551,7 +547,7 @@
"metadata": {
"name": "${APPLICATION_NAME}-drainer",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-drainer"
}
},
"spec": {
Expand All @@ -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": {
Expand Down Expand Up @@ -674,4 +666,4 @@
}
}
]
}
}
30 changes: 11 additions & 19 deletions amq/amq62-persistent.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -140,7 +140,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -164,7 +164,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -188,7 +188,7 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}"
}
},
"metadata": {
Expand All @@ -206,7 +206,7 @@
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"labels": {
"application": "${APPLICATION_NAME}"
}
Expand All @@ -224,7 +224,7 @@
"imageChangeParams": {
"automatic": true,
"containerNames": [
"${APPLICATION_NAME}-amq"
"${APPLICATION_NAME}"
],
"from": {
"kind": "ImageStreamTag",
Expand All @@ -238,22 +238,18 @@
}
],
"replicas": 1,
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
},
"template": {
"metadata": {
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"labels": {
"deploymentConfig": "${APPLICATION_NAME}-amq",
"application": "${APPLICATION_NAME}"
}
},
"spec": {
"terminationGracePeriodSeconds": 60,
"containers": [
{
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"image": "jboss-amq-62",
"imagePullPolicy": "Always",
"volumeMounts": [
Expand Down Expand Up @@ -368,7 +364,7 @@
"metadata": {
"name": "${APPLICATION_NAME}-drainer",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-drainer"
}
},
"spec": {
Expand All @@ -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": {
Expand Down Expand Up @@ -491,4 +483,4 @@
}
}
]
}
}
Loading

0 comments on commit f874c8e

Please sign in to comment.