Browse Source
metrics_server: add extras nodeselector, affinity, tolerations (#9972)
* metrics_server: add extras nodeselector, affinity, tolerations
* fix tolerations invalid YAML if undefined
pull/10026/head
pli
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
16 additions and
1 deletions
-
roles/kubernetes-apps/metrics_server/defaults/main.yml
-
roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
|
|
@ -9,3 +9,6 @@ metrics_server_requests_cpu: 100m |
|
|
|
metrics_server_requests_memory: 200Mi |
|
|
|
metrics_server_host_network: false |
|
|
|
metrics_server_replicas: 1 |
|
|
|
# metrics_server_extra_tolerations: [] |
|
|
|
# metrics_server_extra_affinity: {} |
|
|
|
# metrics_server_nodeselector: {} |
|
|
@ -84,12 +84,17 @@ spec: |
|
|
|
volumes: |
|
|
|
- name: tmp |
|
|
|
emptyDir: {} |
|
|
|
{% if not masters_are_not_tainted %} |
|
|
|
{% if not masters_are_not_tainted or metrics_server_extra_tolerations is defined %} |
|
|
|
tolerations: |
|
|
|
{% if not masters_are_not_tainted %} |
|
|
|
- key: node-role.kubernetes.io/master |
|
|
|
effect: NoSchedule |
|
|
|
- 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: |
|
|
@ -105,3 +110,10 @@ spec: |
|
|
|
topologyKey: kubernetes.io/hostname |
|
|
|
namespaces: |
|
|
|
- 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 %} |