Browse Source

Merge pull request #6743 from ewolinetz/logging_find_running_pods

Automatic merge from submit-queue.

Ensure we are running oc execs against running pods

We should make sure we are running `oc exec` statements against running pods only.

Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1534879
OpenShift Merge Robot 7 years ago
parent
commit
6a69cb8e4f

+ 2 - 2
roles/openshift_logging_elasticsearch/tasks/get_es_version.yml

@@ -1,6 +1,6 @@
 ---
 - command: >
-    oc get pod -l component=es,provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[*].metadata.name}
+    oc get pod -l component=es,provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[?(@.status.phase==\"Running\")].metadata.name}
   register: _cluster_pods
 
 - name: "Getting ES version for logging-es cluster"
@@ -10,7 +10,7 @@
   when: _cluster_pods.stdout_lines | count > 0
 
 - command: >
-    oc get pod -l component=es-ops,provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[*].metadata.name}
+    oc get pod -l component=es-ops,provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[?(@.status.phase==\"Running\")].metadata.name}
   register: _ops_cluster_pods
 
 - name: "Getting ES version for logging-es-ops cluster"

+ 2 - 2
roles/openshift_logging_elasticsearch/tasks/restart_cluster.yml

@@ -19,7 +19,7 @@
 
 ## get all pods for the cluster
 - command: >
-    oc get pod -l component={{ _cluster_component }},provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[*].metadata.name}
+    oc get pod -l component={{ _cluster_component }},provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[?(@.status.phase==\"Running\")].metadata.name}
   register: _cluster_pods
 
 - name: "Disable shard balancing for logging-{{ _cluster_component }} cluster"
@@ -64,7 +64,7 @@
 
 ## we may need a new first pod to run against -- fetch them all again
 - command: >
-    oc get pod -l component={{ _cluster_component }},provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[*].metadata.name}
+    oc get pod -l component={{ _cluster_component }},provider=openshift -n {{ openshift_logging_elasticsearch_namespace }} -o jsonpath={.items[?(@.status.phase==\"Running\")].metadata.name}
   register: _cluster_pods
 
 - name: "Enable shard balancing for logging-{{ _cluster_component }} cluster"