diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-12 07:52:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 07:52:19 -0800 |
| commit | 73a0b0eaa3844d4717eb8827c619594bb47acab9 (patch) | |
| tree | d317653e245fe05b1dec6b07d9f1b12eb74a0bcf /roles/openshift_metrics/tasks/install_heapster.yaml | |
| parent | 81d1735fc7ca16a326cc82b9fe2ce61cf20a1330 (diff) | |
| parent | 93619d7f090f633ddbd57bb5a41a4d67c83c7c10 (diff) | |
| download | openshift-73a0b0eaa3844d4717eb8827c619594bb47acab9.tar.gz openshift-73a0b0eaa3844d4717eb8827c619594bb47acab9.tar.bz2 openshift-73a0b0eaa3844d4717eb8827c619594bb47acab9.tar.xz openshift-73a0b0eaa3844d4717eb8827c619594bb47acab9.zip | |
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)
Diffstat (limited to 'roles/openshift_metrics/tasks/install_heapster.yaml')
| -rw-r--r-- | roles/openshift_metrics/tasks/install_heapster.yaml | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/roles/openshift_metrics/tasks/install_heapster.yaml b/roles/openshift_metrics/tasks/install_heapster.yaml index 73e7454f0..e4ddf98ff 100644 --- a/roles/openshift_metrics/tasks/install_heapster.yaml +++ b/roles/openshift_metrics/tasks/install_heapster.yaml @@ -1,4 +1,11 @@ --- +- name: Ensure that Heapster has nodes to run on + fail: + msg: |- + No schedulable nodes found matching node selector for heapster - '{{ openshift_metrics_heapster_nodeselector }}' + when: + - openshift_schedulable_node_labels | lib_utils_oo_has_no_matching_selector(openshift_metrics_heapster_nodeselector) + - command: > {{ openshift_client_binary }} -n {{ openshift_metrics_project | quote }} --config={{ mktemp.stdout }}/admin.kubeconfig @@ -20,8 +27,8 @@ - set_fact: heapster_sa_secrets: "{{ heapster_sa_secrets + [item] }}" with_items: - - hawkular-metrics-certs - - hawkular-metrics-account + - hawkular-metrics-certs + - hawkular-metrics-account when: not openshift_metrics_heapster_standalone | bool - name: Generating serviceaccount for heapster @@ -38,7 +45,7 @@ vars: obj_name: heapster ports: - - {port: 80, targetPort: http-endpoint} + - {port: 80, targetPort: http-endpoint} selector: name: "{{obj_name}}" annotations: @@ -61,9 +68,9 @@ kind: ClusterRole name: cluster-reader subjects: - - kind: ServiceAccount - name: heapster - namespace: "{{ openshift_metrics_project }}" + - kind: ServiceAccount + name: heapster + namespace: "{{ openshift_metrics_project }}" changed_when: no - include_tasks: generate_heapster_secrets.yaml |