Merge pull request #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

Merge pull request #53527 from piosz/metrics-server-nanny
2a4d30e7 · Kubernetes Submit Queue · GitHub · 5cc95fbf · 17c9e344 · 2a4d30e7
Commit 2a4d30e7 authored Oct 06, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 30 additions and 5 deletions

metrics-server-deployment.yaml cluster/addons/metrics-server/metrics-server-deployment.yaml +29 -5

resource-reader.yaml cluster/addons/metrics-server/resource-reader.yaml +1 -0

No files found.
--- a/cluster/addons/metrics-server/metrics-server-deployment.yaml
+++ b/cluster/addons/metrics-server/metrics-server-deployment.yaml
@@ -35,11 +35,6 @@ spec:
      containers:
      - name: metrics-server
        image: gcr.io/google_containers/metrics-server-amd64:v0.2.0
-        imagePullPolicy: Always
-        # TODO(piosz): revisit resources
-        resources:
-          requests:
-            memory: 100Mi
        command:
        - /metrics-server
        - --source=kubernetes.summary_api:''
@@ -47,6 +42,35 @@ spec:
        - containerPort: 443
          name: https
          protocol: TCP
+      - name: metrics-server-nanny
+        image: gcr.io/google_containers/addon-resizer:1.7
+        resources:
+          limits:
+            cpu: 100m
+            memory: 300Mi
+          requests:
+            cpu: 50m
+            memory: 100Mi
+        env:
+          - name: MY_POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
+          - name: MY_POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+        command:
+          - /pod_nanny
+          - --cpu=80m
+          - --extra-cpu=0.5m
+          - --memory=140Mi
+          - --extra-memory=4Mi
+          - --threshold=5
+          - --deployment=metrics-server-v0.2.0
+          - --container=metrics-server
+          - --poll-period=300000
+          - --estimator=exponential
      tolerations:
        - key: "CriticalAddonsOnly"
          operator: "Exists"
--- a/cluster/addons/metrics-server/resource-reader.yaml
+++ b/cluster/addons/metrics-server/resource-reader.yaml
@@ -23,6 +23,7 @@ rules:
  verbs:
  - get
  - list
+  - update
  - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1