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

Remove toleration from fluentd-elasticsearch

Browse Source
This commit is contained in:
Mik Vyatskov 2017-04-04 20:17:06 +02:00
parent 12fbc9083e
commit 30f22ad683
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
View File

@ -42,9 +42,6 @@ spec:
readOnly: true
nodeSelector:
beta.kubernetes.io/fluentd-ds-ready: "true"
tolerations:
- key : "node.alpha.kubernetes.io/ismaster"
effect: "NoSchedule"
terminationGracePeriodSeconds: 30
volumes:
- name: varlog

3
cluster/gce/container-linux/configure-helper.sh
View File

@ -1186,9 +1186,6 @@ function start-kube-addons {
sed -i -e "s@{{ *pillar\['cluster_registry_disk_size'\] *}}@${CLUSTER_REGISTRY_DISK_SIZE}@g" "${registry_pvc_file}"
sed -i -e "s@{{ *pillar\['cluster_registry_disk_name'\] *}}@${CLUSTER_REGISTRY_DISK}@g" "${registry_pvc_file}"
fi
# TODO(piosz): figure out how to not run fluentd-es pod from fluentd daemon set on master.
# Running fluentd-es on the master is pointless, as it can't communicate
# with elasticsearch from there in the default configuration.
if [[ "${ENABLE_NODE_LOGGING:-}" == "true" ]] && \
[[ "${LOGGING_DESTINATION:-}" == "elasticsearch" ]] && \
[[ "${ENABLE_CLUSTER_LOGGING:-}" == "true" ]]; then

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

@ -1395,9 +1395,6 @@ function start-kube-addons {
sed -i -e "s@{{ *pillar\['cluster_registry_disk_size'\] *}}@${CLUSTER_REGISTRY_DISK_SIZE}@g" "${registry_pvc_file}"
sed -i -e "s@{{ *pillar\['cluster_registry_disk_name'\] *}}@${CLUSTER_REGISTRY_DISK}@g" "${registry_pvc_file}"
fi
# TODO(piosz): figure out how to not run fluentd-es pod from fluentd daemon set on master.
# Running fluentd-es on the master is pointless, as it can't communicate
# with elasticsearch from there in the default configuration.
if [[ "${ENABLE_NODE_LOGGING:-}" == "true" ]] && \
[[ "${LOGGING_DESTINATION:-}" == "elasticsearch" ]] && \
[[ "${ENABLE_CLUSTER_LOGGING:-}" == "true" ]]; then