upgrade: upgrade CNI

Signed-off-by: Starnop <[email protected]>

cri/ocicni/cni_manager.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/alibaba/pouch/cri/config"
 
+	cnicurrent "github.com/containernetworking/cni/pkg/types/current"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/sirupsen/logrus"
 )
@@ -32,7 +33,7 @@ func NewCniManager(cfg *config.Config) (CniMgr, error) {
 		}
 	}
 
-	plugin, err := ocicni.InitCNI(networkPluginConfDir, networkPluginBinDir)
+	plugin, err := ocicni.InitCNI("", networkPluginConfDir, networkPluginBinDir)
 	if err != nil {
 		return nil, err
 	}
@@ -87,12 +88,25 @@ func (c *CniManager) GetPodNetworkStatus(netnsPath string) (string, error) {
 		NetNS: netnsPath,
 	}
 
-	ip, err := c.plugin.GetPodNetworkStatus(podNetwork)
+	var err error
+	results, err := c.plugin.GetPodNetworkStatus(podNetwork)
 	if err != nil {
 		return "", fmt.Errorf("failed to get pod network status: %v", err)
 	}
 
-	return ip, nil
+	if len(results) > 0 {
+		// NOTE: only get the first IP of the first network at present
+		// TODO: support multiple network
+		if result, ok := results[0].(*cnicurrent.Result); ok {
+			if len(result.IPs) > 0 {
+				ip := result.IPs[0].Address.IP.String()
+				return ip, nil
+			}
+			return "", fmt.Errorf("failed to get pod network status for nil IP")
+		}
+		return "", fmt.Errorf("failed to get pod network status for wrong result: %+v", results[0])
+	}
+	return "", fmt.Errorf("failed to get pod network status for nil result")
 }
 
 // Status returns error if the network plugin is in error state.