new version and kubelet-wrapper

Author: sebgoa

k8s.yml

@@ -3,14 +3,14 @@
   connection: local
   vars:
     ssh_key: k8s
-    k8s_version: v1.2.0
+    k8s_version: v1.3.0
     k8s_num_nodes: 2
     k8s_security_group_name: k8s
     k8s_node_prefix: bar
     k8s_username: foobar
     k8s_password: FdKPSuwQ
 # This template name is specific to http://exoscale.ch, replace it
-    k8s_template: Linux CoreOS stable 899 64-bit 50G Disk (2016-04-05-d6cdbb) 
+    k8s_template: Linux CoreOS stable 1122 64-bit 50G Disk (2016-09-06-dcb493)
     k8s_instance_type: Tiny
 
   roles:

roles/k8s/templates/k8s-master.j2

@@ -11,6 +11,7 @@ write-files:
     permissions: '0644'
     content: |
       {{ k8s_password }},{{ k8s_username }},1
+      password,randomuser,2
 
   - path: /opt/bin/wupiao
     permissions: '0755'
@@ -148,7 +149,7 @@ coreos:
         [Service]
         EnvironmentFile=/etc/network-environment
         ExecStartPre=-/usr/bin/mkdir -p /opt/bin
-        ExecStartPre=/usr/bin/curl -L -o /opt/bin/kube-apiserver -z /opt/bin/kube-apiserver https://storage.googleapis.com/kubernetes-release/release/v1.2.0/bin/linux/amd64/kube-apiserver
+        ExecStartPre=/usr/bin/curl -L -o /opt/bin/kube-apiserver -z /opt/bin/kube-apiserver https://storage.googleapis.com/kubernetes-release/release/v{{ k8s_version }}/bin/linux/amd64/kube-apiserver
         ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver
         ExecStartPre=/opt/bin/wupiao 127.0.0.1:2379/v2/machines
         ExecStart=/opt/bin/kube-apiserver \
@@ -177,7 +178,7 @@ coreos:
         Requires=kube-apiserver.service
         After=kube-apiserver.service
         [Service]
-        ExecStartPre=/usr/bin/curl -L -o /opt/bin/kube-controller-manager -z /opt/bin/kube-controller-manager https://storage.googleapis.com/kubernetes-release/release/v1.2.0/bin/linux/amd64/kube-controller-manager
+        ExecStartPre=/usr/bin/curl -L -o /opt/bin/kube-controller-manager -z /opt/bin/kube-controller-manager https://storage.googleapis.com/kubernetes-release/release/v{{ k8s_version }}/bin/linux/amd64/kube-controller-manager
         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 \
@@ -196,7 +197,7 @@ coreos:
         Requires=kube-apiserver.service
         After=kube-apiserver.service
         [Service]
-        ExecStartPre=/usr/bin/curl -L -o /opt/bin/kube-scheduler -z /opt/bin/kube-scheduler https://storage.googleapis.com/kubernetes-release/release/v1.2.0/bin/linux/amd64/kube-scheduler
+        ExecStartPre=/usr/bin/curl -L -o /opt/bin/kube-scheduler -z /opt/bin/kube-scheduler https://storage.googleapis.com/kubernetes-release/release/v{{ k8s_version }}/bin/linux/amd64/kube-scheduler
         ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-scheduler
         ExecStart=/opt/bin/kube-scheduler --master=127.0.0.1:8080
         Restart=always

roles/k8s/templates/k8s-node.j2

@@ -56,7 +56,7 @@ coreos:
         Requires=setup-network-environment.service
         After=setup-network-environment.service
         [Service]
-        ExecStartPre=/usr/bin/curl -L -o /opt/bin/kube-proxy -z /opt/bin/kube-proxy https://storage.googleapis.com/kubernetes-release/release/v1.2.0/bin/linux/amd64/kube-proxy
+        ExecStartPre=/usr/bin/curl -L -o /opt/bin/kube-proxy -z /opt/bin/kube-proxy https://storage.googleapis.com/kubernetes-release/release/v{{ k8s_version }}/bin/linux/amd64/kube-proxy
         ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-proxy
         # wait for kubernetes master to be up and ready
         ExecStartPre=/opt/bin/wupiao {{ k8s_master.default_ip }} 8080
@@ -75,11 +75,10 @@ coreos:
         After=setup-network-environment.service
         [Service]
         EnvironmentFile=/etc/network-environment
-        ExecStartPre=/usr/bin/curl -L -o /opt/bin/kubelet -z /opt/bin/kubelet https://storage.googleapis.com/kubernetes-release/release/v1.2.0/bin/linux/amd64/kubelet
-        ExecStartPre=/usr/bin/chmod +x /opt/bin/kubelet
+        Environment=KUBELET_VERSION=v{{ k8s_version }}_coreos.0
         # wait for kubernetes master to be up and ready
         ExecStartPre=/opt/bin/wupiao {{ k8s_master.default_ip }} 8080
-        ExecStart=/opt/bin/kubelet \
+        ExecStart=/usr/lib/coreos/kubelet-wrapper \
         --address=0.0.0.0 \
         --port=10250 \
         --cluster-dns=10.0.0.10 \