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

GCE: update addon DaemonSets to select node OS

Merge pull request #73220 from yujuhong/gce-os-labels
16000e3a · Kubernetes Prow Robot · GitHub · d57d6062 · 9c892243 · 16000e3a
Unverified Commit 16000e3a authored Jan 29, 2019 by Kubernetes Prow Robot Committed by GitHub Jan 29, 2019
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

fluentd-gcp-ds.yaml cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +1 -0

metadata-proxy.yaml cluster/addons/metadata-proxy/gce/metadata-proxy.yaml +1 -0

No files found.
--- 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