Skip to content

Commit 2a4d30e

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#53527 from piosz/metrics-server-nanny
Automatic merge from submit-queue. 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>. Autoscale metrics-server with pod-nanny
2 parents 5cc95fb + 17c9e34 commit 2a4d30e

File tree

2 files changed

+30
-5
lines changed

2 files changed

+30
-5
lines changed

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

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,42 @@ spec:
3535
containers:
3636
- name: metrics-server
3737
image: gcr.io/google_containers/metrics-server-amd64:v0.2.0
38-
imagePullPolicy: Always
39-
# TODO(piosz): revisit resources
40-
resources:
41-
requests:
42-
memory: 100Mi
4338
command:
4439
- /metrics-server
4540
- --source=kubernetes.summary_api:''
4641
ports:
4742
- containerPort: 443
4843
name: https
4944
protocol: TCP
45+
- name: metrics-server-nanny
46+
image: gcr.io/google_containers/addon-resizer:1.7
47+
resources:
48+
limits:
49+
cpu: 100m
50+
memory: 300Mi
51+
requests:
52+
cpu: 50m
53+
memory: 100Mi
54+
env:
55+
- name: MY_POD_NAME
56+
valueFrom:
57+
fieldRef:
58+
fieldPath: metadata.name
59+
- name: MY_POD_NAMESPACE
60+
valueFrom:
61+
fieldRef:
62+
fieldPath: metadata.namespace
63+
command:
64+
- /pod_nanny
65+
- --cpu=80m
66+
- --extra-cpu=0.5m
67+
- --memory=140Mi
68+
- --extra-memory=4Mi
69+
- --threshold=5
70+
- --deployment=metrics-server-v0.2.0
71+
- --container=metrics-server
72+
- --poll-period=300000
73+
- --estimator=exponential
5074
tolerations:
5175
- key: "CriticalAddonsOnly"
5276
operator: "Exists"

cluster/addons/metrics-server/resource-reader.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ rules:
2323
verbs:
2424
- get
2525
- list
26+
- update
2627
- watch
2728
---
2829
apiVersion: rbac.authorization.k8s.io/v1

0 commit comments

Comments
 (0)