From 9c892243f6af6e9ae54e3a55bdcfa6fecaeb5caf Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Wed, 23 Jan 2019 09:01:40 -0800 Subject: [PATCH] GCE: update addon DaemonSets to select node OS These DaemonSets supports only Linux today, so this change updates the specs to reflect this limitation. The labels have recently been promoted to GA. Using the beta labels for now until node-master version skew problem no longer exists. --- cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml | 1 + cluster/addons/metadata-proxy/gce/metadata-proxy.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml index 7210ae1863..c05de8f887 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml @@ -104,6 +104,7 @@ spec: # END_PROMETHEUS_TO_SD nodeSelector: beta.kubernetes.io/fluentd-ds-ready: "true" + beta.kubernetes.io/os: linux terminationGracePeriodSeconds: 60 tolerations: - operator: "Exists" diff --git a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml index 231f14010b..4c4c29f2d5 100644 --- a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml +++ b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml @@ -89,4 +89,5 @@ spec: # END_PROMETHEUS_TO_SD nodeSelector: beta.kubernetes.io/metadata-proxy-ready: "true" + beta.kubernetes.io/os: linux terminationGracePeriodSeconds: 30