From 941526289607fdca4fa695c62edcee1612037d26 Mon Sep 17 00:00:00 2001
From: "xuxant02@gmail.com" <xuxant02@gmail.com>
Date: Mon, 15 Nov 2021 16:15:40 +0545
Subject: [PATCH] Fix node labels for masakari monitors

Fix node labels for monitors agents as they need to run on the compute node where libvirt daemonset is running.

Change-Id: Ia4f3a510443f58b29d700421d77c5de51b0991b3
---
 masakari/Chart.yaml                                | 2 +-
 masakari/templates/daemonset-host-monitor.yaml     | 2 +-
 masakari/templates/daemonset-instance-monitor.yaml | 2 +-
 masakari/templates/daemonset-process-monitor.yaml  | 2 +-
 masakari/values.yaml                               | 3 +++
 releasenotes/notes/masakari.yaml                   | 1 +
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/masakari/Chart.yaml b/masakari/Chart.yaml
index 3fed149f23..009571b3b6 100644
--- a/masakari/Chart.yaml
+++ b/masakari/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Masakari
 name: masakari
-version: 0.1.0
+version: 0.1.1
 home: https://docs.openstack.org/developer/masakari
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Masakari/OpenStack_Project_masakari_vertical.png
 sources:
diff --git a/masakari/templates/daemonset-host-monitor.yaml b/masakari/templates/daemonset-host-monitor.yaml
index 272916a9ae..03e54948c4 100644
--- a/masakari/templates/daemonset-host-monitor.yaml
+++ b/masakari/templates/daemonset-host-monitor.yaml
@@ -48,7 +48,7 @@ spec:
 {{ dict "envAll" $envAll "application" "masakari-host-monitor" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
       nodeSelector:
-        {{ .Values.labels.masakari.node_selector_key }}: {{ .Values.labels.masakari.node_selector_value }}
+        {{ .Values.labels.monitors.node_selector_key }}: {{ .Values.labels.monitors.node_selector_value }}
       initContainers:
 {{ tuple $envAll "masakari_host_monitor" $mounts_masakari_host_monitor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: hostmonitor-init
diff --git a/masakari/templates/daemonset-instance-monitor.yaml b/masakari/templates/daemonset-instance-monitor.yaml
index 6327e9de5e..62540d5b24 100644
--- a/masakari/templates/daemonset-instance-monitor.yaml
+++ b/masakari/templates/daemonset-instance-monitor.yaml
@@ -48,7 +48,7 @@ spec:
 {{ dict "envAll" $envAll "application" "masakari-instance-monitor" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
       nodeSelector:
-        {{ .Values.labels.masakari.node_selector_key }}: {{ .Values.labels.masakari.node_selector_value }}
+        {{ .Values.labels.monitors.node_selector_key }}: {{ .Values.labels.monitors.node_selector_value }}
       initContainers:
 {{ tuple $envAll "masakari_instance_monitor" $mounts_masakari_instance_monitor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: instancemonitor-init
diff --git a/masakari/templates/daemonset-process-monitor.yaml b/masakari/templates/daemonset-process-monitor.yaml
index 66f22c1ad1..7ab1292be1 100644
--- a/masakari/templates/daemonset-process-monitor.yaml
+++ b/masakari/templates/daemonset-process-monitor.yaml
@@ -48,7 +48,7 @@ spec:
 {{ dict "envAll" $envAll "application" "masakari-process-monitor" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
       serviceAccountName: {{ $serviceAccountName }}
       nodeSelector:
-        {{ .Values.labels.masakari.node_selector_key }}: {{ .Values.labels.masakari.node_selector_value }}
+        {{ .Values.labels.monitors.node_selector_key }}: {{ .Values.labels.monitors.node_selector_value }}
       initContainers:
 {{ tuple $envAll "masakari_process_monitor" $mounts_masakari_process_monitor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: procressemonitor-init
diff --git a/masakari/values.yaml b/masakari/values.yaml
index 62c66172d9..5537376845 100644
--- a/masakari/values.yaml
+++ b/masakari/values.yaml
@@ -40,6 +40,9 @@ labels:
   job:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
+  monitors:
+    node_selector_key: openstack-compute-node
+    node_selector_value: enabled
   test:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
diff --git a/releasenotes/notes/masakari.yaml b/releasenotes/notes/masakari.yaml
index 7ba92b6b17..99680e5aa6 100644
--- a/releasenotes/notes/masakari.yaml
+++ b/releasenotes/notes/masakari.yaml
@@ -1,4 +1,5 @@
 ---
 masakari:
   - 0.1.0 Initial Chart
+  - 0.1.1 Seperate node labels for monitors
 ...