Skip to content

[CLOUD-1167] - Remove deploymentConfig label from all templates #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spolti wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[CLOUD-1167] - Remove deploymentConfig label from all templates #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 25 additions & 19 deletions amq/amq62-basic.json
View file
Open in desktop
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
Open in desktop
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