Update influxdb and grafana controller to latest version

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

@@ -13,7 +13,7 @@ spec:
   # type: LoadBalancer
   ports:
     - port: 80
-      targetPort: 3000
+      protocol: TCP
+      targetPort: ui
   selector:
     k8s-app: influxGrafana
-

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

@@ -1,5 +1,5 @@
-apiVersion: v1
+kind: Deployment
-kind: ReplicationController
+apiVersion: extensions/v1beta1
 metadata:
   name: monitoring-influxdb-grafana-v4
   namespace: kube-system
@@ -11,6 +11,7 @@ metadata:
 spec:
   replicas: 1
   selector:
+    matchLabels:
       k8s-app: influxGrafana
       version: v4
   template:
@@ -18,13 +19,18 @@ spec:
       labels:
         k8s-app: influxGrafana
         version: v4
-        kubernetes.io/cluster-service: "true"
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
     spec:
+      tolerations:
+      - key: node-role.kubernetes.io/master
+        effect: NoSchedule
+      - key: "CriticalAddonsOnly"
+        operator: "Exists"
       containers:
-        - image: gcr.io/google_containers/heapster-influxdb-amd64:v1.1.1
+        - name: influxdb
-          name: influxdb
+          image: gcr.io/google_containers/heapster-influxdb-amd64:v1.3.3
           resources:
-            # keep request = limit to keep this container in guaranteed class
             limits:
               cpu: 100m
               memory: 500Mi
@@ -32,13 +38,15 @@ spec:
               cpu: 100m
               memory: 500Mi
           ports:
-            - containerPort: 8083
+            - name: http
-            - containerPort: 8086
+              containerPort: 8083
+            - name: api
+              containerPort: 8086
           volumeMounts:
           - name: influxdb-persistent-storage
             mountPath: /data
-        - image: gcr.io/google_containers/heapster-grafana-amd64:v4.0.2
+        - name: grafana
-          name: grafana
+          image: gcr.io/google_containers/heapster-grafana-amd64:v4.4.3
           env:
           resources:
             # keep request = limit to keep this container in guaranteed class
@@ -64,6 +72,9 @@ spec:
               value: Admin
             - name: GF_SERVER_ROOT_URL
               value: /api/v1/proxy/namespaces/kube-system/services/monitoring-grafana/
+          ports:
+          - name: ui
+            containerPort: 3000
           volumeMounts:
           - name: grafana-persistent-storage
             mountPath: /var
@@ -72,4 +83,3 @@ spec:
         emptyDir: {}
       - name: grafana-persistent-storage
         emptyDir: {}
-

cluster/addons/cluster-monitoring/influxdb/influxdb-service.yaml

@@ -17,4 +17,3 @@ spec:
       targetPort: 8086
   selector:
     k8s-app: influxGrafana
-