From 13c235d31cea2a20f5ac2a74586a49b7743ff6d6 Mon Sep 17 00:00:00 2001
From: Shyam Jeedigunta <shyamjvs@google.com>
Date: Tue, 14 Nov 2017 16:51:15 +0100
Subject: [PATCH 1/2] Fix resource requests & limits of metadata-proxy

---
 .../addons/metadata-proxy/gce/metadata-proxy.yaml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
index 3c082d213b1..7aa69d5cd08 100644
--- a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
+++ b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
@@ -43,11 +43,11 @@ spec:
           privileged: true
         resources:
           requests:
-            memory: "16Mi"
-            cpu: "15m"
+            memory: "32Mi"
+            cpu: "30m"
           limits:
-            memory: "16Mi"
-            cpu: "15m"
+            memory: "32Mi"
+            cpu: "30m"
       # BEGIN_PROMETHEUS_TO_SD
       - name: prometheus-to-sd-exporter
         image: gcr.io/google_containers/prometheus-to-sd:v0.2.2
@@ -56,13 +56,6 @@ spec:
           - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons
           - --api-override={{ prometheus_to_sd_endpoint }}
           - --source=metadata_proxy:http://127.0.0.1:989?whitelisted=request_count
-        resources:
-          requests:
-            memory: "16Mi"
-            cpu: "15m"
-          limits:
-            memory: "16Mi"
-            cpu: "15m"
       # END_PROMETHEUS_TO_SD
       nodeSelector:
         beta.kubernetes.io/metadata-proxy-ready: "true"

From 6e50b1f90bce82872792e621e7ea7847d26be36c Mon Sep 17 00:00:00 2001
From: Shyam Jeedigunta <shyamjvs@google.com>
Date: Tue, 14 Nov 2017 16:52:55 +0100
Subject: [PATCH 2/2] Pass pod name and namespace argss to prom-to-sd sidecar
 of metadata-proxy

---
 cluster/addons/metadata-proxy/gce/metadata-proxy.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
index 7aa69d5cd08..376fb65f174 100644
--- a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
+++ b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
@@ -56,6 +56,17 @@ spec:
           - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons
           - --api-override={{ prometheus_to_sd_endpoint }}
           - --source=metadata_proxy:http://127.0.0.1:989?whitelisted=request_count
+          - --pod-id=$(POD_NAME)
+          - --namespace-id=$(POD_NAMESPACE)
+        env:
+          - name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
       # END_PROMETHEUS_TO_SD
       nodeSelector:
         beta.kubernetes.io/metadata-proxy-ready: "true"