Skip to content
Snippets Groups Projects
Unverified Commit 8d3961ed authored by Kenichi Omichi's avatar Kenichi Omichi Committed by GitHub
Browse files

Add metrics_server_resizer option (#8018)

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.

[1]: https://github.com/kubernetes-sigs/metrics-server/blob/527679e5e8a103919c935d0575c20741796bc25d/manifests/base/deployment.yaml
parent 4c5328fd
No related branches found
No related tags found
No related merge requests found
...@@ -14,6 +14,7 @@ registry_enabled: false ...@@ -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"
......
--- ---
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
......
...@@ -81,6 +81,7 @@ spec: ...@@ -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: ...@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment