Merge pull request #54852 from kawych/ms_config

Automatic merge from submit-queue (batch tested with PRs 53866, 54852, 55178, 55185, 55130). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Adjust resources for Metrics Server **What this PR does / why we need it**: This PR adjusts resources set for Metrics Server by Pod Nanny to reduce resources usage by core Kubernetes components when enabling Metrics Server. In Kubernetes 1.8 Metrics Server is used only by HPAv2, other use-cases are covered by Heapster. **Release note**: ```release-note NONE ```

Merge pull request #54852 from kawych/ms_config
6a7b3892 · Kubernetes Submit Queue · GitHub · bdeda2fc · 5f5110c6 · 6a7b3892
Unverified Commit 6a7b3892 authored Nov 06, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

metrics-server-deployment.yaml cluster/addons/metrics-server/metrics-server-deployment.yaml +1 -1

No files found.
--- a/cluster/addons/metrics-server/metrics-server-deployment.yaml
+++ b/cluster/addons/metrics-server/metrics-server-deployment.yaml
@@ -62,7 +62,7 @@ spec:
                fieldPath: metadata.namespace
        command:
          - /pod_nanny
-          - --cpu=80m
+          - --cpu=40m
          - --extra-cpu=0.5m
          - --memory=140Mi
          - --extra-memory=4Mi