Merge pull request #8335 from ewolinetz/logging_keep_nodeselectors

Using existing nodeselectors for logging components as more sane defaults

roles/openshift_logging/tasks/set_defaults_from_current.yml

@@ -27,6 +27,7 @@
 
     - set_fact:
         __openshift_logging_es_recover_after_time: "{{ openshift_logging_facts['elasticsearch']['deploymentconfigs'][__es_dc_name]['containers']['elasticsearch']['env'] | entry_from_name_value_pair('RECOVER_AFTER_TIME') }}"
+        __openshift_logging_es_nodeselector: "{{ openshift_logging_facts['elasticsearch']['deploymentconfigs'][__es_dc_name]['nodeSelector'] | default('') | from_yaml }}"
 
     - conditional_set_fact:
         facts: "{{ openshift_logging_facts['elasticsearch']['deploymentconfigs'][__es_dc_name]['containers'] | flatten_dict }}"
@@ -53,6 +54,7 @@
 
     - set_fact:
         __openshift_logging_es_ops_recover_after_time: "{{ openshift_logging_facts['elasticsearch_ops']['deploymentconfigs'][__es_dc_name]['containers']['elasticsearch']['env'] | entry_from_name_value_pair('RECOVER_AFTER_TIME') }}"
+        __openshift_logging_es_ops_nodeselector: "{{ openshift_logging_facts['elasticsearch_ops']['deploymentconfigs'][__es_dc_name]['nodeSelector'] | default('') | from_yaml }}"
 
     - conditional_set_fact:
         facts: "{{ openshift_logging_facts['elasticsearch_ops']['deploymentconfigs'][__es_dc_name]['containers'] | flatten_dict }}"
@@ -66,28 +68,36 @@
 
 # Kibana
 - when: openshift_logging_facts['kibana']['deploymentconfigs']['logging-kibana'] is defined
-  conditional_set_fact:
-    facts: "{{ openshift_logging_facts['kibana']['deploymentconfigs']['logging-kibana']['containers'] | flatten_dict }}"
-    vars:
-      __openshift_logging_kibana_cpu_limit: kibana.resources.limits.cpu
-      __openshift_logging_kibana_cpu_request: kibana.resources.requests.cpu
-      __openshift_logging_kibana_memory_limit: kibana.resources.limits.memory
-      __openshift_logging_kibana_proxy_cpu_limit: kibana.resources.limits.cpu
-      __openshift_logging_kibana_proxy_cpu_request: kibana-proxy.resources.requests.cpu
-      __openshift_logging_kibana_proxy_memory_limit: kibana-proxy.resources.limits.memory
+  block:
+    - set_fact:
+        __openshift_logging_kibana_nodeselector: "{{ openshift_logging_facts['kibana']['deploymentconfigs']['logging-kibana']['nodeSelector'] | default('') | from_yaml }}"
+
+    - conditional_set_fact:
+        facts: "{{ openshift_logging_facts['kibana']['deploymentconfigs']['logging-kibana']['containers'] | flatten_dict }}"
+        vars:
+          __openshift_logging_kibana_cpu_limit: kibana.resources.limits.cpu
+          __openshift_logging_kibana_cpu_request: kibana.resources.requests.cpu
+          __openshift_logging_kibana_memory_limit: kibana.resources.limits.memory
+          __openshift_logging_kibana_proxy_cpu_limit: kibana.resources.limits.cpu
+          __openshift_logging_kibana_proxy_cpu_request: kibana-proxy.resources.requests.cpu
+          __openshift_logging_kibana_proxy_memory_limit: kibana-proxy.resources.limits.memory
 
 
 # Kibana Ops
 - when: openshift_logging_facts['kibana_ops']['deploymentconfigs']['logging-kibana-ops'] is defined
-  conditional_set_fact:
-    facts: "{{ openshift_logging_facts['kibana_ops']['deploymentconfigs']['logging-kibana-ops']['containers'] | flatten_dict }}"
-    vars:
-      __openshift_logging_kibana_ops_cpu_limit: kibana.resources.limits.cpu
-      __openshift_logging_kibana_ops_cpu_request: kibana.resources.requests.cpu
-      __openshift_logging_kibana_ops_memory_limit: kibana.resources.limits.memory
-      __openshift_logging_kibana_ops_proxy_cpu_limit: kibana.resources.limits.cpu
-      __openshift_logging_kibana_ops_proxy_cpu_request: kibana-proxy.resources.requests.cpu
-      __openshift_logging_kibana_ops_proxy_memory_limit: kibana-proxy.resources.limits.memory
+  block:
+    - set_fact:
+        __openshift_logging_kibana_ops_nodeselector: "{{ openshift_logging_facts['kibana_ops']['deploymentconfigs']['logging-kibana-ops']['nodeSelector'] | default('') | from_yaml }}"
+
+    - conditional_set_fact:
+        facts: "{{ openshift_logging_facts['kibana_ops']['deploymentconfigs']['logging-kibana-ops']['containers'] | flatten_dict }}"
+        vars:
+          __openshift_logging_kibana_ops_cpu_limit: kibana.resources.limits.cpu
+          __openshift_logging_kibana_ops_cpu_request: kibana.resources.requests.cpu
+          __openshift_logging_kibana_ops_memory_limit: kibana.resources.limits.memory
+          __openshift_logging_kibana_ops_proxy_cpu_limit: kibana.resources.limits.cpu
+          __openshift_logging_kibana_ops_proxy_cpu_request: kibana-proxy.resources.requests.cpu
+          __openshift_logging_kibana_ops_proxy_memory_limit: kibana-proxy.resources.limits.memory
 
 
 # Curator
