Merge pull request spidernet-io#2756 from cyclinder/init_pod/fix_init…

…_multus

init-pod: don't init multus CR if multus is disable

cmd/coordinator/cmd/command_add.go

@@ -6,14 +6,15 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/containernetworking/cni/pkg/skel"
 	"github.com/containernetworking/cni/pkg/types"
 	current "github.com/containernetworking/cni/pkg/types/100"
 	"github.com/containernetworking/plugins/pkg/ns"
 	"github.com/vishvananda/netlink"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
-	"time"
 
 	"github.com/spidernet-io/spiderpool/api/v1/agent/client/daemonset"
 	"github.com/spidernet-io/spiderpool/api/v1/agent/models"
@@ -162,21 +163,20 @@ func CmdAdd(args *skel.CmdArgs) (err error) {
 				logger.Error("failed to GetDefaultGatewayByName", zap.Error(err))
 				return fmt.Errorf("failed to GetDefaultGatewayByName: %v", err)
 			}
+
+			logger.Debug("Get GetDefaultGatewayByName", zap.Strings("Gws", gws))
+			for _, gw := range gws {
+				p, err := gwconnection.NewPinger(conf.DetectOptions.Retry, conf.DetectOptions.Interval, conf.DetectOptions.TimeOut, gw, logger)
+				if err != nil {
+					return fmt.Errorf("failed to run NewPinger: %v", err)
+				}
+				errg.Go(p.DetectGateway)
+			}
 			return nil
 		})
 		if err != nil {
 			return err
 		}
-
-		logger.Debug("Get GetDefaultGatewayByName", zap.Strings("Gws", gws))
-
-		for _, gw := range gws {
-			p, err := gwconnection.NewPinger(conf.DetectOptions.Retry, conf.DetectOptions.Interval, conf.DetectOptions.TimeOut, gw, logger)
-			if err != nil {
-				return fmt.Errorf("failed to run NewPinger: %v", err)
-			}
-			errg.Go(p.DetectGateway)
-		}
 	} else {
 		logger.Debug("disable detect gateway")
 	}
@@ -194,7 +194,7 @@ func CmdAdd(args *skel.CmdArgs) (err error) {
 
 	if err = errg.Wait(); err != nil {
 		logger.Error("failed to ip checking", zap.Error(err))
-		return fmt.Errorf("failed to ip checking: %w", err)
+		return err
 	}
 
 	// overwrite mac address

cmd/spiderpool-init/cmd/root.go

@@ -146,8 +146,10 @@ func Execute() {
 		}
 	}
 
-	if err = InitMultusDefaultCR(ctx, &config, client); err != nil {
-		logger.Fatal(err.Error())
+	if config.enableMultusConfig {
+		if err = InitMultusDefaultCR(ctx, &config, client); err != nil {
+			logger.Fatal(err.Error())
+		}
 	}
 
 	if err = makeReadinessReady(&config); err != nil {