diff --git a/bootstrap-master.sh b/bootstrap-master.sh index 31cb5d51c..1163ce8ad 100755 --- a/bootstrap-master.sh +++ b/bootstrap-master.sh @@ -18,8 +18,7 @@ sudo pip install kpm # k8s deploy script and config sudo sh -c 'cp -a ~vagrant/deploy-k8s.kargo.sh /root/ && chmod 755 /root/deploy-k8s.kargo.sh' -sudo git clone https://github.com/kubespray/kargo /root/kargo -sudo cp -a ~vagrant/custom.yaml /root/kargo/custom.yaml +sudo cp -a ~vagrant/custom.yaml /root/custom.yaml # SSH keys and config sudo rm -rf /root/.ssh diff --git a/custom.yaml b/custom.yaml index c15110a1a..c056c3bf1 100644 --- a/custom.yaml +++ b/custom.yaml @@ -1,2 +1,3 @@ kube_network_plugin: "calico" kube_proxy_mode: "iptables" +local_release_dir: "/var/tmp/releases" diff --git a/deploy-k8s.kargo.sh b/deploy-k8s.kargo.sh index e6e6f7c99..35784659c 100755 --- a/deploy-k8s.kargo.sh +++ b/deploy-k8s.kargo.sh @@ -1,5 +1,7 @@ #!/bin/bash +INVENTORY="kargo/inventory/inventory.cfg" + nodes="" i=1 for nodeip in `cat /root/nodes` ; do @@ -7,18 +9,18 @@ for nodeip in `cat /root/nodes` ; do nodes+=" node${i}[ansible_ssh_host=${nodeip},ip=${nodeip}]" done -if [ -f kargo/inventory/inventory.cfg ] ; then - echo "kargo/inventory/inventory.cfg already exists, if you want to recreate, pls remove it and re-run this script" +if [ -f "$INVENTORY" ] ; then + echo "$INVENTORY already exists, if you want to recreate, pls remove it and re-run this script" else echo "Preparing inventory..." kargo prepare -y --nodes $nodes fi echo "Running deployment..." -kargo deploy -y --ansible-opts="-e @kargo/custom.yaml" +kargo deploy -y --ansible-opts="-e @custom.yaml" deploy_res=$? if [ "$deploy_res" -eq "0" ]; then echo "Setting up kubedns..." - kpm deploy kube-system/kubedns --namespace=kube-system + ansible-playbook -i $INVENTORY kubedns.yaml fi diff --git a/kubedns.yaml b/kubedns.yaml new file mode 100644 index 000000000..cf7a0e0b5 --- /dev/null +++ b/kubedns.yaml @@ -0,0 +1,5 @@ +- hosts: kube-master + tasks: + - name: setup-kubedns + shell: kpm deploy kube-system/kubedns --namespace=kube-system + run_once: true