github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94681 from mborsz/logdumpcp

Browse Source 
log-dump.sh: Do not modify logexporter-daemonset.yaml in-place.
This commit is contained in:
Kubernetes Prow Robot 2020-09-22 02:04:49 -07:00 committed by GitHub
commit 51ffb495f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cluster/log-dump/log-dump.sh
View File

@ -86,6 +86,7 @@ function setup() {
echo "LOG_DUMP_SSH_USER not set, but required when using log_dump_custom_get_instances" echo "LOG_DUMP_SSH_USER not set, but required when using log_dump_custom_get_instances"
exit 1 exit 1
fi fi
source "${KUBE_ROOT}/hack/lib/util.sh"
} }
function log-dump-ssh() { function log-dump-ssh() {
@ -504,18 +505,23 @@ function dump_nodes_with_logexporter() {
local -r logexport_sleep_seconds="$(( 90 + NUM_NODES / 3 ))" local -r logexport_sleep_seconds="$(( 90 + NUM_NODES / 3 ))"
# Fill in the parameters in the logexporter daemonset template. # Fill in the parameters in the logexporter daemonset template.
sed -i'' -e "s@{{.LogexporterNamespace}}@${logexporter_namespace}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml" local -r tmp="${KUBE_TEMP}/logexporter"
sed -i'' -e "s@{{.ServiceAccountCredentials}}@${service_account_credentials}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml" local -r manifest_yaml="${tmp}/logexporter-daemonset.yaml"
sed -i'' -e "s@{{.CloudProvider}}@${cloud_provider}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml" mkdir -p "${tmp}"
sed -i'' -e "s@{{.GCSPath}}@${gcs_artifacts_dir}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml" cp "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml" "${manifest_yaml}"
sed -i'' -e "s@{{.EnableHollowNodeLogs}}@${enable_hollow_node_logs}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml"
sed -i'' -e "s@{{.DumpSystemdJournal}}@${dump_systemd_journal}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml" sed -i'' -e "s@{{.LogexporterNamespace}}@${logexporter_namespace}@g" "${manifest_yaml}"
sed -i'' -e "s@{{.ExtraLogFiles}}@${extra_log_files}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml" sed -i'' -e "s@{{.ServiceAccountCredentials}}@${service_account_credentials}@g" "${manifest_yaml}"
sed -i'' -e "s@{{.ExtraSystemdServices}}@${extra_systemd_services}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml" sed -i'' -e "s@{{.CloudProvider}}@${cloud_provider}@g" "${manifest_yaml}"
sed -i'' -e "s@{{.GCSPath}}@${gcs_artifacts_dir}@g" "${manifest_yaml}"
sed -i'' -e "s@{{.EnableHollowNodeLogs}}@${enable_hollow_node_logs}@g" "${manifest_yaml}"
sed -i'' -e "s@{{.DumpSystemdJournal}}@${dump_systemd_journal}@g" "${manifest_yaml}"
sed -i'' -e "s@{{.ExtraLogFiles}}@${extra_log_files}@g" "${manifest_yaml}"
sed -i'' -e "s@{{.ExtraSystemdServices}}@${extra_systemd_services}@g" "${manifest_yaml}"
# Create the logexporter namespace, service-account secret and the logexporter daemonset within that namespace. # Create the logexporter namespace, service-account secret and the logexporter daemonset within that namespace.
KUBECTL="${KUBE_ROOT}/cluster/kubectl.sh" KUBECTL="${KUBE_ROOT}/cluster/kubectl.sh"
if ! "${KUBECTL}" create -f "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml"; then if ! "${KUBECTL}" create -f "${manifest_yaml}"; then
echo "Failed to create logexporter daemonset.. falling back to logdump through SSH" echo "Failed to create logexporter daemonset.. falling back to logdump through SSH"
"${KUBECTL}" delete namespace "${logexporter_namespace}" || true "${KUBECTL}" delete namespace "${logexporter_namespace}" || true
dump_nodes "${NODE_NAMES[@]}" dump_nodes "${NODE_NAMES[@]}"
@ -629,6 +635,7 @@ function detect_node_failures() {
function main() { function main() {
setup setup
kube::util::ensure-temp-dir
# Copy master logs to artifacts dir locally (through SSH). # Copy master logs to artifacts dir locally (through SSH).
echo "Dumping logs from master locally to '${report_dir}'" echo "Dumping logs from master locally to '${report_dir}'"
dump_masters dump_masters