openstack/openstack-helm
Code Issues Proposed changes

Update labels exposed for infra components in armada manifest

Browse Source 
This updates the labels in the armada-lma manifest to match the
updated labels in the osh-infra charts

Change-Id: I2b8af2f2eaa5be6bf4e8f592b249b311d07ac5e5
This commit is contained in:
Steve Wilkerson 2018-04-18 14:58:01 -05:00 committed by Pete Birley
parent abb4a9410b
commit 5cb96973be
1 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
tools/deployment/armada/multinode/armada-lma.yaml
View File

@ -176,8 +176,12 @@ data:
prometheus: prometheus:
enabled: true enabled: true
labels: labels:
node_selector_key: openstack-control-plane elasticsearch:
node_selector_value: enabled node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
source: source:
type: local type: local
location: ${OSH_INFRA_PATH} location: ${OSH_INFRA_PATH}
@ -218,6 +222,12 @@ data:
fluentbit: fluentbit:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
node_selector_value: enabled node_selector_value: enabled
prometheus_fluentd_exporter:
node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
source: source:
type: local type: local
location: ${OSH_INFRA_PATH} location: ${OSH_INFRA_PATH}
@ -253,6 +263,9 @@ data:
kibana: kibana:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
node_selector_value: enabled node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
source: source:
type: local type: local
location: ${OSH_INFRA_PATH} location: ${OSH_INFRA_PATH}
@ -276,8 +289,12 @@ data:
no_hooks: false no_hooks: false
values: values:
labels: labels:
node_selector_key: openstack-control-plane prometheus:
node_selector_value: enabled node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
pod: pod:
replicas: replicas:
prometheus: 2 prometheus: 2
@ -304,8 +321,12 @@ data:
no_hooks: false no_hooks: false
values: values:
labels: labels:
node_selector_key: openstack-control-plane kube_state_metrics:
node_selector_value: enabled node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
source: source:
type: local type: local
location: ${OSH_INFRA_PATH} location: ${OSH_INFRA_PATH}
@ -329,8 +350,12 @@ data:
no_hooks: false no_hooks: false
values: values:
labels: labels:
node_selector_key: openstack-control-plane node_exporter:
node_selector_value: enabled node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
source: source:
type: local type: local
location: ${OSH_INFRA_PATH} location: ${OSH_INFRA_PATH}
@ -354,8 +379,12 @@ data:
no_hooks: false no_hooks: false
values: values:
labels: labels:
node_selector_key: openstack-control-plane alertmanager:
node_selector_value: enabled node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
source: source:
type: local type: local
location: ${OSH_INFRA_PATH} location: ${OSH_INFRA_PATH}
@ -398,8 +427,12 @@ data:
admin: admin:
password: ${GRAFANA_ADMIN_PASSWORD} password: ${GRAFANA_ADMIN_PASSWORD}
labels: labels:
node_selector_key: openstack-control-plane grafana:
node_selector_value: enabled node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
source: source:
type: local type: local
location: ${OSH_INFRA_PATH} location: ${OSH_INFRA_PATH}