Merge pull request #22663 from yifan-gu/gce_coreos_manifests

cluster/gce/coreos/configure-node.sh

@@ -79,6 +79,11 @@ function configure-etcd-events() {
   evaluate-manifest ${MANIFESTS_DIR}/etcd-events.yaml /etc/kubernetes/manifests/etcd-events.yaml
 }
 
+function configure-addon-manager() {
+  echo "Configuring addon-manager"
+  evaluate-manifest ${MANIFESTS_DIR}/kube-addon-manager.yaml /etc/kubernetes/manifests/kube-addon-manager.yaml
+}
+
 function configure-kube-apiserver() {
   echo "Configuring kube-apiserver"
   
@@ -136,6 +141,10 @@ function configure-master-addons() {
     evaluate-manifests-dir ${MANIFESTS_DIR}/addons/dashboard ${addon_dir}/dashboard
   fi
 
+  if [[ "${ENABLE_CLUSTER_LOGGING}" == "true" ]]; then
+    evaluate-manifests-dir ${MANIFESTS_DIR}/addons/fluentd-elasticsearch  ${addon_dir}/fluentd-elasticsearch
+  fi
+
   if [[ "${ENABLE_CLUSTER_MONITORING}" == "influxdb" ]]; then
     evaluate-manifests-dir ${MANIFESTS_DIR}/addons/cluster-monitoring/influxdb  ${addon_dir}/cluster-monitoring/influxdb
   elif [[ "${ENABLE_CLUSTER_MONITORING}" == "google" ]]; then
@@ -160,6 +169,7 @@ function configure-master-components() {
   configure-kube-apiserver
   configure-kube-scheduler
   configure-kube-controller-manager
+  configure-addon-manager
   configure-master-addons
 }
 

cluster/gce/coreos/kube-manifests/addons/cluster-loadbalancing/glbc/glbc-controller.yaml

 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: l7-lb-controller
+  name: l7-lb-controller-v0.6.0
   namespace: kube-system
   labels:
     k8s-app: glbc
-    version: v0.5.1
+    version: v0.6.0
     kubernetes.io/cluster-service: "true"
     kubernetes.io/name: "GLBC"
 spec:
@@ -13,12 +13,12 @@ spec:
   replicas: 1
   selector:
     k8s-app: glbc
-    version: v0.5.1
+    version: v0.6.0
   template:
     metadata:
       labels:
         k8s-app: glbc
-        version: v0.5.1
+        version: v0.6.0
         name: glbc
         kubernetes.io/cluster-service: "true"
     spec:
@@ -45,7 +45,7 @@ spec:
           requests:
             cpu: 10m
             memory: 20Mi
-      - image: gcr.io/google_containers/glbc:0.5.1
+      - image: gcr.io/google_containers/glbc:0.6.0
         livenessProbe:
           httpGet:
             path: /healthz
@@ -63,8 +63,7 @@ spec:
           requests:
             cpu: 100m
             memory: 50Mi
-        command:
-        - /glbc
         args:
         - --default-backend-service=kube-system/default-http-backend
-        - --sync-period=300s
+        - --sync-period=60s
\ No newline at end of file
+        - --cluster-uid=${KUBE_UID}

cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml

-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
-  name: heapster-v10
+  name: heapster-v1.1.0.beta1
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v10
     kubernetes.io/cluster-service: "true"
+    version: v1.1.0.beta1
 spec:
   replicas: 1
   selector:
-    k8s-app: heapster
-    version: v10
+    matchLabels:
+      k8s-app: heapster
+      version: v1.1.0.beta1
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v10
-        kubernetes.io/cluster-service: "true"
+        version: v1.1.0.beta1
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.2
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
           name: heapster
           resources:
+            # keep request = limit to keep this container in guaranteed class
             limits:
               cpu: 100m
               memory: 300Mi
+            requests:
+              cpu: 100m
+              memory: 300Mi
           command:
             - /heapster
             - --source=kubernetes.summary_api:''
             - --sink=gcm
-            - --sink=gcmautoscaling
+            - --metric_resolution=60s
+          volumeMounts:
+            - name: ssl-certs
+              mountPath: /etc/ssl/certs
+              readOnly: true
+            - name: usrsharecacerts
+              mountPath: /usr/share/ca-certificates
+              readOnly: true
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
+          name: eventer
+          resources:
+            # keep request = limit to keep this container in guaranteed class
+            limits:
+              cpu: 100m
+              memory: 300Mi
+            requests:
+              cpu: 100m
+              memory: 300Mi
+          command:
+            - /eventer
+            - --source=kubernetes:''
             - --sink=gcl
-            - --stats_resolution=30s
-            - --sink_frequency=1m
           volumeMounts:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
@@ -41,10 +63,66 @@ spec:
             - name: usrsharecacerts
               mountPath: /usr/share/ca-certificates
               readOnly: true
+        - image: gcr.io/google_containers/addon-resizer:1.0
+          name: heapster-nanny
+          resources:
+            limits:
+              cpu: 50m
+              memory: 100Mi
+            requests:
+              cpu: 50m
+              memory: 100Mi
+          env:
+            - name: MY_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: MY_POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          command:
+            - /pod_nanny
+            - --cpu=100m
+            - --extra-cpu=0m
+            - --memory=300Mi
+            - --extra-memory=4Mi
+            - --threshold=5
+            - --deployment=heapster-v1.1.0.beta1
+            - --container=heapster
+            - --poll-period=300000
+        - image: gcr.io/google_containers/addon-resizer:1.0
+          name: eventer-nanny
+          resources:
+            limits:
+              cpu: 50m
+              memory: 100Mi
+            requests:
+              cpu: 50m
+              memory: 100Mi
+          env:
+            - name: MY_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: MY_POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          command:
+            - /pod_nanny
+            - --cpu=100m
+            - --extra-cpu=0m
+            - --memory=300Mi
+            - --extra-memory=307200Ki
+            - --threshold=5
+            - --deployment=heapster-v1.1.0.beta1
+            - --container=eventer
+            - --poll-period=300000
       volumes:
         - name: ssl-certs
           hostPath:
-            path: /etc/ssl/certs
+            path: "/etc/ssl/certs"
         - name: usrsharecacerts
           hostPath:
-            path: /usr/share/ca-certificates
+            path: "/usr/share/ca-certificates"
\ No newline at end of file

cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml

-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
-  name: heapster-v10
+  name: heapster-v1.1.0.beta1
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v10
     kubernetes.io/cluster-service: "true"
+    version: v1.1.0.beta1
 spec:
   replicas: 1
   selector:
-    k8s-app: heapster
-    version: v10
+    matchLabels:
+      k8s-app: heapster
+      version: v1.1.0.beta1
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v10
-        kubernetes.io/cluster-service: "true"
+        version: v1.1.0.beta1
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.2
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
           name: heapster
           resources:
+            # keep request = limit to keep this container in guaranteed class
             limits:
               cpu: 100m
               memory: 300Mi
+            requests:
+              cpu: 100m
+              memory: 300Mi
           command:
             - /heapster
             - --source=kubernetes.summary_api:''
-            - --sink=gcl
-            - --sink=gcmautoscaling
             - --sink=influxdb:http://monitoring-influxdb:8086
-            - --stats_resolution=30s
-            - --sink_frequency=1m
+            - --sink=gcm:?metrics=autoscaling
+            - --metric_resolution=60s
           volumeMounts:
             - name: ssl-certs
               mountPath: /etc/ssl/certs
@@ -41,10 +43,87 @@ spec:
             - name: usrsharecacerts
               mountPath: /usr/share/ca-certificates
               readOnly: true
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
+          name: eventer
+          resources:
+            # keep request = limit to keep this container in guaranteed class
+            limits:
+              cpu: 100m
+              memory: 300Mi
+            requests:
+              cpu: 100m
+              memory: 300Mi
+          command:
+            - /eventer
+            - --source=kubernetes:''
+            - --sink=gcl
+          volumeMounts:
+            - name: ssl-certs
+              mountPath: /etc/ssl/certs
+              readOnly: true
+            - name: usrsharecacerts
+              mountPath: /usr/share/ca-certificates
+              readOnly: true
+        - image: gcr.io/google_containers/addon-resizer:1.0
+          name: heapster-nanny
+          resources:
+            limits:
+              cpu: 50m
+              memory: 100Mi
+            requests:
+              cpu: 50m
+              memory: 100Mi
+          env:
+            - name: MY_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: MY_POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          command:
+            - /pod_nanny
+            - --cpu=100m
+            - --extra-cpu=0m
+            - --memory=300Mi
+            - --extra-memory=4Mi
+            - --threshold=5
+            - --deployment=heapster-v1.1.0.beta1
+            - --container=heapster
+            - --poll-period=300000
+        - image: gcr.io/google_containers/addon-resizer:1.0
+          name: eventer-nanny
+          resources:
+            limits:
+              cpu: 50m
+              memory: 100Mi
+            requests:
+              cpu: 50m
+              memory: 100Mi
+          env:
+            - name: MY_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: MY_POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          command:
+            - /pod_nanny
+            - --cpu=100m
+            - --extra-cpu=0m
+            - --memory=300Mi
+            - --extra-memory=307200Ki
+            - --threshold=5
+            - --deployment=heapster-v1.1.0.beta1
+            - --container=eventer
+            - --poll-period=300000
       volumes:
         - name: ssl-certs
           hostPath:
-            path: /etc/ssl/certs
+            path: "/etc/ssl/certs"
         - name: usrsharecacerts
           hostPath:
-            path: /usr/share/ca-certificates
+            path: "/usr/share/ca-certificates"
\ No newline at end of file

cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml

-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
-  name: heapster-v10
+  name: heapster-v1.1.0.beta1
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v10
     kubernetes.io/cluster-service: "true"
+    version: v1.1.0.beta1
 spec:
   replicas: 1
   selector:
-    k8s-app: heapster
-    version: v10
+    matchLabels:
+      k8s-app: heapster
+      version: v1.1.0.beta1
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v10
-        kubernetes.io/cluster-service: "true"
+        version: v1.1.0.beta1
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.2
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
           name: heapster
           resources:
+            # keep request = limit to keep this container in guaranteed class
             limits:
               cpu: 100m
               memory: 300Mi
+            requests:
+              cpu: 100m
+              memory: 300Mi
           command:
             - /heapster
             - --source=kubernetes.summary_api:''
             - --sink=influxdb:http://monitoring-influxdb:8086
-            - --stats_resolution=30s
-            - --sink_frequency=1m
+            - --metric_resolution=60s
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
+          name: eventer
+          resources:
+            # keep request = limit to keep this container in guaranteed class
+            limits:
+              cpu: 100m
+              memory: 300Mi
+            requests:
+              cpu: 100m
+              memory: 300Mi
+          command:
+            - /eventer
+            - --source=kubernetes:''
+            - --sink=influxdb:http://monitoring-influxdb:8086
+        - image: gcr.io/google_containers/addon-resizer:1.0
+          name: heapster-nanny
+          resources:
+            limits:
+              cpu: 50m
+              memory: 100Mi
+            requests:
+              cpu: 50m
+              memory: 100Mi
+          env:
+            - name: MY_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: MY_POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          command:
+            - /pod_nanny
+            - --cpu=100m
+            - --extra-cpu=0m
+            - --memory=300Mi
+            - --extra-memory=4Mi
+            - --threshold=5
+            - --deployment=heapster-v1.1.0.beta1
+            - --container=heapster
+            - --poll-period=300000
+        - image: gcr.io/google_containers/addon-resizer:1.0
+          name: eventer-nanny
+          resources:
+            limits:
+              cpu: 50m
+              memory: 100Mi
+            requests:
+              cpu: 50m
+              memory: 100Mi
+          env:
+            - name: MY_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: MY_POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          command:
+            - /pod_nanny
+            - --cpu=100m
+            - --extra-cpu=0m
+            - --memory=300Mi
+            - --extra-memory=307200Ki
+            - --threshold=5
+            - --deployment=heapster-v1.1.0.beta1
+            - --container=eventer
+            - --poll-period=300000

cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/influxdb-grafana-controller.yaml

 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
             limits:
               cpu: 100m
               memory: 500Mi
+            requests:
+              cpu: 100m
+              memory: 500Mi
           ports: 
             - containerPort: 8083
             - containerPort: 8086
           volumeMounts:
           - name: influxdb-persistent-storage
             mountPath: /data
-        - image: beta.gcr.io/google_containers/heapster_grafana:v2.1.1
+        - image: gcr.io/google_containers/heapster_grafana:v2.6.0-2
           name: grafana
           env:
           resources:
+            # keep request = limit to keep this container in guaranteed class
             limits:
               cpu: 100m
               memory: 100Mi
+            requests:
+              cpu: 100m
+              memory: 100Mi
           env:
             # This variable is required to setup templates in Grafana.
             - name: INFLUXDB_SERVICE_URL
@@ -58,11 +66,8 @@ spec:
           volumeMounts:
           - name: grafana-persistent-storage
             mountPath: /var
-              
       volumes:
       - name: influxdb-persistent-storage
         emptyDir: {}
       - name: grafana-persistent-storage
         emptyDir: {}
-
-

cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml

-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
-  name: heapster-v10
+  name: heapster-v1.1.0.beta1
   namespace: kube-system
   labels:
     k8s-app: heapster
-    version: v10
     kubernetes.io/cluster-service: "true"
+    version: v1.1.0.beta1
 spec:
   replicas: 1
   selector:
-    k8s-app: heapster
-    version: v10
+    matchLabels:
+      k8s-app: heapster
+      version: v1.1.0.beta1
   template:
     metadata:
       labels:
         k8s-app: heapster
-        version: v10
-        kubernetes.io/cluster-service: "true"
+        version: v1.1.0.beta1
     spec:
       containers:
-        - image: gcr.io/google_containers/heapster:v0.18.2
+        - image: gcr.io/google_containers/heapster:v1.1.0-beta1
           name: heapster
           resources:
+            # keep request = limit to keep this container in guaranteed class
             limits:
               cpu: 100m
               memory: 300Mi
+            requests:
+              cpu: 100m
+              memory: 300Mi
           command:
             - /heapster
             - --source=kubernetes.summary_api:''
+            - --metric_resolution=60s
+        - image: gcr.io/google_containers/addon-resizer:1.0
+          name: heapster-nanny
+          resources:
+            limits:
+              cpu: 50m
+              memory: 100Mi
+            requests:
+              cpu: 50m
+              memory: 100Mi
+          env:
+            - name: MY_POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: MY_POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          command:
+            - /pod_nanny
+            - --cpu=100m
+            - --extra-cpu=0m
+            - --memory=300Mi
+            - --extra-memory=4Mi
+            - --threshold=5
+            - --deployment=heapster-v1.1.0.beta1
+            - --container=heapster
+            - --poll-period=300000
\ No newline at end of file

cluster/gce/coreos/kube-manifests/addons/dashboard/dashboard-controller.yaml

 apiVersion: v1
 kind: ReplicationController
 metadata:
-  # Keep this file in sync with addons/dashboard/dashboard-controller.yaml
+  # Keep the name in sync with image version and
+  # gce/coreos/kube-manifests/addons/dashboard counterparts
   name: kubernetes-dashboard-v1.0.1
   namespace: kube-system
   labels:
@@ -37,4 +38,4 @@ spec:
             path: /
             port: 9090
           initialDelaySeconds: 30
-          timeoutSeconds: 30
+          timeoutSeconds: 30
\ No newline at end of file

cluster/gce/coreos/kube-manifests/addons/dns/skydns-rc.yaml

 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: kube-dns-v10
+  name: kube-dns-v11
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    version: v10
+    version: v11
     kubernetes.io/cluster-service: "true"
 spec:
   replicas: ${DNS_REPLICAS}
   selector:
     k8s-app: kube-dns
-    version: v10
+    version: v11
   template:
     metadata:
       labels:
         k8s-app: kube-dns
-        version: v10
+        version: v11
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
       - name: etcd
-        image: gcr.io/google_containers/etcd:2.0.9
+        image: gcr.io/google_containers/etcd-amd64:2.2.1
         resources:
-          # keep request = limit to keep this container in guaranteed class
+          # TODO: Set memory limits when we've profiled the container for large
+          # clusters, then set request = limit to keep this container in
+          # guaranteed class. Currently, this container falls into the
+          # "burstable" category so the kubelet doesn't backoff from restarting it.
           limits:
             cpu: 100m
-            memory: 50Mi
+            memory: 500Mi
           requests:
             cpu: 100m
             memory: 50Mi
@@ -44,32 +47,59 @@ spec:
         - name: etcd-storage
           mountPath: /var/etcd/data
       - name: kube2sky
-        image: gcr.io/google_containers/kube2sky:1.12
+        image: gcr.io/google_containers/kube2sky:1.15
         resources:
-          # keep request = limit to keep this container in guaranteed class
+          # TODO: Set memory limits when we've profiled the container for large
+          # clusters, then set request = limit to keep this container in
+          # guaranteed class. Currently, this container falls into the
+          # "burstable" category so the kubelet doesn't backoff from restarting it.
           limits:
             cpu: 100m
-            memory: 50Mi
+            # Kube2sky watches all pods.
+            memory: 200Mi
           requests:
             cpu: 100m
             memory: 50Mi
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8080
+            scheme: HTTP
+          initialDelaySeconds: 60
+          timeoutSeconds: 5
+          successThreshold: 1
+          failureThreshold: 5
+        readinessProbe:
+          httpGet:
+            path: /readiness
+            port: 8081
+            scheme: HTTP
+          # we poll on pod startup for the Kubernetes master service and
+          # only setup the /readiness HTTP server once that's available.
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
         command:
         - /kube2sky
         args:
-        - -domain=${DNS_DOMAIN}
+        # command = "/kube2sky"
+        - --domain=${DNS_DOMAIN}
       - name: skydns
         image: gcr.io/google_containers/skydns:2015-10-13-8c72f8c
         resources:
-          # keep request = limit to keep this container in guaranteed class
+          # TODO: Set memory limits when we've profiled the container for large
+          # clusters, then set request = limit to keep this container in
+          # guaranteed class. Currently, this container falls into the
+          # "burstable" category so the kubelet doesn't backoff from restarting it.
           limits:
             cpu: 100m
-            memory: 50Mi
+            memory: 200Mi
           requests:
             cpu: 100m
             memory: 50Mi
         command:
         - /skydns
         args:
+        # command = "/skydns"
         - -machines=http://127.0.0.1:4001
         - -addr=0.0.0.0:53
         - -ns-rotate=false
@@ -81,20 +111,6 @@ spec:
         - containerPort: 53
           name: dns-tcp
           protocol: TCP
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 1
-          timeoutSeconds: 5
       - name: healthz
         image: gcr.io/google_containers/exechealthz:1.0
         resources:

cluster/gce/coreos/kube-manifests/addons/fluentd-elasticsearch/es-controller.yaml

@@ -20,11 +20,14 @@ spec:
         kubernetes.io/cluster-service: "true"
     spec:
       containers:
-      - image: gcr.io/google_containers/elasticsearch:1.7
+      - image: gcr.io/google_containers/elasticsearch:1.8
         name: elasticsearch-logging         
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 100m
+          requests:
+            cpu: 100m
         ports:
         - containerPort: 9200
           name: db
@@ -37,4 +40,4 @@ spec:
           mountPath: /data
       volumes:
       - name: es-persistent-storage
-        emptyDir: {}
+        emptyDir: {}
\ No newline at end of file

cluster/gce/coreos/kube-manifests/addons/fluentd-elasticsearch/kibana-controller.yaml

@@ -23,12 +23,15 @@ spec:
       - name: kibana-logging
         image: gcr.io/google_containers/kibana:1.3
         resources:
+          # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 100m
+          requests:
+            cpu: 100m
         env:
           - name: "ELASTICSEARCH_URL"
             value: "http://elasticsearch-logging:9200"
         ports:
         - containerPort: 5601
           name: ui
-          protocol: TCP
+          protocol: TCP
\ No newline at end of file

cluster/gce/coreos/kube-manifests/etcd-events.yaml

 apiVersion: v1
 kind: Pod
 metadata:
-  name: etcd-server-events-kubernetes-master
+  name: etcd-server-events
   namespace: kube-system
 spec:
   containers:
@@ -46,7 +46,7 @@ spec:
       name: varlogetcd
   dnsPolicy: ClusterFirst
   hostNetwork: true
-  nodeName: kubernetes-master
+  nodeName: ${INSTANCE_PREFIX}-master
   restartPolicy: Always
   terminationGracePeriodSeconds: 30
   volumes:

cluster/gce/coreos/kube-manifests/etcd.yaml

 apiVersion: v1
 kind: Pod
 metadata:
-  name: etcd-server-kubernetes-master
+  name: etcd-server
   namespace: kube-system
 spec:
   containers:
@@ -14,7 +14,7 @@ spec:
       --bind-addr=127.0.0.1:4001
       --data-dir=/var/etcd/data
       1>>/var/log/etcd.log 2>&1
-    image: gcr.io/google_containers/etcd:2.0.12
+    image: gcr.io/google_containers/etcd:2.2.1
     imagePullPolicy: IfNotPresent
     livenessProbe:
       httpGet:

cluster/gce/coreos/kube-manifests/kube-addon-manager.yaml

+apiVersion: v1
+kind: Pod
+metadata:
+  name: kube-addon-manager
+  namespace: kube-system
+  version: v1
+spec:
+  hostNetwork: true
+  containers:
+  - name: kube-addon-manager
+    image: gcr.io/google-containers/kube-addon-manager:v1
+    resources:
+      requests:
+        cpu: 5m
+        memory: 50Mi
+    volumeMounts:
+    - mountPath: /etc/kubernetes/
+      name: addons
+      readOnly: true
+  volumes:
+  - hostPath:
+      path: /etc/kubernetes/
+    name: addons

cluster/gce/coreos/kube-manifests/kube-apiserver.yaml

 apiVersion: v1
 kind: Pod
 metadata:
-  name: kube-apiserver-kubernetes-master
+  name: kube-apiserver
   namespace: kube-system
 spec:
   containers:

cluster/gce/coreos/kube-manifests/kube-controller-manager.yaml

 apiVersion: v1
 kind: Pod
 metadata:
-  name: kube-controller-manager-kubernetes-master
+  name: kube-controller-manager
   namespace: kube-system
 spec:
   containers:

cluster/gce/coreos/kube-manifests/kube-scheduler.yaml

 apiVersion: v1
 kind: Pod
 metadata:
-  name: kube-scheduler-kubernetes-master
+  name: kube-scheduler
   namespace: kube-system
 spec:
   containers:
@@ -31,7 +31,7 @@ spec:
       name: logfile
   dnsPolicy: ClusterFirst
   hostNetwork: true
-  nodeName: kubernetes-master
+  nodeName: ${INSTANCE_PREFIX}-master
   restartPolicy: Always
   terminationGracePeriodSeconds: 30
   volumes:

cluster/gce/coreos/master.yaml

 #cloud-config
 
 coreos:
+  update:
+    reboot-strategy: off
   units:
+    - name: locksmithd.service
+      mask: true
     - name: kube-env.service
       command: start
       content: |
@@ -20,6 +24,20 @@ coreos:
         ExecStartPre=/usr/bin/mv /etc/kube-env.yaml /etc/kube-env
         ExecStart=/usr/bin/sed -i "s/: '/=/;s/'$//" /etc/kube-env
 
+    - name: kubernetes-install-cni.service
+      command: start
+      content: |
+        [Unit]
+        Description=Download cni
+        Requires=network-online.target
+        After=network-online.target
+        [Service]
+        Type=oneshot
+        RemainAfterExit=yes
+        ExecStartPre=/usr/bin/mkdir -p /opt/cni
+        ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-42c4cb842dad606a84e93aad5a4484ded48e3046.tar.gz
+        ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/        
+        
     - name: kubernetes-install-rkt.service
       command: start
       content: |
@@ -34,11 +52,9 @@ coreos:
         Type=oneshot
         RemainAfterExit=yes
         EnvironmentFile=/etc/kube-env
-        ExecStartPre=/usr/bin/mkdir -p /etc/rkt
-        ExecStartPre=/usr/bin/mkdir -p /opt/downloads
-        ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \
-        /opt/downloads/rkt.tar.gz https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz
-        ExecStart=/usr/bin/tar xf /opt/downloads/rkt.tar.gz -C /opt --overwrite
+        ExecStartPre=/usr/bin/mkdir -p /etc/rkt /opt/downloads /opt/rkt/
+        ExecStartPre=/usr/bin/curl --fail --silent --location --create-dirs --output /opt/downloads/rkt.tar.gz https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz
+        ExecStart=/usr/bin/tar --strip-components=1 -xf /opt/downloads/rkt.tar.gz -C /opt/rkt/ --overwrite
 
     - name: kubernetes-download-salt.service
       command: start
@@ -103,12 +119,8 @@ coreos:
       content: |
         [Unit]
         Description=Run Kubelet service
-        Requires=network-online.target
-        After=network-online.target
-        Requires=kube-env.service
-        After=kube-env.service
-        Requires=kubernetes-download-manifests.service
-        After=kubernetes-download-manifests.service
+        Requires=network-online.target kube-env.service kubernetes-download-manifests.service kubernetes-install-cni.service
+        After=network-online.target kube-env.service kubernetes-download-manifests.service kubernetes-install-cni.service
         [Service]
         EnvironmentFile=/etc/kube-env
         ExecStartPre=/usr/bin/curl --fail --silent --show-error \
@@ -128,7 +140,8 @@ coreos:
         --cluster-domain=${DNS_DOMAIN} \
         --logtostderr=true \
         --container-runtime=${KUBERNETES_CONTAINER_RUNTIME} \
-        --rkt-path=/opt/rkt-v${RKT_VERSON}/rkt \
+        --rkt-path=/opt/rkt/rkt \
+        --rkt-stage1-image=/opt/rkt/stage1-coreos.aci \
         --configure-cbr0=${KUBERNETES_CONFIGURE_CBR0} \
         --pod-cidr=${MASTER_IP_RANGE} \
         --register-schedulable=false \
@@ -177,18 +190,3 @@ coreos:
         http://metadata.google.internal/computeMetadata/v1/instance/attributes/configure-node
         ExecStartPre=/usr/bin/chmod 0755 /run/configure-node.sh
         ExecStart=/run/configure-node.sh
-
-    - name: kubernetes-addons.service
-      command: start
-      content: |
-        [Unit]
-        Description=Start Kubernetes addons and watch for updates.
-        Requires=kubernetes-configure-node.service
-        After=kubernetes-configure-node.service
-        [Service]
-        Environment=KUBECTL_BIN=/opt/kubernetes/server/bin/kubectl
-        Environment=kubelet_kubeconfig_file=/var/lib/kubelet/kubeconfig
-        ExecStartPre=/usr/bin/chmod 0755 /opt/kubernetes/saltbase/salt/kube-addons/kube-addons.sh
-        ExecStart=/opt/kubernetes/saltbase/salt/kube-addons/kube-addons.sh
-        Restart=always
-        RestartSec=10

cluster/gce/coreos/node.yaml

 #cloud-config
 
 coreos:
+  update:
+    reboot-strategy: off
   units:
+    - name: locksmithd.service
+      mask: true
     - name: kube-env.service
       command: start
       content: |
@@ -20,6 +24,20 @@ coreos:
         ExecStartPre=/usr/bin/mv /etc/kube-env.yaml /etc/kube-env
         ExecStart=/usr/bin/sed -i "s/: '/=/;s/'$//" /etc/kube-env
 
+    - name: kubernetes-install-cni.service
+      command: start
+      content: |
+        [Unit]
+        Description=Download cni
+        Requires=network-online.target
+        After=network-online.target
+        [Service]
+        Type=oneshot
+        RemainAfterExit=yes
+        ExecStartPre=/usr/bin/mkdir -p /opt/cni
+        ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output /opt/downloads/cni.tar.gz https://storage.googleapis.com/kubernetes-release/network-plugins/cni-42c4cb842dad606a84e93aad5a4484ded48e3046.tar.gz
+        ExecStart=/usr/bin/tar xf /opt/downloads/cni.tar.gz -C /opt/cni/        
+
     - name: kubernetes-install-rkt.service
       command: start
       content: |
@@ -34,11 +52,9 @@ coreos:
         Type=oneshot
         RemainAfterExit=yes
         EnvironmentFile=/etc/kube-env
-        ExecStartPre=/usr/bin/mkdir -p /etc/rkt
-        ExecStartPre=/usr/bin/mkdir -p /opt/downloads
-        ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \
-        /opt/downloads/rkt.tar.gz https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz
-        ExecStart=/usr/bin/tar xf /opt/downloads/rkt.tar.gz -C /opt --overwrite
+        ExecStartPre=/usr/bin/mkdir -p /etc/rkt /opt/downloads /opt/rkt/
+        ExecStartPre=/usr/bin/curl --fail --silent --location --create-dirs --output /opt/downloads/rkt.tar.gz https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz
+        ExecStart=/usr/bin/tar --strip-components=1 -xf /opt/downloads/rkt.tar.gz -C /opt/rkt/ --overwrite
 
     - name: kubernetes-download-manifests.service
       command: start
@@ -78,17 +94,25 @@ coreos:
         /opt/kubernetes/pkg/kubernetes-server-linux-amd64.tar.gz ${SERVER_BINARY_TAR_URL}
         ExecStart=/usr/bin/tar xf /opt/kubernetes/pkg/kubernetes-server-linux-amd64.tar.gz -C /opt --overwrite
 
+    - name: rkt-api-service.service
+      command: start
+      content: |
+        [Unit]
+        Description=Start rkt API service as Daemon
+        Requires=kubernetes-install-rkt.service
+        After=kubernetes-install-rkt.service
+        [Service]
+        ExecStart=/opt/rkt/rkt api-service
+        Restart=always
+        RestartSec=10
+
     - name: kubelet.service
       command: start
       content: |
         [Unit]
         Description=Run Kubelet service
-        Requires=network-online.target
-        After=network-online.target
-        Requires=kube-env.service
-        After=kube-env.service
-        Requires=kubernetes-download-manifests.service
-        After=kubernetes-download-manifests.service
+        Requires=network-online.target kube-env.service kubernetes-download-manifests.service kubernetes-install-cni.service
+        After=network-online.target kube-env.service kubernetes-download-manifests.service kubernetes-install-cni.service
         [Service]
         EnvironmentFile=/etc/kube-env
         ExecStartPre=/usr/bin/curl --fail --silent --show-error \
@@ -108,7 +132,8 @@ coreos:
         --cluster-domain=${DNS_DOMAIN} \
         --logtostderr=true \
         --container-runtime=${KUBERNETES_CONTAINER_RUNTIME} \
-        --rkt-path=/opt/rkt-v${RKT_VERSON}/rkt \
+        --rkt-path=/opt/rkt/rkt \
+        --rkt-stage1-image=/opt/rkt/stage1-coreos.aci \
         --configure-cbr0=${KUBERNETES_CONFIGURE_CBR0}
         Restart=always
         RestartSec=10