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, 34 insertions, 27 deletions

diff --git a/roles/openshift_prometheus/tasks/install_prometheus.yaml b/roles/openshift_prometheus/tasks/install_prometheus.yaml
index 0b565502f..5a8228bc4 100644
--- a/roles/openshift_prometheus/tasks/install_prometheus.yaml
+++ b/roles/openshift_prometheus/tasks/install_prometheus.yaml
@@ -2,6 +2,13 @@
 # set facts
 - include_tasks: facts.yaml
 
+- name: Ensure that Prometheus has nodes to run on
+  fail:
+    msg: |-
+      No schedulable nodes found matching node selector for Prometheus - '{{ openshift_prometheus_node_selector }}'
+  when:
+  - openshift_schedulable_node_labels | lib_utils_oo_has_no_matching_selector(openshift_prometheus_node_selector)
+
 # namespace
 - name: Add prometheus project
   oc_project:
@@ -17,12 +24,12 @@
     name: "{{ item }}-proxy"
     namespace: "{{ openshift_prometheus_namespace }}"
     contents:
-      - path: session_secret
-        data: "{{ 43 | lib_utils_oo_random_word }}="
+    - path: session_secret
+      data: "{{ 43 | lib_utils_oo_random_word }}="
   with_items:
-    - prometheus
-    - alerts
-    - alertmanager
+  - prometheus
+  - alerts
+  - alertmanager
 
 # serviceaccount
 - name: create prometheus serviceaccount
@@ -62,10 +69,10 @@
       oprometheus.io/scheme: https
       service.alpha.openshift.io/serving-cert-secret-name: prometheus-tls
     ports:
-      - name: prometheus
-        port: "{{ openshift_prometheus_service_port }}"
-        targetPort: "{{ openshift_prometheus_service_targetport }}"
-        protocol: TCP
+    - name: prometheus
+      port: "{{ openshift_prometheus_service_port }}"
+      targetPort: "{{ openshift_prometheus_service_targetport }}"
+      protocol: TCP
     selector:
       app: prometheus
 
@@ -78,10 +85,10 @@
     annotations:
       service.alpha.openshift.io/serving-cert-secret-name: alerts-tls
     ports:
-      - name: prometheus
-        port: "{{ openshift_prometheus_service_port }}"
-        targetPort: "{{ openshift_prometheus_alerts_service_targetport }}"
-        protocol: TCP
+    - name: prometheus
+      port: "{{ openshift_prometheus_service_port }}"
+      targetPort: "{{ openshift_prometheus_alerts_service_targetport }}"
+      protocol: TCP
     selector:
       app: prometheus
 
@@ -94,10 +101,10 @@
     annotations:
       service.alpha.openshift.io/serving-cert-secret-name: alertmanager-tls
     ports:
-      - name: prometheus
-        port: "{{ openshift_prometheus_service_port }}"
-        targetPort: "{{ openshift_prometheus_alertmanager_service_targetport }}"
-        protocol: TCP
+    - name: prometheus
+      port: "{{ openshift_prometheus_service_port }}"
+      targetPort: "{{ openshift_prometheus_alertmanager_service_targetport }}"
+      protocol: TCP
     selector:
       app: prometheus
 
@@ -112,12 +119,12 @@
     service_name: "{{ item.name }}"
     tls_termination: reencrypt
   with_items:
-    - name: prometheus
-      host: "{{ openshift_prometheus_hostname }}"
-    - name: alerts
-      host: "{{ openshift_prometheus_alerts_hostname }}"
-    - name: alertmanager
-      host: "{{ openshift_prometheus_alertmanager_hostname }}"
+  - name: prometheus
+    host: "{{ openshift_prometheus_hostname }}"
+  - name: alerts
+    host: "{{ openshift_prometheus_alerts_hostname }}"
+  - name: alertmanager
+    host: "{{ openshift_prometheus_alertmanager_hostname }}"
 
 # Storage
 - name: create prometheus pvc
@@ -157,9 +164,9 @@
     src: "{{ openshift_prometheus_additional_rules_file }}"
     dest: "{{ tempdir }}/prometheus.additional.rules"
   when:
-    - openshift_prometheus_additional_rules_file is defined
-    - openshift_prometheus_additional_rules_file is not none
-    - openshift_prometheus_additional_rules_file | trim | length > 0
+  - openshift_prometheus_additional_rules_file is defined
+  - openshift_prometheus_additional_rules_file is not none
+  - openshift_prometheus_additional_rules_file | trim | length > 0
 
 - stat:
     path: "{{ tempdir }}/prometheus.additional.rules"
@@ -227,5 +234,5 @@
     namespace: "{{ openshift_prometheus_namespace }}"
     kind: statefulset
     files:
-      - "{{ tempdir }}/templates/prometheus.yaml"
+    - "{{ tempdir }}/templates/prometheus.yaml"
     delete_after: true