Merge pull request #317 from gcs278/master

Bug 2103283: Add timeout to oc cp command to fix must-gather delays when routers are terminating
openshift · Jul 6, 2022 · 634f105 · 634f105
2 parents 83e6822 + d7a561e
commit 634f105
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/collection-scripts/gather_haproxy_config b/collection-scripts/gather_haproxy_config
@@ -11,7 +11,7 @@ function gather_haproxy_config {
     for IC in ${INGRESS_CONTROLLERS}; do
         PODS=$(oc get pods -n openshift-ingress --no-headers -o custom-columns=":metadata.name" --selector ingresscontroller.operator.openshift.io/deployment-ingresscontroller="${IC}")
         for POD in ${PODS}; do
-            oc cp openshift-ingress/"${POD}":/var/lib/haproxy/conf/haproxy.config "${HAPROXY_CONFIG_PATH}"/"${IC}"/"${POD}"/haproxy.config &
+            timeout -v 3m oc cp openshift-ingress/"${POD}":/var/lib/haproxy/conf/haproxy.config "${HAPROXY_CONFIG_PATH}"/"${IC}"/"${POD}"/haproxy.config &
             PIDS+=($!)
         done
     done