github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Renamed fluentd-ds-ready annotation

Browse Source
This commit is contained in:
Piotr Szczesniak 2017-03-21 20:48:13 +01:00
parent 63d8e244b6
commit 8968ac5c36
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ spec:
mountPath: /var/lib/docker/containers mountPath: /var/lib/docker/containers
readOnly: true readOnly: true
nodeSelector: nodeSelector:
alpha.kubernetes.io/fluentd-ds-ready: "true" beta.kubernetes.io/fluentd-ds-ready: "true"
tolerations: tolerations:
- key : "node.alpha.kubernetes.io/ismaster" - key : "node.alpha.kubernetes.io/ismaster"
effect: "NoSchedule" effect: "NoSchedule"

2
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View File

@ -89,7 +89,7 @@ spec:
exit 1; exit 1;
fi; fi;
nodeSelector: nodeSelector:
alpha.kubernetes.io/fluentd-ds-ready: "true" beta.kubernetes.io/fluentd-ds-ready: "true"
tolerations: tolerations:
- key: "node.alpha.kubernetes.io/ismaster" - key: "node.alpha.kubernetes.io/ismaster"
effect: "NoSchedule" effect: "NoSchedule"

2
cluster/gce/config-default.sh
View File

@ -111,7 +111,7 @@ ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}"
# of fluentd running on a node, kubelet need to mark node on which # of fluentd running on a node, kubelet need to mark node on which
# fluentd is not running as a manifest pod with appropriate label. # fluentd is not running as a manifest pod with appropriate label.
# TODO(piosz): remove this in 1.8 # TODO(piosz): remove this in 1.8
NODE_LABELS="${KUBE_NODE_LABELS:-alpha.kubernetes.io/fluentd-ds-ready=true}" NODE_LABELS="${KUBE_NODE_LABELS:-beta.kubernetes.io/fluentd-ds-ready=true}"
# Optional: Enable node logging. # Optional: Enable node logging.
ENABLE_NODE_LOGGING="${KUBE_ENABLE_NODE_LOGGING:-true}" ENABLE_NODE_LOGGING="${KUBE_ENABLE_NODE_LOGGING:-true}"

2
cluster/gce/config-test.sh
View File

@ -142,7 +142,7 @@ KUBEPROXY_TEST_ARGS="${KUBEPROXY_TEST_ARGS:-} ${TEST_CLUSTER_API_CONTENT_TYPE}"
# of fluentd running on a node, kubelet need to mark node on which # of fluentd running on a node, kubelet need to mark node on which
# fluentd is not running as a manifest pod with appropriate label. # fluentd is not running as a manifest pod with appropriate label.
# TODO(piosz): remove this in 1.8 # TODO(piosz): remove this in 1.8
NODE_LABELS="${KUBE_NODE_LABELS:-alpha.kubernetes.io/fluentd-ds-ready=true}" NODE_LABELS="${KUBE_NODE_LABELS:-beta.kubernetes.io/fluentd-ds-ready=true}"
# Optional: Enable node logging. # Optional: Enable node logging.
ENABLE_NODE_LOGGING="${KUBE_ENABLE_NODE_LOGGING:-true}" ENABLE_NODE_LOGGING="${KUBE_ENABLE_NODE_LOGGING:-true}"