Skip to content

Commit

Permalink
Use new fluentd-gcp container with journal support
Browse files Browse the repository at this point in the history
This makes use of the systemd-journal support added in PR kubernetes#27981
and Fixes kubernetes#27446.
  • Loading branch information
adityakali authored and a-robinson committed Jun 24, 2016
1 parent 5824896 commit 094a931
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cluster/gce/gci/configure-helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 094a931

Please sign in to comment.