Bumped Heapster version to v0.20.0-alpha and Influxdb to 0.9.2.1

cluster/addons/cluster-monitoring/google/heapster-controller.yaml

@@ -7,26 +7,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v12
+  name: heapster-v13
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v12
+    version: v13
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v12
+    version: v13
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v12
+        version: v13
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.5
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha1
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -40,10 +40,24 @@ spec:
             - /heapster
             - --source=kubernetes:''
             - --sink=gcm
-            - --sink=gcmautoscaling
+          volumeMounts:
+            - name: ssl-certs
+              mountPath: /etc/ssl/certs
+              readOnly: true
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha1
+          name: eventer
+          resources:
+            # keep request = limit to keep this container in guaranteed class
+            limits:
+              cpu: 100m
+              memory: {{ heapster_memory }}
+            requests:
+              cpu: 100m
+              memory: {{ heapster_memory }}
+          command:
+            - /eventer
+            - --source=kubernetes:''
             - --sink=gcl
-            - --stats_resolution=30s
-            - --sink_frequency=1m
           volumeMounts:
             - name: ssl-certs
               mountPath: /etc/ssl/certs

cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml

@@ -7,26 +7,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v12
+  name: heapster-v13
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v12
+    version: v13
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v12
+    version: v13
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v12
+        version: v13
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.5
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha1
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -39,11 +39,25 @@ spec:
           command:
             - /heapster
             - --source=kubernetes:''
-            - --sink=gcl
-            - --sink=gcmautoscaling
             - --sink=influxdb:http://monitoring-influxdb:8086
-            - --stats_resolution=30s
-            - --sink_frequency=1m
+          volumeMounts:
+            - name: ssl-certs
+              mountPath: /etc/ssl/certs
+              readOnly: true
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha1
+          name: eventer
+          resources:
+            # keep request = limit to keep this container in guaranteed class
+            limits:
+              cpu: 100m
+              memory: {{ heapster_memory }}
+            requests:
+              cpu: 100m
+              memory: {{ heapster_memory }}
+          command:
+            - /eventer
+            - --source=kubernetes:''
+            - --sink=gcl
           volumeMounts:
             - name: ssl-certs
               mountPath: /etc/ssl/certs

cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml

@@ -7,26 +7,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v12
+  name: heapster-v13
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v12
+    version: v13
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v12
+    version: v13
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v12
+        version: v13
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.5
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha1
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -40,5 +40,17 @@ spec:
             - /heapster
             - --source=kubernetes:''
             - --sink=influxdb:http://monitoring-influxdb:8086
-            - --stats_resolution=30s
-            - --sink_frequency=1m
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha1
+          name: eventer
+          resources:
+            # keep request = limit to keep this container in guaranteed class
+            limits:
+              cpu: 100m
+              memory: {{ heapster_memory }}
+            requests:
+              cpu: 100m
+              memory: {{ heapster_memory }}
+          command:
+            - /eventer
+            - --source=kubernetes:''
+            - --sink=influxdb:http://monitoring-influxdb:8086

cluster/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml

@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: monitoring-influxdb-grafana-v2
+  name: monitoring-influxdb-grafana-v3
   namespace: kube-system
   labels: 
     k8s-app: influxGrafana
-    version: v2
+    version: v3
     kubernetes.io/cluster-service: "true"
 spec: 
   replicas: 1
   selector: 
     k8s-app: influxGrafana
-    version: v2
+    version: v3
   template: 
     metadata: 
       labels: 
         k8s-app: influxGrafana
-        version: v2
+        version: v3
         kubernetes.io/cluster-service: "true"
     spec: 
       containers: 
-        - image: gcr.io/google_containers/heapster_influxdb:v0.4
+        - image: gcr.io/google_containers/heapster_influxdb:v0.5
           name: influxdb
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -68,7 +68,6 @@ spec:
           volumeMounts:
           - name: grafana-persistent-storage
             mountPath: /var
-              
       volumes:
       - name: influxdb-persistent-storage
         emptyDir: {}

cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml

@@ -7,26 +7,26 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: heapster-v12
+  name: heapster-v13
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v12
+    version: v13
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: 1
   selector:
     k8s-app: heapster
-    version: v12
+    version: v13
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v12
+        version: v13
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.5
+        - image: gcr.io/google_containers/heapster:v0.20.0-alpha1
           name: heapster
           resources:
             # keep request = limit to keep this container in guaranteed class

hack/jenkins/e2e.sh

@@ -394,8 +394,6 @@ case ${JOB_NAME} in
     : ${PROJECT:="k8s-jnks-e2e-gce-autoscaling"}
     : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
     : ${ENABLE_DEPLOYMENTS:=true}
-    # Override GCE default for cluster size autoscaling purposes.
-    ENABLE_CLUSTER_MONITORING="googleinfluxdb"
     ADMISSION_CONTROL="NamespaceLifecycle,InitialResources,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota"
     ;;