Merge pull request #7022 from vrutkovs/sanitize-labels

Automatic merge from submit-queue.

Verify that requested services have schedulable nodes matching the selectors

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1538445

Not sure if I should keep one task per failure or should group them by service (e.g. all logging check in one tasks)

1 files changed, 31 insertions, 24 deletions

diff --git a/roles/openshift_logging_mux/tasks/main.yaml b/roles/openshift_logging_mux/tasks/main.yaml
index b2699b285..f810f3606 100644
--- a/roles/openshift_logging_mux/tasks/main.yaml
+++ b/roles/openshift_logging_mux/tasks/main.yaml
@@ -7,11 +7,18 @@
     msg: Operations logs destination is required
   when: not openshift_logging_mux_ops_host or openshift_logging_mux_ops_host == ''
 
+- name: Ensure that logging mux has nodes to run on
+  fail:
+    msg: |-
+      No schedulable nodes found matching node selector for logging mux - '{{ openshift_logging_mux_nodeselector }}'
+  when:
+  - openshift_schedulable_node_labels | lib_utils_oo_has_no_matching_selector(openshift_logging_mux_nodeselector)
+
 - name: Set default image variables based on openshift_deployment_type
   include_vars: "{{ var_file_name }}"
   with_first_found:
-    - "{{ openshift_deployment_type }}.yml"
-    - "default_images.yml"
+  - "{{ openshift_deployment_type }}.yml"
+  - "default_images.yml"
   loop_control:
     loop_var: var_file_name
 
@@ -55,7 +62,7 @@
     name: "aggregated-logging-mux"
     namespace: "{{ openshift_logging_mux_namespace }}"
   when:
-    - openshift_logging_image_pull_secret == ''
+  - openshift_logging_image_pull_secret == ''
 
 # set service account scc
 - name: Set privileged permissions for Mux
@@ -102,10 +109,10 @@
     configmap_name: "logging-mux"
     configmap_namespace: "{{ openshift_logging_mux_namespace }}"
     configmap_file_names:
-      - current_file: "fluent.conf"
-        new_file: "{{ tempdir }}/fluent-mux.conf"
-      - current_file: "secure-forward.conf"
-        new_file: "{{ tempdir }}/secure-forward-mux.conf"
+    - current_file: "fluent.conf"
+      new_file: "{{ tempdir }}/fluent-mux.conf"
+    - current_file: "secure-forward.conf"
+      new_file: "{{ tempdir }}/secure-forward-mux.conf"
 
 - name: Set Mux configmap
   oc_configmap:
@@ -123,14 +130,14 @@
     name: logging-mux
     namespace: "{{ openshift_logging_mux_namespace }}"
     files:
-      - name: ca
-        path: "{{ generated_certs_dir }}/ca.crt"
-      - name: key
-        path: "{{ generated_certs_dir }}/system.logging.mux.key"
-      - name: cert
-        path: "{{ generated_certs_dir }}/system.logging.mux.crt"
-      - name: shared_key
-        path: "{{ generated_certs_dir }}/mux_shared_key"
+    - name: ca
+      path: "{{ generated_certs_dir }}/ca.crt"
+    - name: key
+      path: "{{ generated_certs_dir }}/system.logging.mux.key"
+    - name: cert
+      path: "{{ generated_certs_dir }}/system.logging.mux.crt"
+    - name: shared_key
+      path: "{{ generated_certs_dir }}/mux_shared_key"
 
 # services
 - name: Set logging-mux service for external communication
@@ -144,11 +151,11 @@
     labels:
       logging-infra: 'support'
     ports:
-      - name: mux-forward
-        port: "{{ openshift_logging_mux_port }}"
-        targetPort: "mux-forward"
+    - name: mux-forward
+      port: "{{ openshift_logging_mux_port }}"
+      targetPort: "mux-forward"
     external_ips:
-      - "{{ openshift_logging_mux_external_address }}"
+    - "{{ openshift_logging_mux_external_address }}"
   when: openshift_logging_mux_allow_external | bool
 
 - name: Set logging-mux service for internal communication
@@ -162,9 +169,9 @@
     labels:
       logging-infra: 'support'
     ports:
-      - name: mux-forward
-        port: "{{ openshift_logging_mux_port }}"
-        targetPort: "mux-forward"
+    - name: mux-forward
+      port: "{{ openshift_logging_mux_port }}"
+      targetPort: "mux-forward"
   when: not openshift_logging_mux_allow_external | bool
 
 # create Mux DC
@@ -199,7 +206,7 @@
     selector: "{{ openshift_logging_mux_file_buffer_pvc_pv_selector }}"
     storage_class_name: "{{ openshift_logging_mux_file_buffer_pvc_storage_class_name | default('', true) }}"
   when:
-    - openshift_logging_mux_file_buffer_storage_type == "pvc"
+  - openshift_logging_mux_file_buffer_storage_type == "pvc"
 
 - name: Set logging-mux DC
   oc_obj:
@@ -208,7 +215,7 @@
     namespace: "{{ openshift_logging_mux_namespace }}"
     kind: dc
     files:
-      - "{{ tempdir }}/templates/logging-mux-dc.yaml"
+    - "{{ tempdir }}/templates/logging-mux-dc.yaml"
     delete_after: true
 
 - name: Add mux namespaces