Browse Source

metrics-server: Unconditional control-plane tolerations

There is no harm on having unneeded toleration when control-plane node
are not tainted, so simplify the template to always use the toleration.
pull/11568/head
Max Gautier 6 days ago
parent
commit
dba00f2d85
Failed to extract signature
2 changed files with 0 additions and 9 deletions
  1. 5
      roles/kubernetes-apps/metrics_server/tasks/main.yml
  2. 4
      roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2

5
roles/kubernetes-apps/metrics_server/tasks/main.yml

@ -1,9 +1,4 @@
---
# If all control plane nodes have the node role, there are no tainted control plane nodes and toleration should not be specified.
- name: Check all control plane nodes are node or not
set_fact:
control_plane_nodes_are_not_tainted: "{{ groups['kube_node'] | intersect(groups['kube_control_plane']) == groups['kube_control_plane'] }}"
- name: Metrics Server | Delete addon dir
file:
path: "{{ kube_config_dir }}/addons/metrics_server"

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

@ -85,15 +85,11 @@ spec:
volumes:
- name: tmp
emptyDir: {}
{% if not control_plane_nodes_are_not_tainted or metrics_server_extra_tolerations is defined %}
tolerations:
{% if not control_plane_nodes_are_not_tainted %}
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
{% endif %}
{% if metrics_server_extra_tolerations is defined %}
{{ metrics_server_extra_tolerations | list | to_nice_yaml(indent=2) | indent(8) }}
{% endif %}
{% endif %}
affinity:
podAntiAffinity:

Loading…
Cancel
Save