rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add toleration and node selector for monitoring

This commit is contained in:
loganhz 2019-08-03 16:24:38 +08:00
parent dde3c3edbc
commit 438265b6b5
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/monitoring/addon/components/enable-monitoring/component.js
View File

@ -31,6 +31,8 @@ const CLUSTER_HIDDEN_KEYS = { 'operator-init.enabled': 'true', }
const PROMETHEUS_TOLERATION = 'prometheus.tolerations' const PROMETHEUS_TOLERATION = 'prometheus.tolerations'
const SCHEDULABLE_COMPONENTS = ['prometheus', 'grafana', 'operator', 'exporter-kube-state']
export default Component.extend(ReservationCheck, CatalogUpgrade, { export default Component.extend(ReservationCheck, CatalogUpgrade, {
scope: service(), scope: service(),
settings: service(), settings: service(),
@ -111,7 +113,7 @@ export default Component.extend(ReservationCheck, CatalogUpgrade, {
answers['prometheus.persistent.useReleaseName'] = 'true'; answers['prometheus.persistent.useReleaseName'] = 'true';
} }
Object.keys(answers).filter((key) => key.startsWith('prometheus.nodeSelectors[') ).forEach((key) => { Object.keys(answers).filter((key) => SCHEDULABLE_COMPONENTS.find((c) => key.startsWith(`${ c }.nodeSelectors[`))).forEach((key) => {
delete answers[key] delete answers[key]
}); });
@ -124,15 +126,17 @@ export default Component.extend(ReservationCheck, CatalogUpgrade, {
} else if (v) { } else if (v) {
s += `="${ get(selector, 'value') }"`; s += `="${ get(selector, 'value') }"`;
} }
answers[`prometheus.nodeSelectors[${ index }]`] = s; SCHEDULABLE_COMPONENTS.forEach((c) => {
answers[`${ c }.nodeSelectors[${ index }]`] = s;
});
}); });
Object.keys(answers).filter((key) => key.startsWith(`${ PROMETHEUS_TOLERATION }[`) ).forEach((key) => { Object.keys(answers).filter((key) => SCHEDULABLE_COMPONENTS.find((c) => key.startsWith(`${ c }.tolerations[`))).forEach((key) => {
delete answers[key] delete answers[key]
}); });
['prometheus'].map((component) => { SCHEDULABLE_COMPONENTS.map((component) => {
(get(this, `${ component }Tolerations`) || []).map((t, index) => { (get(this, `prometheusTolerations`) || []).map((t, index) => {
Object.keys(t).map((key) => { Object.keys(t).map((key) => {
if (t[key]) { if (t[key]) {
answers[`${ component }.tolerations[${ index }].${ key }`] = t[key].toString() answers[`${ component }.tolerations[${ index }].${ key }`] = t[key].toString()
@ -308,8 +312,8 @@ export default Component.extend(ReservationCheck, CatalogUpgrade, {
Object.keys(body || {}).forEach((key) => { Object.keys(body || {}).forEach((key) => {
if ( EXPOSED_OPTIONS.indexOf(key) > -1 || if ( EXPOSED_OPTIONS.indexOf(key) > -1 ||
key.startsWith('prometheus.nodeSelectors[') || SCHEDULABLE_COMPONENTS.find((c) => key.startsWith(`${ c }.nodeSelectors[`)) ||
key.startsWith(PROMETHEUS_TOLERATION) SCHEDULABLE_COMPONENTS.find((c) => key.startsWith(`${ c }.tolerations[`))
) { ) {
answers[key] = body[key]; answers[key] = body[key];
} else if (!Object.keys(CLUSTER_HIDDEN_KEYS).includes(key)) { } else if (!Object.keys(CLUSTER_HIDDEN_KEYS).includes(key)) {