Skip to content

Commit

Permalink
Merge pull request #57462 from kawych/automated-cherry-pick-of-#57252…
Browse files Browse the repository at this point in the history
…-upstream-release-1.9

Automatic merge from submit-queue.

Automated cherry pick of #57252: Reduce CPU and memory requests for Metrics Server Nanny

Cherry pick of #57252 on release-1.9.

#57252: Reduce CPU and memory requests for Metrics Server Nanny

**Release note**:
```release-note
Free up CPU and memory requested but unused by Metrics Server Pod Nanny.
```
  • Loading branch information
Kubernetes Submit Queue authored Jan 3, 2018
2 parents e4dad7f + abfa43c commit 2191870
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cluster/addons/metrics-server/metrics-server-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ spec:
cpu: 100m
memory: 300Mi
requests:
cpu: 50m
memory: 100Mi
cpu: 5m
memory: 50Mi
env:
- name: MY_POD_NAME
valueFrom:
Expand Down

0 comments on commit 2191870

Please sign in to comment.