@@ -98,6 +108,7 @@
         __openshift_logging_curator_run_hour: "{{ openshift_logging_facts['curator']['deploymentconfigs']['logging-curator']['containers']['curator']['env'] | entry_from_name_value_pair('CURATOR_RUN_HOUR') }}"
         __openshift_logging_curator_run_minute: "{{ openshift_logging_facts['curator']['deploymentconfigs']['logging-curator']['containers']['curator']['env'] | entry_from_name_value_pair('CURATOR_RUN_MINUTE') }}"
         __openshift_logging_curator_run_timezone: "{{ openshift_logging_facts['curator']['deploymentconfigs']['logging-curator']['containers']['curator']['env'] | entry_from_name_value_pair('CURATOR_RUN_TIMEZONE') }}"
+        __openshift_logging_curator_nodeselector: "{{ openshift_logging_facts['curator']['deploymentconfigs']['logging-curator']['nodeSelector'] | default('') | from_yaml }}"
 
     - conditional_set_fact:
         facts: "{{ openshift_logging_facts['curator']['deploymentconfigs']['logging-curator']['containers'] | flatten_dict }}"
@@ -115,6 +126,7 @@
         __openshift_logging_curator_ops_run_hour: "{{ openshift_logging_facts['curator_ops']['deploymentconfigs']['logging-curator-ops']['containers']['curator']['env'] | entry_from_name_value_pair('CURATOR_RUN_HOUR') }}"
         __openshift_logging_curator_ops_run_minute: "{{ openshift_logging_facts['curator_ops']['deploymentconfigs']['logging-curator-ops']['containers']['curator']['env'] | entry_from_name_value_pair('CURATOR_RUN_MINUTE') }}"
         __openshift_logging_curator_ops_run_timezone: "{{ openshift_logging_facts['curator_ops']['deploymentconfigs']['logging-curator-ops']['containers']['curator']['env'] | entry_from_name_value_pair('CURATOR_RUN_TIMEZONE') }}"
+        __openshift_logging_curator_ops_nodeselector: "{{ openshift_logging_facts['curator_ops']['deploymentconfigs']['logging-curator-ops']['nodeSelector'] | default('') | from_yaml }}"
 
     - conditional_set_fact:
         facts: "{{ openshift_logging_facts['curator_ops']['deploymentconfigs']['logging-curator-ops']['containers'] | flatten_dict }}"
@@ -131,6 +143,7 @@
         __openshift_logging_fluentd_file_buffer_limit: "{{ openshift_logging_facts['fluentd']['daemonsets']['logging-fluentd']['containers']['fluentd-elasticsearch']['env'] | entry_from_name_value_pair('FILE_BUFFER_LIMIT') }}"
         __openshift_logging_fluentd_buffer_queue_limit: "{{ openshift_logging_facts['fluentd']['daemonsets']['logging-fluentd']['containers']['fluentd-elasticsearch']['env'] | entry_from_name_value_pair('BUFFER_QUEUE_LIMIT') }}"
         __openshift_logging_fluentd_buffer_size_limit: "{{ openshift_logging_facts['fluentd']['daemonsets']['logging-fluentd']['containers']['fluentd-elasticsearch']['env'] | entry_from_name_value_pair('BUFFER_SIZE_LIMIT') }}"
+        __openshift_logging_fluentd_nodeselector: "{{ openshift_logging_facts['fluentd']['daemonsets']['logging-fluentd']['nodeSelector'] | default('') | from_yaml }}"
 
     - conditional_set_fact:
         facts: "{{ openshift_logging_facts['fluentd']['daemonsets']['logging-fluentd']['containers'] | flatten_dict }}"
