From e6833639a25c2bf7a287103f5a64cc2c2af82d46 Mon Sep 17 00:00:00 2001
From: Vishnu Kannan <vishnuk@google.com>
Date: Thu, 2 Apr 2015 00:30:29 +0000
Subject: [PATCH] Update heapster version to v0.10.0

---
 .../cluster-monitoring/grafana-service.yaml   |  2 +-
 .../heapster-controller.yaml                  |  2 +-
 .../influxdb-grafana-controller.yaml          | 21 ++++-------------
 .../v1beta3/grafana-service.yaml              |  2 +-
 .../v1beta3/heapster-controller.yaml          |  2 +-
 .../v1beta3/influxdb-grafana-controller.yaml  | 23 ++++---------------
 6 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/cluster/addons/cluster-monitoring/grafana-service.yaml b/cluster/addons/cluster-monitoring/grafana-service.yaml
index 0c550c643785b..1a2e22fd9ccae 100644
--- a/cluster/addons/cluster-monitoring/grafana-service.yaml
+++ b/cluster/addons/cluster-monitoring/grafana-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1beta1
 kind: Service
 id: monitoring-grafana
 port: 80
-containerPort: 80
+containerPort: 8080
 labels:
   name: grafana
   kubernetes.io/cluster-service: "true"
diff --git a/cluster/addons/cluster-monitoring/heapster-controller.yaml b/cluster/addons/cluster-monitoring/heapster-controller.yaml
index cf276947e090f..6f5d18671bf7f 100644
--- a/cluster/addons/cluster-monitoring/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/heapster-controller.yaml
@@ -12,7 +12,7 @@ desiredState:
         id: monitoring-heapster
         containers:
           - name: heapster
-            image: gcr.io/google_containers/heapster:v0.9
+            image: gcr.io/google_containers/heapster:v0.10.0
             env: 
               - name: "INFLUXDB_HOST"
                 value: "monitoring-influxdb"
diff --git a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
index 7dd85ef39839d..b45c2b477809f 100644
--- a/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
@@ -16,26 +16,15 @@ desiredState:
         containers: 
           - name: influxdb
             image: gcr.io/google_containers/heapster_influxdb:v0.3
-            ports: 
-              - containerPort: 8083
-                hostPort: 8083
-              - containerPort: 8086
-                hostPort: 8086
           - name: grafana
-            image: gcr.io/google_containers/heapster_grafana:v0.5
+            image: gcr.io/google_containers/heapster_grafana:v0.6
             env: 
-              - name: "HTTP_USER"
-                value: "admin"
-              - name: "HTTP_PASS"
-                value: "**None**"
-              - name: "INFLUXDB_PROTO"
-                value: "https"
+              - name: "INFLUXDB_EXTERNAL_URL"
+                value: '/api/v1beta1/proxy/services/monitoring-grafana/db/'
               - name: "INFLUXDB_HOST"
-                value: "localhost"
+                value: 'monitoring-influxdb'
               - name: "INFLUXDB_PORT"
-                value: ""
-              - name: "KUBERNETES_API_PORT"
-                value: ""
+                value: '80'
 labels:
   name: influxGrafana
   kubernetes.io/cluster-service: "true"
diff --git a/cluster/addons/cluster-monitoring/v1beta3/grafana-service.yaml b/cluster/addons/cluster-monitoring/v1beta3/grafana-service.yaml
index 611a8ae816a90..e5c707ceba5c0 100644
--- a/cluster/addons/cluster-monitoring/v1beta3/grafana-service.yaml
+++ b/cluster/addons/cluster-monitoring/v1beta3/grafana-service.yaml
@@ -8,7 +8,7 @@ metadata:
 spec: 
   ports:
     - port: 80
-      targetPort: 80
+      targetPort: 8080
   selector: 
     name: influxGrafana
     kubernetes.io/cluster-service: "true"
diff --git a/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml b/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
index a383d4e7404be..94842f56114e5 100644
--- a/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
@@ -16,7 +16,7 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: gcr.io/google_containers/heapster:v0.9
+        - image: gcr.io/google_containers/heapster:v0.10.0
           name: heapster
           env: 
             - name: "INFLUXDB_HOST"
diff --git a/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml b/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
index d25f209c0c00f..1db9afd3baa04 100644
--- a/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
+++ b/cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
@@ -18,25 +18,12 @@ spec:
       containers: 
         - image: gcr.io/google_containers/heapster_influxdb:v0.3
           name: influxdb
-          ports: 
-            - containerPort: 8083
-              hostPort: 8083
-            - containerPort: 8086
-              hostPort: 8086
         - name: grafana
-          image: gcr.io/google_containers/heapster_grafana:v0.5
-          ports:
-              - containerPort: 80
+          image: gcr.io/google_containers/heapster_grafana:v0.6
           env: 
-            - name: "HTTP_USER"
-              value: "admin"
-            - name: "HTTP_PASS"
-              value: "**None**"
-            - name: "INFLUXDB_PROTO"
-              value: "https"
+            - name: "INFLUXDB_EXTERNAL_URL"
+              value: '/api/v1beta1/proxy/services/monitoring-grafana/db/'
             - name: "INFLUXDB_HOST"
-              value: '"+window.location.hostname+"/api/v1beta1/proxy/services/monitoring-influxdb'
+              value: 'monitoring-influxdb'
             - name: "INFLUXDB_PORT"
-              value: ""
-            - name: "KUBERNETES_API_PORT"
-              value: ""
+              value: '80'