Unverified Commit 67c68a62 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Update kubeadm join command arguments 

There seems to have been breaking changes introduced.
parent fa835cbd

setup

+10 −2
Original line number Diff line number Diff line
@@ -29,13 +29,18 @@ while let $#; do 
		-h|--help) echo "$USAGE"; exit 0 ;;

		-i|--interface) INTERFACE=$2; shift ;;

		-d|--domain) API_DOMAIN=$2; shift ;;

		-t|--token) TOKEN=$2; shift ;;

		-t|--token) TOKEN=$2; CA_CERT_HASH=$3; shift 2 ;;

		-c|--control) CONTROL_PLANE=true ;;

		--skip-upgrade) SKIP_UPGRADE=true ;;

	esac

	shift

done



if ! [[ $CA_CERT_HASH =~ sha256: ]]; then

	fatal "--token takes two arguments, the second must be a hash starting " \

		"with 'sha256:'"

fi



# Disable swap

if has dphys-swapfile; then

	dphys-swapfile swapoff
@@ -109,7 +114,10 @@ fi 
[[ -v CONTROL_PLANE ]] && kubeadm_args+=(--control-plane)



if [[ -v TOKEN ]]; then

	kubeadm join "${API_DOMAIN}" "$TOKEN" "${kubeadm_args[@]}"

	kubeadm join "${API_DOMAIN}:6443" \

		"--token=$TOKEN" \

		"--discovery-token-ca-cert-hash=$CA_CERT_HASH" \

		"${kubeadm_args[@]}"

else

	kubeadm init "${kubeadm_args[@]}"

	export KUBECONFIG=/etc/kubernetes/admin.conf