Merge pull request #807 from justinsb/master_resources

Reduce CPURequests, so we can run on 1 core machine

docs/development/instancesizes.md

@@ -0,0 +1,19 @@
+## Allocations of CPU on the master
+
+Note these are only _requests_, not limits.
+
+```
+50m  dns-controller
+150m etcd main
+100m etcd events
+150m kube-apiserver
+100m kube-controller-manager
+100m kube-proxy
+100m kube-scheduler
+
+====
+
+750m total
+
+(leaving 250m for misc services e.g. CNI controller, log infrastructure etc)
+```

protokube/model/etcd/main.config

@@ -3,4 +3,4 @@ ClientPort: 4001
 PeerPort: 2380
 DataDirName: data
 PodName: etcd-server
-CPURequest: 200m
+CPURequest: 150m

upup/models/nodeup/_kubernetes_master/kube-apiserver/files/etc/kubernetes/manifests/kube-apiserver.manifest.template

@@ -15,7 +15,7 @@ spec:
     image: "{{ KubeAPIServer.Image }}"
     resources:
       requests:
-        cpu: 250m
+        cpu: 150m
     command:
     - "/bin/sh"
     - "-c"

upup/models/nodeup/_kubernetes_master/kube-controller-manager/files/etc/kubernetes/manifests/kube-controller-manager.template

@@ -13,7 +13,7 @@
     "image": "{{ KubeControllerManager.Image }}",
     "resources": {
       "requests": {
-        "cpu": "200m"
+        "cpu": "100m"
       }
     },
     "command": [