From 17c9e344599105b77f38ca7e54aff5dd5e457603 Mon Sep 17 00:00:00 2001
From: Piotr Szczesniak <pszczesniak@google.com>
Date: Fri, 6 Oct 2017 14:40:55 +0200
Subject: [PATCH] Autoscaler metrics-server with pod-nanny

---
 .../metrics-server-deployment.yaml            | 34 ++++++++++++++++---
 .../metrics-server/resource-reader.yaml       |  1 +
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/cluster/addons/metrics-server/metrics-server-deployment.yaml b/cluster/addons/metrics-server/metrics-server-deployment.yaml
index 8c3d9f086df..d018f8a34f0 100644
--- 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"
diff --git a/cluster/addons/metrics-server/resource-reader.yaml b/cluster/addons/metrics-server/resource-reader.yaml
index 91aefba9580..d9bde133541 100644
--- 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