add apiserver.crt

Author: sebgoa

roles/k8s/templates/k8s-master.j2

@@ -92,7 +92,7 @@ coreos:
         --insecure-bind-address=0.0.0.0 \
         --insecure-port=8080 \
         --kubelet-https=true \
-        --secure-port=6443 \
+        --secure-port=443 \
         --service-cluster-ip-range=10.100.0.0/16 \
         --etcd-servers=http://127.0.0.1:2379 \
         --public-address-override=${DEFAULT_IPV4} \
@@ -112,6 +112,7 @@ coreos:
         ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-controller-manager
         ExecStart=/opt/bin/kube-controller-manager \
         --service-account-private-key-file=/opt/bin/kube-serviceaccount.key \
+        --root-ca-file=/var/run/kubernetes/apiserver.cert \
         --master=127.0.0.1:8080 \
         --logtostderr=true
         Restart=always

roles/k8s/templates/k8s-node.j2

@@ -18,17 +18,12 @@ coreos:
   fleet:
     metadata: "role=node"
   units:
+    - name: etcd2.service
+      command: start
     - name: fleet.service
       command: start
     - name: flanneld.service
       command: start
-      drop-ins:
-        - name: 50-network-config.conf
-          content: |
-            [Unit]
-            Requires=etcd2.service
-            [Service]
-            ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
     - name: docker.service
       command: start
     - name: setup-network-environment.service