Bootstrap: Only exit when bootstrap has succeeded

cmd/kube-bootstrap/app/server.go

@@ -21,7 +21,9 @@ package app
 import (
 	"k8s.io/kubernetes/pkg/bootstrap"
 
+	"github.com/golang/glog"
 	"github.com/spf13/pflag"
+	"time"
 )
 
 // BootstrapServerConfig contains configures and runs a Kubernetes proxy server
@@ -59,6 +61,15 @@ func NewBootstrapServerDefault(config *BootstrapServerConfig) (*BootstrapServer,
 }
 
 // Run runs the specified BootstrapServer, which bootstraps the machine.
+// If it encounters an error, it will sleep and retry.
+// Thus on exit the bootstrap has succeeded.
 func (s *BootstrapServer) Run(_ []string) error {
-	return s.Bootstrapper.RunOnce()
+	for {
+		err := s.Bootstrapper.RunOnce()
+		if err == nil {
+			return nil
+		}
+		glog.Warning("error during bootstrapping (will sleep and retry): %v", err)
+		time.Sleep(10 * time.Second)
+	}
 }

pkg/bootstrap/bootstrapper.go

@@ -118,7 +118,7 @@ func (b *Bootstrapper) mountMasterVolume() error {
 	if err != nil {
 		return fmt.Errorf("error creating directory %q: %v", target, err)
 	}
-	
+
 	fsType := "ext4"
 	options := []string{"noatime"}
 	err = diskMounter.Mount(device, target, fsType, options)