Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
e9212eba
Unverified
Commit
e9212eba
authored
Feb 06, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Feb 06, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #73784 from mm4tt/log_exporter
Propagate dump_systemd_journal to logexporter job.
parents
3dedf4b7
5e617179
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
log-dump.sh
cluster/log-dump/log-dump.sh
+1
-0
logexporter-daemonset.yaml
cluster/log-dump/logexporter-daemonset.yaml
+2
-1
No files found.
cluster/log-dump/log-dump.sh
View file @
e9212eba
...
@@ -349,6 +349,7 @@ function dump_nodes_with_logexporter() {
...
@@ -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@{{.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@{{.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@{{.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.
# 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"
...
...
cluster/log-dump/logexporter-daemonset.yaml
View file @
e9212eba
...
@@ -36,7 +36,7 @@ spec:
...
@@ -36,7 +36,7 @@ spec:
spec
:
spec
:
containers
:
containers
:
-
name
:
logexporter-test
-
name
:
logexporter-test
image
:
gcr.io/k8s-testimages/logexporter:v0.1.
3
image
:
gcr.io/k8s-testimages/logexporter:v0.1.
4
env
:
env
:
-
name
:
NODE_NAME
-
name
:
NODE_NAME
valueFrom
:
valueFrom
:
...
@@ -49,6 +49,7 @@ spec:
...
@@ -49,6 +49,7 @@ spec:
-
--gcs-path={{.GCSPath}}
-
--gcs-path={{.GCSPath}}
-
--gcloud-auth-file-path=/etc/service-account/service-account.json
-
--gcloud-auth-file-path=/etc/service-account/service-account.json
-
--enable-hollow-node-logs={{.EnableHollowNodeLogs}}
-
--enable-hollow-node-logs={{.EnableHollowNodeLogs}}
-
--dump-systemd-journal={{.DumpSystemdJournal}}
-
--sleep-duration=24h
-
--sleep-duration=24h
-
--alsologtostderr
-
--alsologtostderr
volumeMounts
:
volumeMounts
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment