From 89752337888d4ad6902b78f5440fd6297c8a9a3a Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 22 Feb 2019 11:04:50 -0500 Subject: [PATCH] Finish migration of fluentd to daemonset --- cluster/addons/fluentd-elasticsearch/README.md | 4 ---- cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml | 2 -- cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml | 1 - cluster/gce/config-default.sh | 8 +------- cluster/gce/config-test.sh | 8 +------- 5 files changed, 2 insertions(+), 21 deletions(-) diff --git a/cluster/addons/fluentd-elasticsearch/README.md b/cluster/addons/fluentd-elasticsearch/README.md index 0763b127656..36ed4028a63 100644 --- a/cluster/addons/fluentd-elasticsearch/README.md +++ b/cluster/addons/fluentd-elasticsearch/README.md @@ -52,10 +52,6 @@ Fluentd is deployed as a [DaemonSet][daemonSet] which spawns a pod on each node that reads logs, generated by kubelet, container runtime and containers and sends them to Elasticsearch. -**Note:** in order for Fluentd to work, every Kubernetes node must be labeled -with `beta.kubernetes.io/fluentd-ds-ready=true`, as otherwise the Fluentd -DaemonSet will ignore them. - Learn more in the [official Kubernetes documentation][k8sElasticsearchDocs]. ## Building diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index c3df2ac253d..e0b97e30060 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml @@ -95,8 +95,6 @@ spec: readOnly: true - name: config-volume mountPath: /etc/fluent/config.d - nodeSelector: - beta.kubernetes.io/fluentd-ds-ready: "true" terminationGracePeriodSeconds: 30 volumes: - name: varlog diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml index c05de8f887e..95d48e92bc0 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml @@ -103,7 +103,6 @@ spec: fieldPath: metadata.namespace # END_PROMETHEUS_TO_SD nodeSelector: - beta.kubernetes.io/fluentd-ds-ready: "true" beta.kubernetes.io/os: linux terminationGracePeriodSeconds: 60 tolerations: diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 34753dc7a5a..28437f4724a 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -38,13 +38,7 @@ MASTER_ROOT_DISK_SIZE=${MASTER_ROOT_DISK_SIZE:-$(get-master-root-disk-size)} NODE_DISK_TYPE=${NODE_DISK_TYPE:-pd-standard} NODE_DISK_SIZE=${NODE_DISK_SIZE:-100GB} NODE_LOCAL_SSDS=${NODE_LOCAL_SSDS:-0} - -# Historically fluentd was a manifest pod and then was migrated to DaemonSet. -# To avoid situation during cluster upgrade when there are two instances -# of fluentd running on a node, kubelet need to mark node on which -# fluentd is not running as a manifest pod with appropriate label. -# TODO(piosz): remove this in 1.8 -NODE_LABELS="${KUBE_NODE_LABELS:-beta.kubernetes.io/fluentd-ds-ready=true}" +NODE_LABELS="${KUBE_NODE_LABELS:-}" WINDOWS_NODE_LABELS="${WINDOWS_NODE_LABELS:-}" # An extension to local SSDs allowing users to specify block/fs and SCSI/NVMe devices diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 2a424bbbbe6..a568df26c21 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -38,13 +38,7 @@ MASTER_ROOT_DISK_SIZE=${MASTER_ROOT_DISK_SIZE:-$(get-master-root-disk-size)} NODE_DISK_TYPE=${NODE_DISK_TYPE:-pd-standard} NODE_DISK_SIZE=${NODE_DISK_SIZE:-100GB} NODE_LOCAL_SSDS=${NODE_LOCAL_SSDS:-0} - -# Historically fluentd was a manifest pod and then was migrated to DaemonSet. -# To avoid situation during cluster upgrade when there are two instances -# of fluentd running on a node, kubelet need to mark node on which -# fluentd is not running as a manifest pod with appropriate label. -# TODO(piosz): remove this in 1.8 -NODE_LABELS="${KUBE_NODE_LABELS:-beta.kubernetes.io/fluentd-ds-ready=true}" +NODE_LABELS="${KUBE_NODE_LABELS:-}" WINDOWS_NODE_LABELS="${WINDOWS_NODE_LABELS:-}" # An extension to local SSDs allowing users to specify block/fs and SCSI/NVMe devices