Skip to content

Commit 90d7f03

Browse files
committed
chore: clean up cni non-constant Errorf usage
1 parent 868b59c commit 90d7f03

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

cni/network/network.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -281,14 +281,14 @@ func (plugin *NetPlugin) getPodInfo(args string) (name, ns string, err error) {
281281
if len(k8sNamespace) == 0 {
282282
errMsg := "Pod Namespace not specified in CNI Args"
283283
logger.Error(errMsg)
284-
return "", "", plugin.Errorf(errMsg)
284+
return "", "", plugin.Errorf("%s", errMsg)
285285
}
286286

287287
k8sPodName := string(podCfg.K8S_POD_NAME)
288288
if len(k8sPodName) == 0 {
289289
errMsg := "Pod Name not specified in CNI Args"
290290
logger.Error(errMsg)
291-
return "", "", plugin.Errorf(errMsg)
291+
return "", "", plugin.Errorf("%s", errMsg)
292292
}
293293

294294
return k8sPodName, k8sNamespace, nil
@@ -450,14 +450,14 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
450450
if len(k8sContainerID) == 0 {
451451
errMsg := "Container ID not specified in CNI Args"
452452
logger.Error(errMsg)
453-
return plugin.Errorf(errMsg)
453+
return plugin.Errorf("%s", errMsg)
454454
}
455455

456456
k8sIfName := args.IfName
457457
if len(k8sIfName) == 0 {
458458
errMsg := "Interfacename not specified in CNI Args"
459459
logger.Error(errMsg)
460-
return plugin.Errorf(errMsg)
460+
return plugin.Errorf("%s", errMsg)
461461
}
462462

463463
platformInit(nwCfg)
@@ -520,7 +520,7 @@ func (plugin *NetPlugin) Add(args *cniSkel.CmdArgs) error {
520520
errMsg := fmt.Sprintf("received multiple NC results %+v from CNS while dualnic feature is not supported", ipamAddResult.interfaceInfo)
521521
logger.Error("received multiple NC results from CNS while dualnic feature is not supported",
522522
zap.Any("results", ipamAddResult.interfaceInfo))
523-
return plugin.Errorf(errMsg)
523+
return plugin.Errorf("%s", errMsg)
524524
}
525525
} else {
526526
// when nwcfg.multitenancy (use multitenancy flag for swift v1 only) is false
@@ -790,7 +790,7 @@ func (plugin *NetPlugin) createEpInfo(opt *createEpInfoOpt) (*network.EndpointIn
790790
epPolicies, err := getPoliciesFromRuntimeCfg(opt.nwCfg, opt.ipamAddResult.ipv6Enabled) // not specific to delegated or infra
791791
if err != nil {
792792
logger.Error("failed to get policies from runtime configurations", zap.Error(err))
793-
return nil, plugin.Errorf(err.Error())
793+
return nil, plugin.Errorf("%s", err.Error())
794794
}
795795
endpointInfo.EndpointPolicies = append(endpointInfo.EndpointPolicies, epPolicies...)
796796

@@ -1228,14 +1228,14 @@ func (plugin *NetPlugin) Update(args *cniSkel.CmdArgs) error {
12281228
if len(k8sNamespace) == 0 {
12291229
errMsg := "Required parameter Pod Namespace not specified in CNI Args during UPDATE"
12301230
logger.Error(errMsg)
1231-
return plugin.Errorf(errMsg)
1231+
return plugin.Errorf("%s", errMsg)
12321232
}
12331233

12341234
k8sPodName := string(podCfg.K8S_POD_NAME)
12351235
if len(k8sPodName) == 0 {
12361236
errMsg := "Required parameter Pod Name not specified in CNI Args during UPDATE"
12371237
logger.Error(errMsg)
1238-
return plugin.Errorf(errMsg)
1238+
return plugin.Errorf("%s", errMsg)
12391239
}
12401240

12411241
// Initialize values from network config.
@@ -1245,7 +1245,7 @@ func (plugin *NetPlugin) Update(args *cniSkel.CmdArgs) error {
12451245
if _, err = plugin.nm.GetNetworkInfo(networkID); err != nil {
12461246
errMsg := fmt.Sprintf("Failed to query network during CNI UPDATE: %v", err)
12471247
logger.Error(errMsg)
1248-
return plugin.Errorf(errMsg)
1248+
return plugin.Errorf("%s", errMsg)
12491249
}
12501250

12511251
// Query the existing endpoint since this is an update.
@@ -1272,21 +1272,21 @@ func (plugin *NetPlugin) Update(args *cniSkel.CmdArgs) error {
12721272
if orchestratorContext, err = json.Marshal(podInfo); err != nil {
12731273
logger.Error("Marshalling KubernetesPodInfo failed",
12741274
zap.Error(err))
1275-
return plugin.Errorf(err.Error())
1275+
return plugin.Errorf("%s", err.Error())
12761276
}
12771277

12781278
cnsclient, err := cnscli.New(nwCfg.CNSUrl, defaultRequestTimeout)
12791279
if err != nil {
12801280
logger.Error("failed to initialized cns client",
12811281
zap.String("url", nwCfg.CNSUrl),
12821282
zap.String("error", err.Error()))
1283-
return plugin.Errorf(err.Error())
1283+
return plugin.Errorf("%s", err.Error())
12841284
}
12851285

12861286
if targetNetworkConfig, err = cnsclient.GetNetworkContainer(context.TODO(), orchestratorContext); err != nil {
12871287
logger.Info("GetNetworkContainer failed",
12881288
zap.Error(err))
1289-
return plugin.Errorf(err.Error())
1289+
return plugin.Errorf("%s", err.Error())
12901290
}
12911291

12921292
logger.Info("Network config received from cns",

0 commit comments

Comments
 (0)