mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-01 01:28:11 -03:30
Remove outdated CriticalAddonsOnly toleration and critical-pod annotation (#6202)
This commit is contained in:
@@ -21,9 +21,6 @@ spec:
|
||||
serviceAccountName: canal
|
||||
tolerations:
|
||||
- operator: Exists
|
||||
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
|
||||
- key: CriticalAddonsOnly
|
||||
operator: "Exists"
|
||||
volumes:
|
||||
# Used by calico/node.
|
||||
- name: lib-modules
|
||||
|
||||
@@ -16,11 +16,6 @@ spec:
|
||||
prometheus.io/port: "9090"
|
||||
prometheus.io/scrape: "true"
|
||||
{% endif %}
|
||||
# This annotation plus the CriticalAddonsOnly toleration makes
|
||||
# cilium to be a critical pod in the cluster, which ensures cilium
|
||||
# gets priority scheduling.
|
||||
# https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ""
|
||||
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated","operator":"Equal","value":"master","effect":"NoSchedule"}]'
|
||||
labels:
|
||||
k8s-app: cilium
|
||||
|
||||
@@ -29,9 +29,6 @@ spec:
|
||||
node-role.kubernetes.io/master: ""
|
||||
tolerations:
|
||||
- operator: Exists
|
||||
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
|
||||
- key: CriticalAddonsOnly
|
||||
operator: "Exists"
|
||||
serviceAccountName: contiv-netmaster
|
||||
containers:
|
||||
- name: contiv-api-proxy
|
||||
|
||||
@@ -21,9 +21,6 @@ spec:
|
||||
hostPID: true
|
||||
tolerations:
|
||||
- operator: Exists
|
||||
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
|
||||
- key: CriticalAddonsOnly
|
||||
operator: "Exists"
|
||||
serviceAccountName: contiv-netplugin
|
||||
containers:
|
||||
- name: contiv-ovs-cleanup
|
||||
|
||||
@@ -23,9 +23,6 @@ spec:
|
||||
node-role.kubernetes.io/master: ""
|
||||
tolerations:
|
||||
- operator: Exists
|
||||
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
|
||||
- key: CriticalAddonsOnly
|
||||
operator: "Exists"
|
||||
initContainers:
|
||||
- name: contiv-etcd-init
|
||||
image: {{ contiv_etcd_init_image_repo }}:{{ contiv_etcd_init_image_tag }}
|
||||
|
||||
@@ -29,9 +29,6 @@ spec:
|
||||
node-role.kubernetes.io/master: ""
|
||||
tolerations:
|
||||
- operator: Exists
|
||||
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
|
||||
- key: CriticalAddonsOnly
|
||||
operator: "Exists"
|
||||
serviceAccountName: contiv-netmaster
|
||||
containers:
|
||||
- name: contiv-netmaster
|
||||
|
||||
@@ -26,9 +26,6 @@ spec:
|
||||
hostPID: true
|
||||
tolerations:
|
||||
- operator: Exists
|
||||
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
|
||||
- key: CriticalAddonsOnly
|
||||
operator: "Exists"
|
||||
serviceAccountName: contiv-netplugin
|
||||
initContainers:
|
||||
- name: contiv-netplugin-init
|
||||
|
||||
@@ -23,9 +23,6 @@ spec:
|
||||
hostPID: true
|
||||
tolerations:
|
||||
- operator: Exists
|
||||
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
|
||||
- key: CriticalAddonsOnly
|
||||
operator: "Exists"
|
||||
containers:
|
||||
# Runs ovs containers on each Kubernetes node.
|
||||
- name: contiv-ovsdb-server
|
||||
|
||||
@@ -112,9 +112,6 @@ spec:
|
||||
{% endif %}
|
||||
tolerations:
|
||||
- operator: Exists
|
||||
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
|
||||
- key: CriticalAddonsOnly
|
||||
operator: "Exists"
|
||||
volumes:
|
||||
{% if kube_router_enable_dsr %}
|
||||
- name: docker-socket
|
||||
|
||||
Reference in New Issue
Block a user