Refactor TrafficManager windows files to clarify logs

translatecn · Apr 19, 2024 · 5c96864 · 5c96864
1 parent 2092b83
commit 5c96864
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/main.go b/main.go
@@ -561,11 +561,8 @@ func ReadIP6CIDRsFromSubnetFile(path string, CIDRKey string) []ip.IP6Net {
 
 func newTrafficManager(useNftables bool) trafficmngr.TrafficManager {
 	if useNftables {
-		log.Info("Starting flannel in nftables mode")
 		return &nftables.NFTablesManager{}
 	} else {
-		log.Info("Starting flannel in iptables mode")
 		return &iptables.IPTablesManager{}
-
 	}
 }
diff --git a/pkg/trafficmngr/iptables/iptables.go b/pkg/trafficmngr/iptables/iptables.go
@@ -48,6 +48,8 @@ type IPTablesManager struct {
 }
 
 func (iptm *IPTablesManager) Init(ctx context.Context, wg *sync.WaitGroup) error {
+	log.Info("Starting flannel in iptables mode...")
+
 	iptm.ipv4Rules = make([]trafficmngr.IPTablesRule, 0, 10)
 	iptm.ipv6Rules = make([]trafficmngr.IPTablesRule, 0, 10)
 	wg.Add(1)

diff --git a/pkg/trafficmngr/iptables/iptables_windows.go b/pkg/trafficmngr/iptables/iptables_windows.go
@@ -36,7 +36,7 @@ type IPTables interface {
 }
 
 func (iptm IPTablesManager) Init(ctx context.Context, wg *sync.WaitGroup) error {
-	log.Warning(trafficmngr.ErrUnimplemented)
+	log.Info("Starting flannel in windows mode...")
 	return nil
 }
 

diff --git a/pkg/trafficmngr/nftables/nftables.go b/pkg/trafficmngr/nftables/nftables.go
@@ -44,6 +44,7 @@ type NFTablesManager struct {
 }
 
 func (nftm *NFTablesManager) Init(ctx context.Context, wg *sync.WaitGroup) error {
+	log.Info("Starting flannel in nftables mode...")
 	var err error
 	nftm.nftv4, err = initTable(ctx, knftables.IPv4Family, ipv4Table)
 	if err != nil {

diff --git a/pkg/trafficmngr/nftables/nftables_windows.go b/pkg/trafficmngr/nftables/nftables_windows.go
@@ -29,7 +29,7 @@ type NFTablesManager struct {
 }
 
 func (nftm *NFTablesManager) Init(ctx context.Context, wg *sync.WaitGroup) error {
-	log.Warning(trafficmngr.ErrUnimplemented)
+	log.Info("Starting flannel in windows mode...")
 	return nil
 }