Skip to content

K
k3s
Commit b54077b0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #43472 from piosz/annotation-rename

Automatic merge from submit-queue Renamed fluentd-ds-ready annotation We don't want to have alpha annotation as production ready solution. Low risk change, only rename.
parents 2b6e318e 8968ac5c
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
View file @ b54077b0
...@@ -41,7 +41,7 @@ spec: ...@@ -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"
......
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View file @ b54077b0
...@@ -89,7 +89,7 @@ spec: ...@@ -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"
......
cluster/gce/config-default.sh
View file @ b54077b0
...@@ -111,7 +111,7 @@ ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-influxdb}" ...@@ -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}"
......
cluster/gce/config-test.sh
View file @ b54077b0
...@@ -142,7 +142,7 @@ KUBEPROXY_TEST_ARGS="${KUBEPROXY_TEST_ARGS:-} ${TEST_CLUSTER_API_CONTENT_TYPE}" ...@@ -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}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment