Remove outdated CriticalAddonsOnly toleration and critical-pod annotation (#6202)
This commit is contained in:
parent
f2ca929a4a
commit
101686c665
16 changed files with 0 additions and 46 deletions
|
@ -31,8 +31,6 @@ spec:
|
|||
tolerations:
|
||||
- key: node-role.kubernetes.io/master
|
||||
effect: NoSchedule
|
||||
- key: "CriticalAddonsOnly"
|
||||
operator: "Exists"
|
||||
{% if dns_extra_tolerations | default(None) %}
|
||||
{{ dns_extra_tolerations | list | to_nice_yaml(indent=2) | indent(8) }}
|
||||
{% endif %}
|
||||
|
|
|
@ -30,7 +30,6 @@ spec:
|
|||
labels:
|
||||
k8s-app: dns-autoscaler{{ coredns_ordinal_suffix }}
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ""
|
||||
seccomp.security.alpha.kubernetes.io/pod: 'runtime/default'
|
||||
spec:
|
||||
priorityClassName: system-cluster-critical
|
||||
|
@ -43,8 +42,6 @@ spec:
|
|||
- effect: NoSchedule
|
||||
operator: Equal
|
||||
key: node-role.kubernetes.io/master
|
||||
- key: "CriticalAddonsOnly"
|
||||
operator: "Exists"
|
||||
affinity:
|
||||
podAntiAffinity:
|
||||
requiredDuringSchedulingIgnoredDuringExecution:
|
||||
|
|
|
@ -27,8 +27,6 @@ spec:
|
|||
operator: "Exists"
|
||||
- effect: NoExecute
|
||||
operator: "Exists"
|
||||
- key: "CriticalAddonsOnly"
|
||||
operator: "Exists"
|
||||
containers:
|
||||
- name: node-cache
|
||||
image: "{{ nodelocaldns_image_repo }}:{{ nodelocaldns_image_tag }}"
|
||||
|
|
|
@ -20,9 +20,6 @@ spec:
|
|||
kubernetes.io/os: linux
|
||||
serviceAccount: ebs-csi-controller-sa
|
||||
priorityClassName: system-cluster-critical
|
||||
tolerations:
|
||||
- key: CriticalAddonsOnly
|
||||
operator: Exists
|
||||
containers:
|
||||
- name: ebs-plugin
|
||||
image: {{ aws_ebs_csi_plugin_image_repo }}:{{ aws_ebs_csi_plugin_image_tag }}
|
||||
|
|
|
@ -20,9 +20,6 @@ spec:
|
|||
kubernetes.io/os: linux
|
||||
hostNetwork: true
|
||||
priorityClassName: system-node-critical
|
||||
tolerations:
|
||||
- key: CriticalAddonsOnly
|
||||
operator: Exists
|
||||
containers:
|
||||
- name: ebs-plugin
|
||||
securityContext:
|
||||
|
|
|
@ -120,8 +120,6 @@ spec:
|
|||
tolerations:
|
||||
- key: node-role.kubernetes.io/master
|
||||
effect: NoSchedule
|
||||
- key: "CriticalAddonsOnly"
|
||||
operator: "Exists"
|
||||
{% endif %}
|
||||
affinity:
|
||||
nodeAffinity:
|
||||
|
|
|
@ -24,8 +24,6 @@ spec:
|
|||
hostNetwork: true
|
||||
serviceAccountName: calico-kube-controllers
|
||||
tolerations:
|
||||
- key: CriticalAddonsOnly
|
||||
operator: Exists
|
||||
- key: node-role.kubernetes.io/master
|
||||
effect: NoSchedule
|
||||
priorityClassName: system-cluster-critical
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue