Merge pull request #2182 from kairen/update-addon-2

[addon] Update heapster to v1.5.0

deploy/addons/heapster/grafana-svc.yaml

@@ -1,3 +1,17 @@
+# Copyright 2017 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -17,4 +31,4 @@ spec:
     targetPort: ui
   selector:
     addonmanager.kubernetes.io/mode: Reconcile
-    name: influxGrafana
+    k8s-app: influx-grafana

deploy/addons/heapster/heapster-rc.yaml

@@ -1,31 +1,44 @@
+# Copyright 2017 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 kind: ReplicationController
 metadata:
   labels:
-    addonmanager.kubernetes.io/mode: Reconcile
     k8s-app: heapster
-    name: heapster
     kubernetes.io/minikube-addons: heapster
+    addonmanager.kubernetes.io/mode: Reconcile
   name: heapster
   namespace: kube-system
 spec:
   replicas: 1
   selector:
-    addonmanager.kubernetes.io/mode: Reconcile
     k8s-app: heapster
+    addonmanager.kubernetes.io/mode: Reconcile
   template:
     metadata:
       labels:
-        addonmanager.kubernetes.io/mode: Reconcile
         k8s-app: heapster
+        addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
       - name: heapster
-        image: gcr.io/google_containers/heapster:v1.4.3
+        image: gcr.io/google_containers/heapster-amd64:v1.5.0-beta.0
         imagePullPolicy: IfNotPresent
         command:
         - /heapster
-        - --source=kubernetes
+        - --source=kubernetes.summary_api:''
         - --sink=influxdb:http://monitoring-influxdb:8086
         - --metric_resolution=60s
         volumeMounts:

deploy/addons/heapster/heapster-svc.yaml

@@ -1,3 +1,17 @@
+# Copyright 2017 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -8,7 +22,6 @@ metadata:
   name: heapster
   namespace: kube-system
 spec:
-  type: NodePort
   ports:
   - port: 80
     targetPort: 8082

deploy/addons/heapster/influxGrafana-rc.yaml → deploy/addons/heapster/influx-grafana-rc.yaml

@@ -1,4 +1,4 @@
-# Copyright 2016 The Kubernetes Authors All rights reserved.
+# Copyright 2017 The Kubernetes Authors All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,21 +15,21 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
+  name: influxdb-grafana
   labels:
-    name: influxGrafana
-    addonmanager.kubernetes.io/mode: Reconcile
+    k8s-app: influx-grafana
     kubernetes.io/minikube-addons: heapster
-  name: influxdb-grafana
+    addonmanager.kubernetes.io/mode: Reconcile
   namespace: kube-system
 spec:
   replicas: 1
   selector:
+    k8s-app: influx-grafana
     addonmanager.kubernetes.io/mode: Reconcile
-    name: influxGrafana
   template:
     metadata:
       labels:
-        name: influxGrafana
+        k8s-app: influx-grafana
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:

deploy/addons/heapster/influxdb-svc.yaml

@@ -1,3 +1,17 @@
+# Copyright 2017 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -17,4 +31,4 @@ spec:
     targetPort: 8086
   selector:
     addonmanager.kubernetes.io/mode: Reconcile
-    name: influxGrafana
+    k8s-app: influx-grafana

pkg/minikube/assets/addons.go

@@ -140,7 +140,7 @@ var Addons = map[string]*Addon{
 	}, true, "kube-dns"),
 	"heapster": NewAddon([]*BinDataAsset{
 		NewBinDataAsset(
-			"deploy/addons/heapster/influxGrafana-rc.yaml",
+			"deploy/addons/heapster/influx-grafana-rc.yaml",
 			constants.AddonsPath,
 			"influxGrafana-rc.yaml",
 			"0640"),