From 5cb96973be2a5eebf96dd336e8e4654a07407655 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Wed, 18 Apr 2018 14:58:01 -0500
Subject: [PATCH] Update labels exposed for infra components in armada manifest

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

Change-Id: I2b8af2f2eaa5be6bf4e8f592b249b311d07ac5e5
---
 .../armada/multinode/armada-lma.yaml          | 57 +++++++++++++++----
 1 file changed, 45 insertions(+), 12 deletions(-)

diff --git a/tools/deployment/armada/multinode/armada-lma.yaml b/tools/deployment/armada/multinode/armada-lma.yaml
index 8b157fb30c..1609693e8c 100644
--- a/tools/deployment/armada/multinode/armada-lma.yaml
+++ b/tools/deployment/armada/multinode/armada-lma.yaml
@@ -176,8 +176,12 @@ data:
       prometheus:
         enabled: true
     labels:
-      node_selector_key: openstack-control-plane
-      node_selector_value: enabled
+      elasticsearch:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
+      job:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
   source:
     type: local
     location: ${OSH_INFRA_PATH}
@@ -218,6 +222,12 @@ data:
       fluentbit:
         node_selector_key: openstack-control-plane
         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:
     type: local
     location: ${OSH_INFRA_PATH}
@@ -253,6 +263,9 @@ data:
       kibana:
         node_selector_key: openstack-control-plane
         node_selector_value: enabled
+      job:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
   source:
     type: local
     location: ${OSH_INFRA_PATH}
@@ -276,8 +289,12 @@ data:
     no_hooks: false
   values:
     labels:
-      node_selector_key: openstack-control-plane
-      node_selector_value: enabled
+      prometheus:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
+      job:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
     pod:
       replicas:
         prometheus: 2
@@ -304,8 +321,12 @@ data:
     no_hooks: false
   values:
     labels:
-      node_selector_key: openstack-control-plane
-      node_selector_value: enabled
+      kube_state_metrics:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
+      job:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
   source:
     type: local
     location: ${OSH_INFRA_PATH}
@@ -329,8 +350,12 @@ data:
     no_hooks: false
   values:
     labels:
-      node_selector_key: openstack-control-plane
-      node_selector_value: enabled
+      node_exporter:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
+      job:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
   source:
     type: local
     location: ${OSH_INFRA_PATH}
@@ -354,8 +379,12 @@ data:
     no_hooks: false
   values:
     labels:
-      node_selector_key: openstack-control-plane
-      node_selector_value: enabled
+      alertmanager:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
+      job:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
   source:
     type: local
     location: ${OSH_INFRA_PATH}
@@ -398,8 +427,12 @@ data:
           admin:
             password: ${GRAFANA_ADMIN_PASSWORD}
     labels:
-      node_selector_key: openstack-control-plane
-      node_selector_value: enabled
+      grafana:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
+      job:
+        node_selector_key: openstack-control-plane
+        node_selector_value: enabled
   source:
     type: local
     location: ${OSH_INFRA_PATH}