mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 22:46:12 +00:00
Use new fluentd-gcp container with journal support
This makes use of the systemd-journal support added in PR #27981 and Fixes #27446.
This commit is contained in:
parent
e294b23674
commit
72af2b7c21
@ -868,7 +868,7 @@ function start-fluentd {
|
|||||||
echo "Start fluentd pod"
|
echo "Start fluentd pod"
|
||||||
if [[ "${ENABLE_NODE_LOGGING:-}" == "true" ]]; then
|
if [[ "${ENABLE_NODE_LOGGING:-}" == "true" ]]; then
|
||||||
if [[ "${LOGGING_DESTINATION:-}" == "gcp" ]]; 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
|
elif [[ "${LOGGING_DESTINATION:-}" == "elasticsearch" && "${KUBERNETES_MASTER:-}" != "true" ]]; then
|
||||||
# Running fluentd-es on the master is pointless, as it can't communicate
|
# Running fluentd-es on the master is pointless, as it can't communicate
|
||||||
# with elasticsearch from there in the default configuration.
|
# with elasticsearch from there in the default configuration.
|
||||||
|
Loading…
Reference in New Issue
Block a user