Fix SDN startup ordering (again)
@@ -207,6 +207,14 @@ func (node *OsdnNode) Start() error {
// Wait for kubelet to init the plugin so we get a knetwork.Host
log.V(5).Infof("Waiting for kubelet network plugin initialization")
<-node.kubeletInitReady
+ // Wait for kubelet itself to finish initializing
+ kwait.PollInfinite(100*time.Millisecond,
+ func() (bool, error) {
+ if node.host.GetRuntime() == nil {
+ return false, nil
+ }
+ return true, nil
+ })
log.V(5).Infof("Creating and initializing openshift-sdn pod manager")
node.podManager, err = newPodManager(node.host, node.multitenant, node.localSubnetCIDR, node.networkInfo, node.kClient, node.vnids, node.mtu)
