From 23d6649de0992d06bd2194b49daca34b19ec04bf Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 17 Jul 2017 11:43:39 +0100 Subject: [PATCH] kubernetes: Format scripts to be more readable. These were originally generated by some box builder runes and then taken wholesale here. Format them to be more readable. Signed-off-by: Ian Campbell --- .../kubernetes/kubernetes/kubeadm-init.sh | 4 +++- projects/kubernetes/kubernetes/kubelet.sh | 20 ++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/projects/kubernetes/kubernetes/kubeadm-init.sh b/projects/kubernetes/kubernetes/kubeadm-init.sh index d39f7a4eb..5e953229d 100755 --- a/projects/kubernetes/kubernetes/kubeadm-init.sh +++ b/projects/kubernetes/kubernetes/kubeadm-init.sh @@ -1,2 +1,4 @@ #!/bin/sh -kubeadm init --skip-preflight-checks --kubernetes-version v1.6.1 && kubectl create -n kube-system -f /etc/weave.yaml +set -e +kubeadm init --skip-preflight-checks --kubernetes-version v1.6.1 +kubectl create -n kube-system -f /etc/weave.yaml diff --git a/projects/kubernetes/kubernetes/kubelet.sh b/projects/kubernetes/kubernetes/kubelet.sh index a7bda13bc..535844853 100755 --- a/projects/kubernetes/kubernetes/kubelet.sh +++ b/projects/kubernetes/kubernetes/kubelet.sh @@ -1,2 +1,20 @@ #!/bin/sh -mount --bind /opt/cni /rootfs/opt/cni && mount --bind /etc/cni /rootfs/etc/cni && until kubelet --kubeconfig=/var/lib/kubeadm/kubelet.conf --require-kubeconfig=true --pod-manifest-path=/var/lib/kubeadm/manifests --allow-privileged=true --cluster-dns=10.96.0.10 --cluster-domain=cluster.local --cgroups-per-qos=false --enforce-node-allocatable= --network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin ; do [ ! -e /dev/sr0 ] && sleep 1 || (mount -o ro /dev/sr0 /mnt && kubeadm join --skip-preflight-checks $(cat /mnt/config)) ; done +mount --bind /opt/cni /rootfs/opt/cni +mount --bind /etc/cni /rootfs/etc/cni +until kubelet --kubeconfig=/var/lib/kubeadm/kubelet.conf \ + --require-kubeconfig=true \ + --pod-manifest-path=/var/lib/kubeadm/manifests \ + --allow-privileged=true \ + --cluster-dns=10.96.0.10 \ + --cluster-domain=cluster.local \ + --cgroups-per-qos=false \ + --enforce-node-allocatable= \ + --network-plugin=cni \ + --cni-conf-dir=/etc/cni/net.d \ + --cni-bin-dir=/opt/cni/bin ; do + if [ ! -e /dev/sr0 ] ; then + sleep 1 + else + mount -o ro /dev/sr0 /mnt && kubeadm join --skip-preflight-checks $(cat /mnt/config) + fi +done