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

Add metrics_server_resizer option (#8018) (#8031)

Browse source 
The addon-resizer container can reduce resource limits of cpu and
memory of metrics-server container in the pod, and that caused
OOMKilled.
In addition, the original metrics-server manifest doesn't contain
the addon-resizer container as [1].
So this adds metrics_server_resizer option to control the addon-resizer
container deployment and the default value is false to make it stable
for most environments.

This is a cherry-pick of 8d3961edbe

[1]: 527679e5e8/manifests/base/deployment.yaml
This commit is contained in:
Kenichi Omichi 2021-09-28 11:15:16 -07:00 committed by GitHub
parent 6cfa3bbb22
commit bd4407199c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
inventory/sample/group_vars/k8s_cluster/addons.yml
View file

@ -14,6 +14,7 @@ registry_enabled: false
# Metrics Server deployment # Metrics Server deployment
metrics_server_enabled: false metrics_server_enabled: false
# metrics_server_resizer: false
# metrics_server_kubelet_insecure_tls: true # metrics_server_kubelet_insecure_tls: true
# metrics_server_metric_resolution: 15s # metrics_server_metric_resolution: 15s
# metrics_server_kubelet_preferred_address_types: "InternalIP" # metrics_server_kubelet_preferred_address_types: "InternalIP"

1
roles/kubernetes-apps/metrics_server/defaults/main.yml
View file

@ -1,4 +1,5 @@
--- ---
metrics_server_resizer: false
metrics_server_kubelet_insecure_tls: true metrics_server_kubelet_insecure_tls: true
metrics_server_kubelet_preferred_address_types: "InternalIP" metrics_server_kubelet_preferred_address_types: "InternalIP"
metrics_server_metric_resolution: 15s metrics_server_metric_resolution: 15s

2
roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
View file

@ -81,6 +81,7 @@ spec:
requests: requests:
cpu: {{ metrics_server_requests_cpu }} cpu: {{ metrics_server_requests_cpu }}
memory: {{ metrics_server_requests_memory }} memory: {{ metrics_server_requests_memory }}
{% if metrics_server_resizer %}
- name: metrics-server-nanny - name: metrics-server-nanny
image: {{ addon_resizer_image_repo }}:{{ addon_resizer_image_tag }} image: {{ addon_resizer_image_repo }}:{{ addon_resizer_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
@ -118,6 +119,7 @@ spec:
# Specifies the smallest cluster (defined in number of nodes) # Specifies the smallest cluster (defined in number of nodes)
# resources will be scaled to. # resources will be scaled to.
- --minClusterSize={{ metrics_server_min_cluster_size }} - --minClusterSize={{ metrics_server_min_cluster_size }}
{% endif %}
volumes: volumes:
- name: metrics-server-config-volume - name: metrics-server-config-volume
configMap: configMap: