github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-30 21:30:16 +00:00
Code Issues Projects Releases Wiki Activity

Clean up selft-set node labels

Browse Source
This commit is contained in:
Gustavo Paiva
2019-06-20 00:06:02 -03:00
parent 96a2f12b4e
commit ca3519c7ad
6 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/addons/ip-masq-agent/ip-masq-agent.yaml
View File

@@ -46,8 +46,7 @@ spec:
- name: config - name: config
mountPath: /etc/config mountPath: /etc/config
nodeSelector: nodeSelector:
# TODO(liggitt): switch to node.kubernetes.io/masq-agent-ds-ready in 1.16 node.kubernetes.io/masq-agent-ds-ready: "true"
beta.kubernetes.io/masq-agent-ds-ready: "true"
volumes: volumes:
- name: config - name: config
configMap: configMap:

3
cluster/addons/kube-proxy/kube-proxy-ds.yaml
View File

@@ -27,8 +27,7 @@ spec:
priorityClassName: system-node-critical priorityClassName: system-node-critical
hostNetwork: true hostNetwork: true
nodeSelector: nodeSelector:
# TODO(liggitt): switch to node.kubernetes.io/kube-proxy-ds-ready in 1.16 node.kubernetes.io/kube-proxy-ds-ready: "true"
beta.kubernetes.io/kube-proxy-ds-ready: "true"
tolerations: tolerations:
- operator: "Exists" - operator: "Exists"
effect: "NoExecute" effect: "NoExecute"

3
cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
View File

@@ -88,7 +88,6 @@ spec:
fieldPath: metadata.namespace fieldPath: metadata.namespace
# END_PROMETHEUS_TO_SD # END_PROMETHEUS_TO_SD
nodeSelector: nodeSelector:
# TODO(liggitt): switch to cloud.google.com/metadata-proxy-ready=true in v1.16 cloud.google.com/metadata-proxy-ready: "true"
beta.kubernetes.io/metadata-proxy-ready: "true"
beta.kubernetes.io/os: linux beta.kubernetes.io/os: linux
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30

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

@@ -220,8 +220,6 @@ METADATA_CONCEALMENT_NO_FIREWALL="${METADATA_CONCEALMENT_NO_FIREWALL:-false}" #
if [[ ${ENABLE_METADATA_CONCEALMENT:-} == "true" ]]; then if [[ ${ENABLE_METADATA_CONCEALMENT:-} == "true" ]]; then
# Put the necessary label on the node so the daemonset gets scheduled. # Put the necessary label on the node so the daemonset gets scheduled.
NODE_LABELS="${NODE_LABELS},cloud.google.com/metadata-proxy-ready=true" NODE_LABELS="${NODE_LABELS},cloud.google.com/metadata-proxy-ready=true"
# TODO(liggitt): remove this in v1.16
NODE_LABELS="${NODE_LABELS},beta.kubernetes.io/metadata-proxy-ready=true"
# Add to the provider custom variables. # Add to the provider custom variables.
PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_METADATA_CONCEALMENT METADATA_CONCEALMENT_NO_FIREWALL" PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_METADATA_CONCEALMENT METADATA_CONCEALMENT_NO_FIREWALL"
fi fi

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

@@ -260,8 +260,6 @@ METADATA_CONCEALMENT_NO_FIREWALL="${METADATA_CONCEALMENT_NO_FIREWALL:-false}" #
if [[ ${ENABLE_METADATA_CONCEALMENT:-} == "true" ]]; then if [[ ${ENABLE_METADATA_CONCEALMENT:-} == "true" ]]; then
# Put the necessary label on the node so the daemonset gets scheduled. # Put the necessary label on the node so the daemonset gets scheduled.
NODE_LABELS="${NODE_LABELS},cloud.google.com/metadata-proxy-ready=true" NODE_LABELS="${NODE_LABELS},cloud.google.com/metadata-proxy-ready=true"
# TODO(liggitt): remove this in v1.16
NODE_LABELS="${NODE_LABELS},beta.kubernetes.io/metadata-proxy-ready=true"
# Add to the provider custom variables. # Add to the provider custom variables.
PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_METADATA_CONCEALMENT METADATA_CONCEALMENT_NO_FIREWALL" PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_METADATA_CONCEALMENT METADATA_CONCEALMENT_NO_FIREWALL"
fi fi

3
cluster/gce/util.sh
View File

@@ -611,8 +611,7 @@ function build-linux-node-labels {
if [[ "${KUBE_PROXY_DAEMONSET:-}" == "true" && "${master}" != "true" ]]; then if [[ "${KUBE_PROXY_DAEMONSET:-}" == "true" && "${master}" != "true" ]]; then
# Add kube-proxy daemonset label to node to avoid situation during cluster # Add kube-proxy daemonset label to node to avoid situation during cluster
# upgrade/downgrade when there are two instances of kube-proxy running on a node. # upgrade/downgrade when there are two instances of kube-proxy running on a node.
# TODO(liggitt): drop beta.kubernetes.io/kube-proxy-ds-ready in 1.16 node_labels="node.kubernetes.io/kube-proxy-ds-ready=true"
node_labels="node.kubernetes.io/kube-proxy-ds-ready=true,beta.kubernetes.io/kube-proxy-ds-ready=true"
fi fi
if [[ -n "${NODE_LABELS:-}" ]]; then if [[ -n "${NODE_LABELS:-}" ]]; then
node_labels="${node_labels:+${node_labels},}${NODE_LABELS}" node_labels="${node_labels:+${node_labels},}${NODE_LABELS}"