Merge "Fix node labels for masakari monitors"

This commit is contained in:
Zuul 2021-11-16 22:00:23 +00:00 committed by Gerrit Code Review
commit 645e2a2c57
6 changed files with 8 additions and 4 deletions

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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