Merge pull request #2565 from djs55/kubeadm.yaml

kubernetes: add optional support for a kubeadm.yaml
This commit is contained in:
Ian Campbell 2017-10-04 18:03:39 +01:00 committed by GitHub
commit 657225e8b8

View File

@ -1,7 +1,15 @@
#!/bin/sh #!/bin/sh
set -e set -e
touch /var/lib/kubeadm/.kubeadm-init.sh-started touch /var/lib/kubeadm/.kubeadm-init.sh-started
kubeadm init --skip-preflight-checks --kubernetes-version @KUBERNETES_VERSION@ $@ if [ -f /etc/kubeadm/kubeadm.yaml ]; then
echo Using the configuration from /etc/kubeadm/kubeadm.yaml
if [ $# -ne 0 ] ; then
echo WARNING: Ignoring command line options: $@
fi
kubeadm init --skip-preflight-checks --config /etc/kubeadm/kubeadm.yaml
else
kubeadm init --skip-preflight-checks --kubernetes-version @KUBERNETES_VERSION@ $@
fi
for i in /etc/kubeadm/kube-system.init/*.yaml ; do for i in /etc/kubeadm/kube-system.init/*.yaml ; do
if [ -e "$i" ] ; then if [ -e "$i" ] ; then
echo "Applying "$(basename "$i") echo "Applying "$(basename "$i")