openstack/openstack-helm
Code Issues Proposed changes

Fix node labels for masakari monitors

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

Change-Id: Ia4f3a510443f58b29d700421d77c5de51b0991b3
This commit is contained in:
xuxant02@gmail.com 2021-11-15 16:15:40 +05:45
parent ddf21b077e
commit 9415262896
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
masakari/Chart.yaml
View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Masakari description: OpenStack-Helm Masakari
name: masakari name: masakari
version: 0.1.0 version: 0.1.1
home: https://docs.openstack.org/developer/masakari home: https://docs.openstack.org/developer/masakari
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Masakari/OpenStack_Project_masakari_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Masakari/OpenStack_Project_masakari_vertical.png
sources: sources:

2
masakari/templates/daemonset-host-monitor.yaml
View File

@ -48,7 +48,7 @@ spec:
{{ dict "envAll" $envAll "application" "masakari-host-monitor" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} {{ dict "envAll" $envAll "application" "masakari-host-monitor" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
nodeSelector: 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: initContainers:
{{ tuple $envAll "masakari_host_monitor" $mounts_masakari_host_monitor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll "masakari_host_monitor" $mounts_masakari_host_monitor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- name: hostmonitor-init - name: hostmonitor-init

2
masakari/templates/daemonset-instance-monitor.yaml
View File

@ -48,7 +48,7 @@ spec:
{{ dict "envAll" $envAll "application" "masakari-instance-monitor" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} {{ dict "envAll" $envAll "application" "masakari-instance-monitor" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
nodeSelector: 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: initContainers:
{{ tuple $envAll "masakari_instance_monitor" $mounts_masakari_instance_monitor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll "masakari_instance_monitor" $mounts_masakari_instance_monitor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- name: instancemonitor-init - name: instancemonitor-init

2
masakari/templates/daemonset-process-monitor.yaml
View File

@ -48,7 +48,7 @@ spec:
{{ dict "envAll" $envAll "application" "masakari-process-monitor" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} {{ dict "envAll" $envAll "application" "masakari-process-monitor" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
nodeSelector: 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: initContainers:
{{ tuple $envAll "masakari_process_monitor" $mounts_masakari_process_monitor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll "masakari_process_monitor" $mounts_masakari_process_monitor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- name: procressemonitor-init - name: procressemonitor-init

3
masakari/values.yaml
View File

@ -40,6 +40,9 @@ labels:
job: job:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
node_selector_value: enabled node_selector_value: enabled
monitors:
node_selector_key: openstack-compute-node
node_selector_value: enabled
test: test:
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
node_selector_value: enabled node_selector_value: enabled

1
releasenotes/notes/masakari.yaml
View File

@ -1,4 +1,5 @@
--- ---
masakari: masakari:
- 0.1.0 Initial Chart - 0.1.0 Initial Chart
- 0.1.1 Seperate node labels for monitors
... ...