@@ -147,6 +160,7 @@
         __openshift_logging_mux_file_buffer_limit: "{{ openshift_logging_facts['mux']['deploymentconfigs']['logging-mux']['containers']['mux']['env'] | entry_from_name_value_pair('FILE_BUFFER_LIMIT') }}"
         __openshift_logging_mux_buffer_queue_limit: "{{ openshift_logging_facts['mux']['deploymentconfigs']['logging-mux']['containers']['mux']['env'] | entry_from_name_value_pair('BUFFER_QUEUE_LIMIT') }}"
         __openshift_logging_mux_buffer_size_limit: "{{ openshift_logging_facts['mux']['deploymentconfigs']['logging-mux']['containers']['mux']['env'] | entry_from_name_value_pair('BUFFER_SIZE_LIMIT') }}"
+        __openshift_logging_mux_nodeselector: "{{ openshift_logging_facts['mux']['deploymentconfigs']['logging-mux']['nodeSelector'] | default('') | from_yaml }}"
 
     - conditional_set_fact:
         facts: "{{ openshift_logging_facts['mux']['deploymentconfigs']['logging-mux']['containers'] | flatten_dict }}"
@@ -158,12 +172,16 @@
 
 # EventRouter
 - when: openshift_logging_facts['eventrouter']['deploymentconfigs']['logging-eventrouter'] is defined
-  conditional_set_fact:
-    facts: "{{ openshift_logging_facts['eventrouter']['deploymentconfigs']['logging-eventrouter']['containers'] | flatten_dict }}"
-    vars:
-      __openshift_logging_eventrouter_cpu_limit: kube-eventrouter.resources.limits.cpu
-      __openshift_logging_eventrouter_cpu_request: kube-eventrouter.resources.requests.cpu
-      __openshift_logging_eventrouter_memory_limit: kube-eventrouter.resources.limits.memory
+  block:
+    - set_fact:
+        __openshift_logging_eventrouter_nodeselector: "{{ openshift_logging_facts['eventrouter']['deploymentconfigs']['logging-eventrouter']['nodeSelector'] | default('') | from_yaml }}"
+
+    - conditional_set_fact:
+        facts: "{{ openshift_logging_facts['eventrouter']['deploymentconfigs']['logging-eventrouter']['containers'] | flatten_dict }}"
+        vars:
+          __openshift_logging_eventrouter_cpu_limit: kube-eventrouter.resources.limits.cpu
+          __openshift_logging_eventrouter_cpu_request: kube-eventrouter.resources.requests.cpu
+          __openshift_logging_eventrouter_memory_limit: kube-eventrouter.resources.limits.memory
 
 
 # Set the defaults based on collected facts
@@ -173,6 +191,7 @@
       # Elasticsearch
       openshift_logging_es_number_of_shards: openshift_logging_es_number_of_shards | __openshift_logging_es_number_of_shards
       openshift_logging_es_number_of_replicas: openshift_logging_es_number_of_replicas | __openshift_logging_es_number_of_replicas
+      openshift_logging_es_nodeselector: openshift_logging_es_nodeselector | __openshift_logging_es_nodeselector
       openshift_logging_elasticsearch_recover_after_time: openshift_logging_es_recover_after_time | __openshift_logging_es_recover_after_time
       openshift_logging_elasticsearch_cpu_limit: openshift_logging_elasticsearch_cpu_limit | __openshift_logging_elasticsearch_cpu_limit
       openshift_logging_elasticsearch_cpu_request: openshift_logging_elasticsearch_cpu_request | __openshift_logging_elasticsearch_cpu_request
@@ -183,6 +202,7 @@
       # Elasticsearch Ops
       openshift_logging_es_ops_number_of_shards: openshift_logging_es_ops_number_of_shards | __openshift_logging_es_ops_number_of_shards
       openshift_logging_es_ops_number_of_replicas: openshift_logging_es_ops_number_of_replicas | __openshift_logging_es_ops_number_of_replicas
+      openshift_logging_es_ops_nodeselector: openshift_logging_es_ops_nodeselector | __openshift_logging_es_ops_nodeselector
       openshift_logging_es_ops_recover_after_time: openshift_logging_es_ops_recover_after_time | __openshift_logging_es_ops_recover_after_time
       openshift_logging_es_ops_cpu_limit: openshift_logging_es_ops_cpu_limit | __openshift_logging_es_ops_cpu_limit
       openshift_logging_es_ops_cpu_request: openshift_logging_es_ops_cpu_request | __openshift_logging_es_ops_cpu_request
@@ -197,6 +217,7 @@
       openshift_logging_kibana_proxy_cpu_limit: openshift_logging_kibana_proxy_cpu_limit | __openshift_logging_kibana_proxy_cpu_limit
       openshift_logging_kibana_proxy_cpu_request: openshift_logging_kibana_proxy_cpu_request | __openshift_logging_kibana_proxy_cpu_request
       openshift_logging_kibana_proxy_memory_limit: openshift_logging_kibana_proxy_memory_limit | __openshift_logging_kibana_proxy_memory_limit
