diff --git a/projects/kubernetes/kubernetes/kubeadm-init.sh b/projects/kubernetes/kubernetes/kubeadm-init.sh index 0aa1895f2..87feee6f6 100755 --- a/projects/kubernetes/kubernetes/kubeadm-init.sh +++ b/projects/kubernetes/kubernetes/kubeadm-init.sh @@ -1,7 +1,15 @@ #!/bin/sh set -e 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 if [ -e "$i" ] ; then echo "Applying "$(basename "$i")