Fix CSI when running kubelet and controller-manager in the same process

pkg/volume/plugins.go

@@ -21,6 +21,7 @@ import (
 	"net"
 	"strings"
 	"sync"
+	"time"
 
 	authenticationv1 "k8s.io/api/authentication/v1"
 	"k8s.io/api/core/v1"
@@ -38,6 +39,10 @@ import (
 	"k8s.io/kubernetes/pkg/volume/util/subpath"
 )
 
+var (
+	WaitForValidHost = false
+)
+
 type ProbeOperation uint32
 type ProbeEvent struct {
 	Plugin     VolumePlugin // VolumePlugin that was added/updated/removed. if ProbeEvent.Op is 'ProbeRemove', Plugin should be nil
@@ -551,9 +556,26 @@ func NewSpecFromPersistentVolume(pv *v1.PersistentVolume, readOnly bool) *Spec {
 // This must be called exactly once before any New* methods are called on any
 // plugins.
 func (pm *VolumePluginMgr) InitPlugins(plugins []VolumePlugin, prober DynamicPluginProber, host VolumeHost) error {
+	if host.GetHostName() == "" && WaitForValidHost {
+		for {
+			pm.mutex.Lock()
+			if pm.Host != nil && pm.Host.GetHostName() != "" {
+				pm.mutex.Unlock()
+				break
+			}
+			pm.mutex.Unlock()
+			klog.Infof("Waiting for volume plugins to be initialized")
+			time.Sleep(time.Second)
+		}
+	}
+
 	pm.mutex.Lock()
 	defer pm.mutex.Unlock()
 
+	if pm.Host != nil {
+		return nil
+	}
+
 	pm.Host = host
 
 	if prober == nil {