github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27990 from adityakali/fluentd

Browse Source 
Automatic merge from submit-queue

Use new fluentd-gcp container with journal support

This makes use of the systemd-journal support added in PR #27981
and Fixes #27446.

cc/ @a-robinson @andyzheng0831
This commit is contained in:
k8s-merge-robot 2016-06-23 18:48:53 -07:00 committed by GitHub
commit 5ccd1e7cf6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/gci/configure-helper.sh
View File

@ -868,7 +868,7 @@ function start-fluentd {
echo "Start fluentd pod"
if [[ "${ENABLE_NODE_LOGGING:-}" == "true" ]]; then
if [[ "${LOGGING_DESTINATION:-}" == "gcp" ]]; then
cp "${KUBE_HOME}/kube-manifests/kubernetes/fluentd-gcp.yaml" /etc/kubernetes/manifests/
cp "${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty/gci/fluentd-gcp.yaml" /etc/kubernetes/manifests/
elif [[ "${LOGGING_DESTINATION:-}" == "elasticsearch" && "${KUBERNETES_MASTER:-}" != "true" ]]; then
# Running fluentd-es on the master is pointless, as it can't communicate
# with elasticsearch from there in the default configuration.