Merge pull request #73220 from yujuhong/gce-os-labels

GCE: update addon DaemonSets to select node OS
2019-01-29 18:22:21 -08:00 · 2019-01-29 18:22:21 -08:00 · 16000e3af7
parent d57d606275 9c892243f6
commit 16000e3af7
2 changed files with 2 additions and 0 deletions
--- 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"
--- 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