Merge pull request #55690 from porridge/debug-curl

Automatic merge from submit-queue (batch tested with PRs 56208, 55690). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Dump last curl output if cluster fails to come up. **What this PR does / why we need it**: This is a step toward solving #55686 **Release note**: ```release-note NONE ```

Merge pull request #55690 from porridge/debug-curl
fff99b72 · Kubernetes Submit Queue · GitHub · 06963c53 · 745db94e · fff99b72
Unverified Commit fff99b72 authored Nov 23, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

util.sh cluster/gce/util.sh +8 -2

No files found.
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -1526,14 +1526,20 @@ function check-cluster() {
  fi

  local start_time=$(date +%s)
+  local curl_out=$(mktemp)
+  kube::util::trap_add "rm -f ${curl_out}" EXIT
  until curl --cacert "${CERT_DIR}/pki/ca.crt" \
          -H "Authorization: Bearer ${KUBE_BEARER_TOKEN}" \
          ${secure} \
-          --max-time 5 --fail --output /dev/null --silent \
-          "https://${KUBE_MASTER_IP}/api/v1/pods"; do
+          --max-time 5 --fail \
+          "https://${KUBE_MASTER_IP}/api/v1/pods" > "${curl_out}" 2>&1; do
      local elapsed=$(($(date +%s) - ${start_time}))
      if [[ ${elapsed} -gt ${KUBE_CLUSTER_INITIALIZATION_TIMEOUT} ]]; then
          echo -e "${color_red}Cluster failed to initialize within ${KUBE_CLUSTER_INITIALIZATION_TIMEOUT} seconds.${color_norm}" >&2
+          echo "Last output from querying API server follows:" >&2
+          echo "-----------------------------------------------------" >&2
+          cat "${curl_out}" >&2
+          echo "-----------------------------------------------------" >&2
          exit 2
      fi
      printf "."