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

code clean for if condtion (#1037)

Browse Source 
Signed-off-by: yanggang <gang.yang@daocloud.io>
This commit is contained in:
杨刚 (成都) 2023-02-14 00:41:51 +08:00 committed by GitHub
parent f5b64339bf
commit 43e2008107
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/multus-shim/main.go
View File

@ -39,7 +39,7 @@ func main() {
flag.BoolVar(&versionOpt, "v", false, "Show application version") flag.BoolVar(&versionOpt, "v", false, "Show application version")
flag.Parse() flag.Parse()
if versionOpt == true { if versionOpt {
fmt.Printf("multus-shim: %s\n", multus.PrintVersionString()) fmt.Printf("multus-shim: %s\n", multus.PrintVersionString())
return return
} }

2
cmd/multus/main.go
View File

@ -38,7 +38,7 @@ func main() {
flag.BoolVar(&versionOpt, "version", false, "Show application version") flag.BoolVar(&versionOpt, "version", false, "Show application version")
flag.BoolVar(&versionOpt, "v", false, "Show application version") flag.BoolVar(&versionOpt, "v", false, "Show application version")
flag.Parse() flag.Parse()
if versionOpt == true { if versionOpt {
fmt.Printf("multus: %s\n", multus.PrintVersionString()) fmt.Printf("multus: %s\n", multus.PrintVersionString())
return return
} }

4
pkg/k8sclient/k8sclient.go
View File

@ -372,7 +372,7 @@ func TryLoadPodDelegates(pod *v1.Pod, conf *types.NetConf, clientInfo *ClientInf
} }
} }
if isGatewayConfigured == true { if isGatewayConfigured {
err = types.CheckGatewayConfig(conf.Delegates) err = types.CheckGatewayConfig(conf.Delegates)
if err != nil { if err != nil {
return 0, nil, err return 0, nil, err
@ -680,7 +680,7 @@ const ConfigSourceAnnotationKey = "kubernetes.io/config.source"
// IsStaticPod returns true if the pod is static pod. // IsStaticPod returns true if the pod is static pod.
func IsStaticPod(pod *v1.Pod) bool { func IsStaticPod(pod *v1.Pod) bool {
if pod.Annotations != nil { if pod.Annotations != nil {
if source, ok := pod.Annotations[ConfigSourceAnnotationKey]; ok == true { if source, ok := pod.Annotations[ConfigSourceAnnotationKey]; ok {
return source != "api" return source != "api"
} }
} }

2
pkg/multus/multus.go
View File

@ -875,7 +875,7 @@ func CmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient *k8s.ClientInfo) er
// set CNIVersion in delegate CNI config if there is no CNIVersion and multus conf have CNIVersion. // set CNIVersion in delegate CNI config if there is no CNIVersion and multus conf have CNIVersion.
for _, v := range in.Delegates { for _, v := range in.Delegates {
if v.ConfListPlugin == true && v.ConfList.CNIVersion == "" && in.CNIVersion != "" { if v.ConfListPlugin && v.ConfList.CNIVersion == "" && in.CNIVersion != "" {
v.ConfList.CNIVersion = in.CNIVersion v.ConfList.CNIVersion = in.CNIVersion
v.Bytes, err = json.Marshal(v.ConfList) v.Bytes, err = json.Marshal(v.ConfList)
if err != nil { if err != nil {