C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[2.19] Add missing configuration for extra tolerations (#8999)

Browse source 
* 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>
This commit is contained in:
Sébastien Masset 2022-06-23 10:41:44 +02:00 committed by GitHub
parent b4951da405
commit 00550ba832
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/kubernetes-apps/ansible/defaults/main.yml
View file

@ -26,6 +26,7 @@ nodelocaldns_secondary_prometheus_port: 9255
dns_autoscaler_cpu_requests: 20m dns_autoscaler_cpu_requests: 20m
dns_autoscaler_memory_requests: 10Mi dns_autoscaler_memory_requests: 10Mi
dns_autoscaler_deployment_nodeselector: "kubernetes.io/os: linux" dns_autoscaler_deployment_nodeselector: "kubernetes.io/os: linux"
# dns_autoscaler_extra_tolerations: [{effect: NoSchedule, operator: "Exists"}]
# etcd metrics # etcd metrics
# etcd_metrics_service_labels: # etcd_metrics_service_labels:
@ -83,3 +84,6 @@ dashboard_master_toleration: true
# Override dashboard default settings # Override dashboard default settings
dashboard_token_ttl: 900 dashboard_token_ttl: 900
dashboard_skip_login: false dashboard_skip_login: false
# Policy Controllers
# policy_controller_extra_tolerations: [{effect: NoSchedule, operator: "Exists"}]

2
roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
View file

@ -34,7 +34,7 @@ spec:
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane - key: node-role.kubernetes.io/control-plane
effect: NoSchedule 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) }} {{ dns_extra_tolerations | list | to_nice_yaml(indent=2) | indent(8) }}
{% endif %} {% endif %}
affinity: affinity:

3
roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
View file

@ -45,6 +45,9 @@ spec:
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/control-plane 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: affinity:
podAntiAffinity: podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:

3
roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
View file

@ -28,6 +28,9 @@ spec:
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane - key: node-role.kubernetes.io/control-plane
effect: NoSchedule 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 priorityClassName: system-cluster-critical
containers: containers:
- name: calico-kube-controllers - name: calico-kube-controllers