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 Sep 1, 2017
1 parent d45b0d0 commit 5059e86
Show file tree
Hide file tree
Showing 126 changed files with 838 additions and 1,718 deletions.
26 changes: 11 additions & 15 deletions amq/amq62-basic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}-amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-amqp",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-amq"
},
"annotations": {
"description": "The broker's AMQP port."
Expand All @@ -126,13 +126,13 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}-amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-mqtt",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-amq"
},
"annotations": {
"description": "The broker's MQTT port."
Expand All @@ -150,13 +150,13 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}-amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-stomp",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-amq"
},
"annotations": {
"description": "The broker's STOMP port."
Expand All @@ -174,13 +174,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.",
Expand All @@ -194,7 +194,7 @@
"metadata": {
"name": "${APPLICATION_NAME}-amq",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-amq"
}
},
"spec": {
Expand Down Expand Up @@ -224,15 +224,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": {
Expand Down Expand Up @@ -331,4 +327,4 @@
}
}
]
}
}
50 changes: 21 additions & 29 deletions amq/amq62-persistent-ssl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,13 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}-amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-amqp",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-amq"
},
"annotations": {
"description": "The broker's AMQP port."
Expand All @@ -175,13 +175,13 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}-amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-amqp-ssl",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-amq"
},
"annotations": {
"description": "The broker's AMQP SSL port."
Expand All @@ -199,13 +199,13 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}-amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-mqtt",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-amq"
},
"annotations": {
"description": "The broker's MQTT port."
Expand All @@ -223,13 +223,13 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}-amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-mqtt-ssl",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-amq"
},
"annotations": {
"description": "The broker's MQTT SSL port."
Expand All @@ -247,13 +247,13 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}-amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-stomp",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-amq"
},
"annotations": {
"description": "The broker's STOMP port."
Expand All @@ -271,13 +271,13 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}-amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-stomp-ssl",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-amq"
},
"annotations": {
"description": "The broker's STOMP SSL port."
Expand All @@ -295,13 +295,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."
Expand All @@ -319,13 +319,13 @@
}
],
"selector": {
"deploymentConfig": "${APPLICATION_NAME}-amq"
"application": "${APPLICATION_NAME}-amq"
}
},
"metadata": {
"name": "${APPLICATION_NAME}-amq-tcp-ssl",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-amq"
},
"annotations": {
"description": "The broker's OpenWire (SSL) port.",
Expand All @@ -339,7 +339,7 @@
"metadata": {
"name": "${APPLICATION_NAME}-amq",
"labels": {
"application": "${APPLICATION_NAME}"
"application": "${APPLICATION_NAME}-amq"
}
},
"spec": {
Expand Down Expand Up @@ -369,15 +369,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": {
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 @@
}
}
]
}
}
Loading

0 comments on commit 5059e86

Please sign in to comment.