@@ -294,14 +294,14 @@ func (plugin *NetPlugin) getPodInfo(args string) (name, ns string, err error) {
294294 if len (k8sNamespace ) == 0 {
295295 errMsg := "Pod Namespace not specified in CNI Args"
296296 logger .Error (errMsg )
297- return "" , "" , plugin .Errorf (errMsg )
297+ return "" , "" , plugin .Errorf ("%s" , errMsg )
298298 }
299299
300300 k8sPodName := string (podCfg .K8S_POD_NAME )
301301 if len (k8sPodName ) == 0 {
302302 errMsg := "Pod Name not specified in CNI Args"
303303 logger .Error (errMsg )
304- return "" , "" , plugin .Errorf (errMsg )
304+ return "" , "" , plugin .Errorf ("%s" , errMsg )
305305 }
306306
307307 return k8sPodName , k8sNamespace , nil
@@ -495,14 +495,14 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
495495 if len (k8sContainerID ) == 0 {
496496 errMsg := "Container ID not specified in CNI Args"
497497 logger .Error (errMsg )
498- return plugin .Errorf (errMsg )
498+ return plugin .Errorf ("%s" , errMsg )
499499 }
500500
501501 k8sIfName := args .IfName
502502 if len (k8sIfName ) == 0 {
503503 errMsg := "Interfacename not specified in CNI Args"
504504 logger .Error (errMsg )
505- return plugin .Errorf (errMsg )
505+ return plugin .Errorf ("%s" , errMsg )
506506 }
507507
508508 platformInit (nwCfg )
@@ -565,7 +565,7 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
565565 errMsg := fmt .Sprintf ("received multiple NC results %+v from CNS while dualnic feature is not supported" , ipamAddResult .interfaceInfo )
566566 logger .Error ("received multiple NC results from CNS while dualnic feature is not supported" ,
567567 zap .Any ("results" , ipamAddResult .interfaceInfo ))
568- return plugin .Errorf (errMsg )
568+ return plugin .Errorf ("%s" , errMsg )
569569 }
570570 } else {
571571 // when nwcfg.multitenancy (use multitenancy flag for swift v1 only) is false
@@ -842,7 +842,7 @@ func (plugin *NetPlugin) createEpInfo(opt *createEpInfoOpt) (*network.EndpointIn
842842 epPolicies , err := getPoliciesFromRuntimeCfg (opt .nwCfg , opt .ipamAddResult .ipv6Enabled ) // not specific to delegated or infra
843843 if err != nil {
844844 logger .Error ("failed to get policies from runtime configurations" , zap .Error (err ))
845- return nil , plugin .Errorf (err .Error ())
845+ return nil , plugin .Errorf ("%s" , err .Error ())
846846 }
847847 endpointInfo .EndpointPolicies = append (endpointInfo .EndpointPolicies , epPolicies ... )
848848
@@ -1311,14 +1311,14 @@ func (plugin *NetPlugin) Update(args *cniSkel.CmdArgs) error {
13111311 if len (k8sNamespace ) == 0 {
13121312 errMsg := "Required parameter Pod Namespace not specified in CNI Args during UPDATE"
13131313 logger .Error (errMsg )
1314- return plugin .Errorf (errMsg )
1314+ return plugin .Errorf ("%s" , errMsg )
13151315 }
13161316
13171317 k8sPodName := string (podCfg .K8S_POD_NAME )
13181318 if len (k8sPodName ) == 0 {
13191319 errMsg := "Required parameter Pod Name not specified in CNI Args during UPDATE"
13201320 logger .Error (errMsg )
1321- return plugin .Errorf (errMsg )
1321+ return plugin .Errorf ("%s" , errMsg )
13221322 }
13231323
13241324 // Initialize values from network config.
@@ -1328,7 +1328,7 @@ func (plugin *NetPlugin) Update(args *cniSkel.CmdArgs) error {
13281328 if _ , err = plugin .nm .GetNetworkInfo (networkID ); err != nil {
13291329 errMsg := fmt .Sprintf ("Failed to query network during CNI UPDATE: %v" , err )
13301330 logger .Error (errMsg )
1331- return plugin .Errorf (errMsg )
1331+ return plugin .Errorf ("%s" , errMsg )
13321332 }
13331333
13341334 // Query the existing endpoint since this is an update.
@@ -1355,21 +1355,21 @@ func (plugin *NetPlugin) Update(args *cniSkel.CmdArgs) error {
13551355 if orchestratorContext , err = json .Marshal (podInfo ); err != nil {
13561356 logger .Error ("Marshalling KubernetesPodInfo failed" ,
13571357 zap .Error (err ))
1358- return plugin .Errorf (err .Error ())
1358+ return plugin .Errorf ("%s" , err .Error ())
13591359 }
13601360
13611361 cnsclient , err := cnscli .New (nwCfg .CNSUrl , defaultRequestTimeout )
13621362 if err != nil {
13631363 logger .Error ("failed to initialized cns client" ,
13641364 zap .String ("url" , nwCfg .CNSUrl ),
13651365 zap .String ("error" , err .Error ()))
1366- return plugin .Errorf (err .Error ())
1366+ return plugin .Errorf ("%s" , err .Error ())
13671367 }
13681368
13691369 if targetNetworkConfig , err = cnsclient .GetNetworkContainer (context .TODO (), orchestratorContext ); err != nil {
13701370 logger .Info ("GetNetworkContainer failed" ,
13711371 zap .Error (err ))
1372- return plugin .Errorf (err .Error ())
1372+ return plugin .Errorf ("%s" , err .Error ())
13731373 }
13741374
13751375 logger .Info ("Network config received from cns" ,
0 commit comments