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, 11 insertions, 4 deletions

diff --git a/roles/openshift_provisioners/tasks/install_provisioners.yaml b/roles/openshift_provisioners/tasks/install_provisioners.yaml
index 2d1217c74..1be498489 100644
--- a/roles/openshift_provisioners/tasks/install_provisioners.yaml
+++ b/roles/openshift_provisioners/tasks/install_provisioners.yaml
@@ -15,6 +15,13 @@
   fail: msg='the openshift_provisioners_efs_aws_secret_access_key variable is required'
   when: (openshift_provisioners_efs | bool) and openshift_provisioners_efs_aws_secret_access_key is not defined
 
+- name: Ensure that provisioners have nodes to run on
+  fail:
+    msg: |-
+      No schedulable nodes found matching node selector for Prometheus - '{{ openshift_provisioners_efs_nodeselector }}'
+  when:
+  - openshift_schedulable_node_labels | lib_utils_oo_has_no_matching_selector(openshift_provisioners_efs_nodeselector)
+
 - name: Install support
   include_tasks: install_support.yaml
 
@@ -34,10 +41,10 @@
 - name: Create objects
   include_tasks: oc_apply.yaml
   vars:
-    - kubeconfig: "{{ mktemp.stdout }}/admin.kubeconfig"
-    - namespace: "{{ openshift_provisioners_project }}"
-    - file_name: "{{ file.source }}"
-    - file_content: "{{ file.content | b64decode | from_yaml }}"
+  - kubeconfig: "{{ mktemp.stdout }}/admin.kubeconfig"
+  - namespace: "{{ openshift_provisioners_project }}"
+  - file_name: "{{ file.source }}"
+  - file_content: "{{ file.content | b64decode | from_yaml }}"
   with_items: "{{ object_defs.results }}"
   loop_control:
     loop_var: file