Merge remote-tracking branch 'origin/master' into feature/multus-4.0

pkg/k8sclient/k8sclient.go

@@ -529,7 +529,7 @@ func getNetDelegate(client *ClientInfo, pod *v1.Pod, netname, confdir, namespace
 	isNetnamePath := strings.Contains(netname, "/")
 
 	// if netname is not directory or file, it must be net-attach-def name or CNI config name
-	if ! isNetnamePath {
+	if !isNetnamePath {
 		// option1) search CRD object for the network
 		net := &types.NetworkSelectionElement{
 			Name:      netname,
@@ -552,7 +552,7 @@ func getNetDelegate(client *ClientInfo, pod *v1.Pod, netname, confdir, namespace
 	} else {
 		fInfo, err := os.Stat(netname)
 		if err != nil {
-			return nil, resourceMap, err 
+			return nil, resourceMap, err
 		}
 
 		// option3) search directory