Merge "Running agents on all nodes."

fluent-logging/templates/daemonset-fluent-bit.yaml

@@ -91,8 +91,16 @@ spec:
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
+{{ if .Values.labels.fluentbit.tolerations }}
+      tolerations:
+      - key: node-role.kubernetes.io/master
+        operator: Exists
+      - key: node-role.kubernetes.io/node
+        operator: Exists
+{{ else }}
       nodeSelector:
         {{ .Values.labels.fluentbit.node_selector_key }}: {{ .Values.labels.fluentbit.node_selector_value | quote }}
+{{ end }}
       hostNetwork: true
       hostPID: true
       dnsPolicy: ClusterFirstWithHostNet

fluent-logging/values.yaml

@@ -23,8 +23,10 @@ labels:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
   fluentbit:
+    #(NOTE:seungkyua): when tolerations is true, nodeSelector will be disabled.
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
+    tolerations: false
   prometheus_fluentd_exporter:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled

prometheus-node-exporter/templates/daemonset.yaml

@@ -52,8 +52,16 @@ spec:
       namespace: {{ .Values.endpoints.node_metrics.namespace }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
+{{ if .Values.labels.node_exporter.tolerations }}
+      tolerations:
+      - key: node-role.kubernetes.io/master
+        operator: Exists
+      - key: node-role.kubernetes.io/node
+        operator: Exists
+{{ else }}
       nodeSelector:
         {{ .Values.labels.node_exporter.node_selector_key }}: {{ .Values.labels.node_exporter.node_selector_value | quote }}
+{{ end }}
       hostNetwork: true
       hostPID: true
       initContainers:

prometheus-node-exporter/values.yaml

@@ -29,9 +29,11 @@ images:
       - image_repo_sync
 
 labels:
+  #(NOTE:seungkyua): when tolerations is true, nodeSelector will be disabled.
   node_exporter:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled
+    tolerations: false
   job:
     node_selector_key: openstack-control-plane
     node_selector_value: enabled