Allowing resource management of metrics-server container. Will allow …

…fine-tuning of resource allocation and solving throttling issues. Setting defaults as per the current request & limit allocation: cpu: 43m, memory 55Mi for both limits & requests. (#6652) Signed-off-by: Brendan Holmes <holmesb@users.noreply.github.com> Co-authored-by: Brendan Holmes <holmesb@users.noreply.github.com>
kubernetes-sigs · Sep 10, 2020 · a99ba3b · a99ba3b
1 parent 05ff4a5
commit a99ba3b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/roles/kubernetes-apps/metrics_server/defaults/main.yml b/roles/kubernetes-apps/metrics_server/defaults/main.yml
@@ -6,6 +6,10 @@ metrics_server_cpu: 40m
 metrics_server_memory: 35Mi
 metrics_server_memory_per_node: 4Mi
 metrics_server_min_cluster_size: 5
+metrics_server_limits_cpu: 43m
+metrics_server_limits_memory: 55Mi
+metrics_server_requests_cpu: 43m
+metrics_server_requests_memory: 55Mi
 addon_resizer_limits_cpu: 100m
 addon_resizer_limits_memory: 300Mi
 addon_resizer_requests_cpu: 5m

diff --git a/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2 b/roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
@@ -73,6 +73,13 @@ spec:
           runAsGroup: 10001
           runAsNonRoot: true
           runAsUser: 10001
+        resources:
+          limits:
+            cpu: {{ metrics_server_limits_cpu }}
+            memory: {{ metrics_server_limits_memory }}
+          requests:
+            cpu: {{ metrics_server_requests_cpu }}
+            memory: {{ metrics_server_requests_memory }}
       - name: metrics-server-nanny
         image: {{ addon_resizer_image_repo }}:{{ addon_resizer_image_tag }}
         imagePullPolicy: {{ k8s_image_pull_policy }}