Skip to content

Commit

Permalink
Merge pull request kubernetes#49426 from shyamjvs/logdump-fix
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 48976, 49474, 40050, 49426, 49430)

Fix bug in cluster/log-dump

We're breaking in case KUBECTL is set as "./cluster/kubectl.sh --match-server-version". Moreover we always are using cluster/kubectl.sh as the default and don't want to do match-server-version for the purpose of logexporter.

Also adding owners file so I'm not blocked for approves while making fixes in log-dump. Besides I'll be able to review fixes sent by others.

/cc @wojtek-t
  • Loading branch information
Kubernetes Submit Queue authored Jul 25, 2017
2 parents 2189314 + bf33e2a commit d197ff0
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion cluster/log-dump/log-dump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
# Call this to dump all master and node logs into the folder specified in $1
# (defaults to _artifacts). Only works if the provider supports SSH.

# TODO(shyamjvs): This script should be moved to test/e2e which is where it ideally belongs.
set -o errexit
set -o nounset
set -o pipefail
Expand Down Expand Up @@ -282,7 +283,7 @@ function dump_nodes_with_logexporter() {
sed -i'' -e "s@{{.EnableHollowNodeLogs}}@${enable_hollow_node_logs}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml"

# Create the logexporter namespace, service-account secret and the logexporter daemonset within that namespace.
KUBECTL="${KUBECTL:-${KUBE_ROOT}/cluster/kubectl.sh}"
KUBECTL="${KUBE_ROOT}/cluster/kubectl.sh"
"${KUBECTL}" create -f "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml"

# Give some time for the pods to finish uploading logs.
Expand Down

0 comments on commit d197ff0

Please sign in to comment.