Merge pull request #1 from chefkoch-dev/kubelet_fix

Kubelet fix

Author: frastel

coreos/single-node/certificates.sh

@@ -5,7 +5,7 @@
 # * https://coreos.com/kubernetes/docs/latest/openssl.html
 #
 
-MASTER_HOST=$1
+MASTER_HOST="$1"
 WORKERS=""
 K8S_SERVICE_IP="10.3.0.1"
 
@@ -16,12 +16,6 @@ if [ -z "${MASTER_HOST}" ]; then
     exit 1
 fi
 
-#Create a Cluster Root CA
-openssl genrsa -out ca-key.pem 2048
-openssl req -x509 -new -nodes -key ca-key.pem -days 10000 -out ca.pem -subj "/CN=kube-ca"
-chmod 0600 ca-key.pem
-
-
 if [ ! -f openssl.cnf ]; then
     cat >openssl.cnf <<EOF
 [req]
@@ -37,11 +31,16 @@ DNS.1 = kubernetes
 DNS.2 = kubernetes.default
 DNS.3 = kubernetes.default.svc
 DNS.4 = kubernetes.default.svc.cluster.local
-IP.1 = ${K8S_SERVICE_IP}
-IP.2 = ${MASTER_HOST}
+IP.1 = $K8S_SERVICE_IP
+IP.2 = $MASTER_HOST
 EOF
 fi
 
+#Create a Cluster Root CA
+openssl genrsa -out ca-key.pem 2048
+openssl req -x509 -new -nodes -key ca-key.pem -days 10000 -out ca.pem -subj "/CN=kube-ca" -config openssl.cnf
+chmod 0600 ca-key.pem
+
 if [ ! -f apiserver-key.pem ]; then
     openssl genrsa -out apiserver-key.pem 2048
     openssl req -new -key apiserver-key.pem -out apiserver.csr -subj "/CN=kube-apiserver" -config openssl.cnf

coreos/single-node/install.sh

@@ -63,6 +63,14 @@ else
     echo ">> Skipping certificates"
 fi
 
+if [ ! -f "/opt/bin/kubelet" ]; then
+    echo ">> Downloading kubelet"
+    $SUDO wget -O /opt/bin/kubelet https://storage.googleapis.com/kubernetes-release/release/v1.3.2/bin/linux/amd64/kubelet
+    $SUDO chmod +x /opt/bin/kubelet
+else
+    echo ">> Skipping kubectl"
+fi
+
 if [ ! -f "/etc/systemd/system/kubelet.service" ]; then
     echo ">> Preparing kubelet.service"
     wget https://raw.githubusercontent.com/chefkoch-dev/kubernetes-setup/master/coreos/single-node/services/kubelet.service

coreos/single-node/services/kubelet.service

@@ -4,7 +4,7 @@ Documentation=https://github.com/kubernetes/kubernetes
 
 [Service]
 ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests /opt/bin
-ExecStart=/usr/bin/kubelet \
+ExecStart=/opt/bin/kubelet \
   --api-servers=http://127.0.0.1:8080 \
   --allow-privileged=true \
   --config=/etc/kubernetes/manifests \