External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-02 17:28:59 -03:30
Code Issues Packages Projects Releases Wiki Activity

metrics_server: add extras nodeselector, affinity, tolerations (#9972)

Browse Source 
* metrics_server: add extras nodeselector, affinity, tolerations

* fix tolerations invalid YAML if undefined
This commit is contained in:
pli
2023-04-26 09:30:16 +02:00
committed by GitHub
parent c2a8d543fb
commit 8727f88e41
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/kubernetes-apps/metrics_server/defaults/main.yml
View File

@@ -9,3 +9,6 @@ metrics_server_requests_cpu: 100m
metrics_server_requests_memory: 200Mi metrics_server_requests_memory: 200Mi
metrics_server_host_network: false metrics_server_host_network: false
metrics_server_replicas: 1 metrics_server_replicas: 1
# metrics_server_extra_tolerations: []
# metrics_server_extra_affinity: {}
# metrics_server_nodeselector: {}

14
roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
View File

@@ -84,12 +84,17 @@ spec:
volumes: volumes:
- name: tmp - name: tmp
emptyDir: {} emptyDir: {}
{% if not masters_are_not_tainted %} {% if not masters_are_not_tainted or metrics_server_extra_tolerations is defined %}
tolerations: tolerations:
{% if not masters_are_not_tainted %}
- 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
effect: NoSchedule effect: NoSchedule
{% endif %}
{% if metrics_server_extra_tolerations is defined %}
{{ metrics_server_extra_tolerations | list | to_nice_yaml(indent=2) | indent(8) }}
{% endif %}
{% endif %} {% endif %}
affinity: affinity:
podAntiAffinity: podAntiAffinity:
@@ -105,3 +110,10 @@ spec:
topologyKey: kubernetes.io/hostname topologyKey: kubernetes.io/hostname
namespaces: namespaces:
- kube-system - kube-system
{% if metrics_server_extra_affinity is defined %}
{{ metrics_server_extra_affinity | to_nice_yaml | indent(width=8) }}
{% endif %}
{% if metrics_server_nodeselector is defined %}
nodeSelector:
{{ metrics_server_nodeselector | to_nice_yaml | indent(width=8) }}
{% endif %}