+      openshift_logging_kibana_nodeselector: openshift_logging_kibana_nodeselector | __openshift_logging_kibana_nodeselector
 
       # Kibana Ops
       openshift_logging_kibana_ops_cpu_limit: openshift_logging_kibana_ops_cpu_limit | __openshift_logging_kibana_ops_cpu_limit
@@ -205,6 +226,7 @@
       openshift_logging_kibana_ops_proxy_cpu_limit: openshift_logging_kibana_ops_proxy_cpu_limit | __openshift_logging_kibana_ops_proxy_cpu_limit
       openshift_logging_kibana_ops_proxy_cpu_request: openshift_logging_kibana_ops_proxy_cpu_request | __openshift_logging_kibana_ops_proxy_cpu_request
       openshift_logging_kibana_ops_proxy_memory_limit: openshift_logging_kibana_ops_proxy_memory_limit | __openshift_logging_kibana_ops_proxy_memory_limit
+      openshift_logging_kibana_ops_nodeselector: openshift_logging_kibana_ops_nodeselector | __openshift_logging_kibana_ops_nodeselector
 
       # Curator
       openshift_logging_curator_default_days: openshift_logging_curator_default_days | __openshift_logging_curator_default_days
@@ -214,6 +236,7 @@
       openshift_logging_curator_cpu_limit: openshift_logging_curator_cpu_limit | __openshift_logging_curator_cpu_limit
       openshift_logging_curator_cpu_request: openshift_logging_curator_cpu_request | __openshift_logging_curator_cpu_request
       openshift_logging_curator_memory_limit: openshift_logging_curator_memory_limit | __openshift_logging_curator_memory_limit
+      openshift_logging_curator_nodeselector: openshift_logging_curator_nodeselector | __openshift_logging_curator_nodeselector
 
       # Curator Ops
       openshift_logging_curator_ops_default_days: openshift_logging_curator_ops_default_days | __openshift_logging_curator_ops_default_days
@@ -223,6 +246,7 @@
       openshift_logging_curator_ops_cpu_limit: openshift_logging_curator_ops_cpu_limit | __openshift_logging_curator_ops_cpu_limit
       openshift_logging_curator_ops_cpu_request: openshift_logging_curator_ops_cpu_request | __openshift_logging_curator_ops_cpu_request
       openshift_logging_curator_ops_memory_limit: openshift_logging_curator_ops_memory_limit | __openshift_logging_curator_ops_memory_limit
+      openshift_logging_curator_ops_nodeselector: openshift_logging_curator_ops_nodeselector | __openshift_logging_curator_ops_nodeselector
 
       # Fluentd
       openshift_logging_fluentd_cpu_limit: openshift_logging_fluentd_cpu_limit | __openshift_logging_fluentd_cpu_limit
@@ -231,6 +255,7 @@
       openshift_logging_fluentd_file_buffer_limit: openshift_logging_fluentd_file_buffer_limit | __openshift_logging_fluentd_file_buffer_limit
       openshift_logging_fluentd_buffer_queue_limit: openshift_logging_fluentd_buffer_queue_limit | __openshift_logging_fluentd_buffer_queue_limit
       openshift_logging_fluentd_buffer_size_limit: openshift_logging_fluentd_buffer_size_limit | __openshift_logging_fluentd_buffer_size_limit
+      openshift_logging_fluentd_nodeselector: openshift_logging_fluentd_nodeselector | __openshift_logging_fluentd_nodeselector
 
       # Mux
       openshift_logging_mux_cpu_limit: openshift_logging_mux_cpu_limit | __openshift_logging_mux_cpu_limit
@@ -239,8 +264,10 @@
       openshift_logging_mux_buffer_queue_limit: openshift_logging_mux_buffer_queue_limit | __openshift_logging_mux_buffer_queue_limit
       openshift_logging_mux_buffer_size_limit: openshift_logging_mux_buffer_size_limit | __openshift_logging_mux_buffer_size_limit
       openshift_logging_mux_file_buffer_limit: openshift_logging_mux_file_buffer_limit | __openshift_logging_mux_file_buffer_limit
+      openshift_logging_mux_nodeselector: openshift_logging_mux_nodeselector | __openshift_logging_mux_nodeselector
 
       # EventRouter
       openshift_logging_eventrouter_cpu_limit: openshift_logging_eventrouter_cpu_limit | __openshift_logging_eventrouter_cpu_limit
       openshift_logging_eventrouter_cpu_request: openshift_logging_eventrouter_cpu_request | __openshift_logging_eventrouter_cpu_request
       openshift_logging_eventrouter_memory_limit: openshift_logging_eventrouter_memory_limit | __openshift_logging_eventrouter_memory_limit
+      openshift_logging_eventrouter_nodeselector: openshift_logging_eventrouter_nodeselector | __openshift_logging_eventrouter_nodeselector