github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #73784 from mm4tt/log_exporter 

Propagate dump_systemd_journal to logexporter job.
pull/564/head
Kubernetes Prow Robot 2019-02-06 10:44:48 -08:00 committed by GitHub
parent 3dedf4b7f6 5e6171790b
commit e9212eba2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,6 +349,7 @@ function dump_nodes_with_logexporter() {
sed -i'' -e "s@{{.CloudProvider}}@${cloud_provider}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml"
sed -i'' -e "s@{{.GCSPath}}@${gcs_artifacts_dir}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.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"
# Create the logexporter namespace, service-account secret and the logexporter daemonset within that namespace.
KUBECTL="${KUBE_ROOT}/cluster/kubectl.sh"

3
cluster/log-dump/logexporter-daemonset.yaml
View File

@ -36,7 +36,7 @@ spec:
spec:
containers:
- name: logexporter-test
image: gcr.io/k8s-testimages/logexporter:v0.1.3
image: gcr.io/k8s-testimages/logexporter:v0.1.4
env:
- name: NODE_NAME
valueFrom:
@ -49,6 +49,7 @@ spec:
- --gcs-path={{.GCSPath}}
- --gcloud-auth-file-path=/etc/service-account/service-account.json
- --enable-hollow-node-logs={{.EnableHollowNodeLogs}}
- --dump-systemd-journal={{.DumpSystemdJournal}}
- --sleep-duration=24h
- --alsologtostderr
volumeMounts: