diff --git a/projects/kubernetes/kubernetes/kubeadm-init.sh b/projects/kubernetes/kubernetes/kubeadm-init.sh
index 87feee6f6..61530c671 100755
--- a/projects/kubernetes/kubernetes/kubeadm-init.sh
+++ b/projects/kubernetes/kubernetes/kubeadm-init.sh
@@ -11,9 +11,19 @@ else
     kubeadm init --skip-preflight-checks --kubernetes-version @KUBERNETES_VERSION@ $@
 fi
 for i in /etc/kubeadm/kube-system.init/*.yaml ; do
+    n=$(basename "$i")
     if [ -e "$i" ] ; then
-	echo "Applying "$(basename "$i")
-	kubectl create -n kube-system -f "$i"
+	if [ ! -s "$i" ] ; then # ignore zero sized files
+	    echo "Ignoring zero size file $n"
+	    continue
+	fi
+	echo "Applying $n"
+	if ! kubectl create -n kube-system -f "$i" ; then
+	    touch /var/lib/kubeadm/.kubeadm-init.sh-kube-system.init-failed
+	    touch /var/lib/kubeadm/.kubeadm-init.sh-kube-system.init-"$n"-failed
+	    echo "Failed to apply $n"
+	    continue
+	fi
     fi
 done
 if [ -f /var/config/kubeadm/untaint-master ] ; then