setting cni network plugins dynamically

pkg/hyper/hyper.go

@@ -108,11 +108,13 @@ func (h *Runtime) Status() (*kubeapi.RuntimeStatus, error) {
 		Type:   kubeapi.RuntimeReady,
 		Status: true,
 	}
-	// Always set networkReady for now.
-	// TODO: get real network status when network plugin is enabled.
+	var netReady bool
+	if err := h.netPlugin.Status(); err == nil {
+		netReady = true
+	}
 	networkReady := &kubeapi.RuntimeCondition{
 		Type:   kubeapi.NetworkReady,
-		Status: true,
+		Status: netReady,
 	}
 	conditions := []*kubeapi.RuntimeCondition{runtimeReady, networkReady}
 	if _, _, err := h.client.GetVersion(); err != nil {

pkg/hyper/ocicni/ocicni.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"sort"
 	"sync"
-	"time"
 
 	"github.com/containernetworking/cni/libcni"
 	cnitypes "github.com/containernetworking/cni/pkg/types"
@@ -47,26 +46,8 @@ type cniNetwork struct {
 
 func InitCNI(netDir string, pluginDirs ...string) (CNIPlugin, error) {
 	plugin := probeNetworkPluginsWithVendorCNIDirPrefix(netDir, pluginDirs, "")
-	var err error
 
-	// check if a default network exists, otherwise dump the CNI search and return a noop plugin
-	_, err = getDefaultCNINetwork(plugin.netDir, plugin.pluginDirs, plugin.vendorCNIDirPrefix)
-	if err != nil {
-		glog.Warningf("Error in finding usable CNI plugin - %v", err)
-		// create a noop plugin instead
-		return &cniNoOp{}, nil
-	}
-
-	// sync network config from netDir periodically to detect network config updates
-	go func() {
-		t := time.NewTimer(10 * time.Second)
-		for {
-			plugin.syncNetworkConfig()
-			select {
-			case <-t.C:
-			}
-		}
-	}()
+	plugin.syncNetworkConfig()
 	return plugin, nil
 }
 
@@ -231,5 +212,6 @@ func buildCNIRuntimeConf(podNetnsPath string, podID string) (*libcni.RuntimeConf
 }
 
 func (plugin *cniNetworkPlugin) Status() error {
+	plugin.syncNetworkConfig()
 	return plugin.checkInitialized()
 }