Browse Source
[MASTER] Add missing configuration for extra tolerations (#8908 )
* Added new configuration item for extra tolerations in policy controllers
Signed-off-by: Sébastien Masset <smt.masset@gmail.com>
* Added new configuration item for extra tolerations in DNS autoscaler
Signed-off-by: Sébastien Masset <smt.masset@gmail.com>
* Aligned existing handling of extra DNS tolerations
Signed-off-by: Sébastien Masset <smt.masset@gmail.com>
pull/9012/head
Sébastien Masset
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
11 additions and
1 deletions
roles/kubernetes-apps/ansible/defaults/main.yml
roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
@ -26,6 +26,7 @@ nodelocaldns_secondary_prometheus_port: 9255
dns_autoscaler_cpu_requests : 20m
dns_autoscaler_memory_requests : 10Mi
dns_autoscaler_deployment_nodeselector : "kubernetes.io/os: linux"
# dns_autoscaler_extra_tolerations: [{effect: NoSchedule, operator: "Exists"}]
# etcd metrics
# etcd_metrics_service_labels:
@ -83,3 +84,6 @@ dashboard_master_toleration: true
# Override dashboard default settings
dashboard_token_ttl : 900
dashboard_skip_login : false
# Policy Controllers
# policy_controller_extra_tolerations: [{effect: NoSchedule, operator: "Exists"}]
@ -34,7 +34,7 @@ spec:
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
{% if dns_extra_tolerations | default(None) %}
{% if dns_extra_tolerations is defined %}
{{ dns_extra_tolerations | list | to_nice_yaml(indent=2) | indent(8) }}
{% endif %}
affinity:
@ -45,6 +45,9 @@ spec:
key: node-role.kubernetes.io/master
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
{% if dns_autoscaler_extra_tolerations is defined %}
{{ dns_autoscaler_extra_tolerations | list | to_nice_yaml(indent=2) | indent(8) }}
{% endif %}
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
@ -28,6 +28,9 @@ spec:
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
{% if policy_controller_extra_tolerations is defined %}
{{ policy_controller_extra_tolerations | list | to_nice_yaml(indent=2) | indent(8) }}
{% endif %}
priorityClassName: system-cluster-critical
containers:
- name: calico-kube-controllers