Clean up selft-set node labels

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

View File

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

View File

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

View File

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