github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-10 05:10:10 +00:00
Code Issues Projects Releases Wiki Activity

clean code (#952)

Browse Source 
Signed-off-by: yanggang <gang.yang@daocloud.io>

Signed-off-by: yanggang <gang.yang@daocloud.io>
This commit is contained in:
yanggang
2022-11-10 00:00:27 +08:00
committed by GitHub
parent 40d600b336
commit 103e70778b
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/k8sclient/k8sclient.go
View File

@@ -190,7 +190,7 @@ func parsePodNetworkAnnotation(podNetworks, defaultNamespace string) ([]*types.N
return nil, logging.Errorf("parsePodNetworkAnnotation: pod annotation does not have \"network\" as key") return nil, logging.Errorf("parsePodNetworkAnnotation: pod annotation does not have \"network\" as key")
} }
if strings.IndexAny(podNetworks, "[{\"") >= 0 { if strings.ContainsAny(podNetworks, "[{\"") {
if err := json.Unmarshal([]byte(podNetworks), &networks); err != nil { if err := json.Unmarshal([]byte(podNetworks), &networks); err != nil {
return nil, logging.Errorf("parsePodNetworkAnnotation: failed to parse pod Network Attachment Selection Annotation JSON format: %v", err) return nil, logging.Errorf("parsePodNetworkAnnotation: failed to parse pod Network Attachment Selection Annotation JSON format: %v", err)
} }

10
pkg/server/api/shim.go
View File

@@ -44,8 +44,7 @@ type ShimNetConf struct {
func CmdAdd(args *skel.CmdArgs) error { func CmdAdd(args *skel.CmdArgs) error {
response, cniVersion, err := postRequest(args) response, cniVersion, err := postRequest(args)
if err != nil { if err != nil {
logging.Errorf("CmdAdd (shim): %v", err) return logging.Errorf("CmdAdd (shim): %v", err)
return err
} }
logging.Verbosef("CmdAdd (shim): %v", *response.Result) logging.Verbosef("CmdAdd (shim): %v", *response.Result)
@@ -56,8 +55,7 @@ func CmdAdd(args *skel.CmdArgs) error {
func CmdCheck(args *skel.CmdArgs) error { func CmdCheck(args *skel.CmdArgs) error {
_, _, err := postRequest(args) _, _, err := postRequest(args)
if err != nil { if err != nil {
logging.Errorf("CmdCheck (shim): %v", err) return logging.Errorf("CmdCheck (shim): %v", err)
return err
} }
return err return err
@@ -67,10 +65,8 @@ func CmdCheck(args *skel.CmdArgs) error {
func CmdDel(args *skel.CmdArgs) error { func CmdDel(args *skel.CmdArgs) error {
_, _, err := postRequest(args) _, _, err := postRequest(args)
if err != nil { if err != nil {
logging.Errorf("CmdDel (shim): %v", err) return logging.Errorf("CmdDel (shim): %v", err)
return nil
} }
return nil return nil
} }

5
pkg/server/config/manager.go
View File

@@ -89,7 +89,10 @@ func overrideCNIVersion(cniConfigFile string, multusCNIVersion string) error {
func newManager(config MultusConf, multusConfigDir, defaultCNIPluginName string, forceCNIVersion bool) (*Manager, error) { func newManager(config MultusConf, multusConfigDir, defaultCNIPluginName string, forceCNIVersion bool) (*Manager, error) {
if forceCNIVersion { if forceCNIVersion {
overrideCNIVersion(cniPluginConfigFilePath(multusConfigDir, defaultCNIPluginName), config.CNIVersion) err := overrideCNIVersion(cniPluginConfigFilePath(multusConfigDir, defaultCNIPluginName), config.CNIVersion)
if err != nil {
return nil, err
}
} }
watcher, err := newWatcher(multusConfigDir) watcher, err := newWatcher(multusConfigDir)