External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-06 11:11:15 -03:30
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix for unknown 'kubernetes.io' or 'k8s.io' labels specified with --node-labels (#4320)" (#4553)

Browse Source 
This reverts commit 586ad89d50.
This commit is contained in:
Maxime Guyot
2019-04-17 16:58:06 +02:00
committed by Kubernetes Prow Robot
parent 1cf76a10db
commit ec3daedf9e
18 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
View File

@@ -30,7 +30,7 @@ spec:
beta.kubernetes.io/os: linux
serviceAccountName: coredns
tolerations:
- key: node.kubernetes.io/master
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: "CriticalAddonsOnly"
operator: "Exists"
@@ -46,7 +46,7 @@ spec:
- weight: 100
preference:
matchExpressions:
- key: node.kubernetes.io/master
- key: node-role.kubernetes.io/master
operator: In
values:
- ""

2
roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
View File

@@ -195,7 +195,7 @@ spec:
serviceAccountName: kubernetes-dashboard
{% if dashboard_master_toleration %}
tolerations:
- key: node.kubernetes.io/master
- key: node-role.kubernetes.io/master
effect: NoSchedule
{% endif %}

4
roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
View File

@@ -45,7 +45,7 @@ spec:
tolerations:
- effect: NoSchedule
operator: Equal
key: node.kubernetes.io/master
key: node-role.kubernetes.io/master
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
@@ -58,7 +58,7 @@ spec:
- weight: 100
preference:
matchExpressions:
- key: node.kubernetes.io/master
- key: node-role.kubernetes.io/master
operator: In
values:
- ""

4
roles/kubernetes-apps/cloud_controller/oci/templates/oci-cloud-provider.yml.j2
View File

@@ -35,12 +35,12 @@ spec:
serviceAccountName: cloud-controller-manager
hostNetwork: true
nodeSelector:
node.kubernetes.io/master: ""
node-role.kubernetes.io/master: ""
tolerations:
- key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
effect: NoSchedule
- key: node.kubernetes.io/master
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
volumes:

2
roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
View File

@@ -2,7 +2,7 @@
ingress_nginx_namespace: "ingress-nginx"
ingress_nginx_host_network: false
ingress_nginx_nodeselector:
node.kubernetes.io/node: ""
node-role.kubernetes.io/node: ""
ingress_nginx_tolerations: []
ingress_nginx_insecure_port: 80
ingress_nginx_secure_port: 443

4
roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
View File

@@ -116,7 +116,7 @@ spec:
name: metrics-server-config
{% if not masters_are_not_tainted %}
tolerations:
- key: node.kubernetes.io/master
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: "CriticalAddonsOnly"
operator: "Exists"
@@ -127,7 +127,7 @@ spec:
- weight: 100
preference:
matchExpressions:
- key: node.kubernetes.io/master
- key: node-role.kubernetes.io/master
operator: In
values:
- ""

2
roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
View File

@@ -29,7 +29,7 @@ spec:
tolerations:
- key: CriticalAddonsOnly
operator: Exists
- key: node.kubernetes.io/master
- key: node-role.kubernetes.io/master
effect: NoSchedule
{% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: system-cluster-critical