Skip to content

K
k3s
Commit 830ae51f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #52420 from shyamjvs/add-debug-statements

Automatic merge from submit-queue Fix bug with gke in logdump
parents 5af069b7 6ae0eb88
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
cluster/log-dump/log-dump.sh
View file @ 830ae51f
...@@ -68,7 +68,10 @@ function setup() { ...@@ -68,7 +68,10 @@ function setup() {
elif [[ "${KUBERNETES_PROVIDER}" == "gke" ]]; then elif [[ "${KUBERNETES_PROVIDER}" == "gke" ]]; then
echo "Using 'use_custom_instance_list' with gke, skipping check for LOG_DUMP_SSH_KEY and LOG_DUMP_SSH_USER" echo "Using 'use_custom_instance_list' with gke, skipping check for LOG_DUMP_SSH_KEY and LOG_DUMP_SSH_USER"
# Source the below script for the ssh-to-node utility function. # Source the below script for the ssh-to-node utility function.
# Hack to save and restore the value of the ZONE env as the script overwrites it.
local gke_zone="${ZONE:-}"
source "${KUBE_ROOT}/cluster/gce/util.sh" source "${KUBE_ROOT}/cluster/gce/util.sh"
ZONE="${gke_zone}"
elif [[ -z "${LOG_DUMP_SSH_KEY:-}" ]]; then elif [[ -z "${LOG_DUMP_SSH_KEY:-}" ]]; then
echo "LOG_DUMP_SSH_KEY not set, but required when using log_dump_custom_get_instances" echo "LOG_DUMP_SSH_KEY not set, but required when using log_dump_custom_get_instances"
exit 1 exit 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment