Skip to content

Commit

Permalink
[CLOUD-1167] - Remove deploymentConfig label from all templates
Browse files Browse the repository at this point in the history 
Signed-off-by: Filippe Spolti <[email protected]>
  • Loading branch information
@spolti
spolti committed Nov 13, 2017
1 parent 6c5dfcd commit d7c8ad7
Show file tree
Hide file tree
Showing 94 changed files with 2,590 additions and 2,000 deletions.
44 changes: 25 additions & 19 deletions amq/amq62-basic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,15 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-amqp",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
},
"annotations": {
"description": "The broker's AMQP port."
Expand All @@ -134,13 +136,15 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-mqtt",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
},
"annotations": {
"description": "The broker's MQTT port."
Expand All @@ -158,13 +162,15 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-stomp",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
},
"annotations": {
"description": "The broker's STOMP port."
Expand All @@ -182,13 +188,15 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-tcp",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
},
"annotations": {
"description": "The broker's OpenWire port.",
Expand All @@ -200,9 +208,10 @@
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"spec": {
Expand All @@ -218,7 +227,7 @@
"imageChangeParams": {
"automatic": true,
"containerNames": [
"${APPLICATION_NAME}-amq"
"${APPLICATION_NAME}"
],
"from": {
"kind": "ImageStreamTag",
Expand All @@ -232,22 +241,19 @@
}
],
"replicas": 1,
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
},
"template": {
"metadata": {
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"labels": {
"deploymentConfig": "${APPLICATION_NAME}-amq",
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"spec": {
"terminationGracePeriodSeconds": 60,
"containers": [
{
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"image": "jboss-amq-62",
"imagePullPolicy": "Always",
"readinessProbe": {
Expand Down Expand Up @@ -343,4 +349,4 @@
}
}
]
}
}
81 changes: 47 additions & 34 deletions amq/amq62-persistent-ssl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,15 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-amqp",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
},
"annotations": {
"description": "The broker's AMQP port."
Expand All @@ -187,13 +189,15 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-amqp-ssl",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
},
"annotations": {
"description": "The broker's AMQP SSL port."
Expand All @@ -211,13 +215,15 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-mqtt",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
},
"annotations": {
"description": "The broker's MQTT port."
Expand All @@ -235,13 +241,15 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-mqtt-ssl",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
},
"annotations": {
"description": "The broker's MQTT SSL port."
Expand All @@ -259,13 +267,15 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-stomp",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
},
"annotations": {
"description": "The broker's STOMP port."
Expand All @@ -283,13 +293,15 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-stomp-ssl",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
},
"annotations": {
"description": "The broker's STOMP SSL port."
Expand All @@ -307,13 +319,15 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-tcp",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
},
"annotations": {
"description": "The broker's OpenWire port."
Expand All @@ -331,13 +345,15 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-tcp-ssl",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
},
"annotations": {
"description": "The broker's OpenWire (SSL) port.",
Expand All @@ -349,9 +365,10 @@
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"spec": {
Expand All @@ -367,7 +384,7 @@
"imageChangeParams": {
"automatic": true,
"containerNames": [
"${APPLICATION_NAME}-amq"
"${APPLICATION_NAME}"
],
"from": {
"kind": "ImageStreamTag",
Expand All @@ -381,23 +398,20 @@
}
],
"replicas": 1,
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
},
"template": {
"metadata": {
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"labels": {
"deploymentConfig": "${APPLICATION_NAME}-amq",
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"spec": {
"serviceAccountName": "amq-service-account",
"terminationGracePeriodSeconds": 60,
"containers": [
{
"name": "${APPLICATION_NAME}-amq",
"name": "${APPLICATION_NAME}",
"image": "jboss-amq-62",
"imagePullPolicy": "Always",
"volumeMounts": [
Expand Down Expand Up @@ -567,7 +581,8 @@
"metadata": {
"name": "${APPLICATION_NAME}-drainer",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq-drainer"
}
},
"spec": {
Expand All @@ -594,15 +609,12 @@
}
],
"replicas": 1,
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-drainer"
},
"template": {
"metadata": {
"name": "${APPLICATION_NAME}-drainer",
"labels": {
"deploymentConfig": "${APPLICATION_NAME}-drainer",
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq-drainer"
}
},
"spec": {
Expand Down Expand Up @@ -675,7 +687,8 @@
"metadata": {
"name": "${APPLICATION_NAME}-amq-claim",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}",
"component": "amq"
}
},
"spec": {
Expand All @@ -690,4 +703,4 @@
}
}
]
}
}
Loading

0 comments on commit d7c8ad7

Please sign in to comment.