newTrafficManager skeleton

Author: thomasferrandiz

main.go

@@ -337,10 +337,7 @@ func main() {
 	}
 
 	//Create TrafficManager and instanciate it based on whether we use iptables or nftables
-	var iptm trafficmngr.TrafficManager
-
-	//For now, always use iptables
-	iptm = iptables.IPTablesManager{}
+	trafficMngr := newTrafficManager()
 	// Set up ipMasq if needed
 	if opts.ipMasq {
 		if config.EnableIPv4 {
@@ -351,22 +348,22 @@ func main() {
 				wg.Wait()
 				os.Exit(1)
 			}
-			if err = recycleIPTables(iptm, net, bn.Lease()); err != nil {
+			if err = recycleIPTables(trafficMngr, net, bn.Lease()); err != nil {
 				log.Errorf("Failed to recycle IPTables rules, %v", err)
 				cancel()
 				wg.Wait()
 				os.Exit(1)
 			}
 			log.Infof("Setting up masking rules")
-			iptm.CreateIP4Chain("nat", "FLANNEL-POSTRTG")
+			trafficMngr.CreateIP4Chain("nat", "FLANNEL-POSTRTG")
 			getRules := func() []trafficmngr.IPTablesRule {
 				if config.HasNetworks() {
-					return iptm.MasqRules(config.Networks, bn.Lease())
+					return trafficMngr.MasqRules(config.Networks, bn.Lease())
 				} else {
-					return iptm.MasqRules([]ip.IP4Net{config.Network}, bn.Lease())
+					return trafficMngr.MasqRules([]ip.IP4Net{config.Network}, bn.Lease())
 				}
 			}
-			go iptm.SetupAndEnsureIP4Tables(getRules, opts.iptablesResyncSeconds)
+			go trafficMngr.SetupAndEnsureIP4Tables(getRules, opts.iptablesResyncSeconds)
 
 		}
 		if config.EnableIPv6 {
@@ -377,22 +374,22 @@ func main() {
 				wg.Wait()
 				os.Exit(1)
 			}
-			if err = recycleIP6Tables(iptm, ip6net, bn.Lease()); err != nil {
+			if err = recycleIP6Tables(trafficMngr, ip6net, bn.Lease()); err != nil {
 				log.Errorf("Failed to recycle IP6Tables rules, %v", err)
 				cancel()
 				wg.Wait()
 				os.Exit(1)
 			}
 			log.Infof("Setting up masking ip6 rules")
-			iptm.CreateIP6Chain("nat", "FLANNEL-POSTRTG")
+			trafficMngr.CreateIP6Chain("nat", "FLANNEL-POSTRTG")
 			getRules := func() []trafficmngr.IPTablesRule {
 				if config.HasIPv6Networks() {
-					return iptm.MasqIP6Rules(config.IPv6Networks, bn.Lease())
+					return trafficMngr.MasqIP6Rules(config.IPv6Networks, bn.Lease())
 				} else {
-					return iptm.MasqIP6Rules([]ip.IP6Net{config.IPv6Network}, bn.Lease())
+					return trafficMngr.MasqIP6Rules([]ip.IP6Net{config.IPv6Network}, bn.Lease())
 				}
 			}
-			go iptm.SetupAndEnsureIP6Tables(getRules, opts.iptablesResyncSeconds)
+			go trafficMngr.SetupAndEnsureIP6Tables(getRules, opts.iptablesResyncSeconds)
 		}
 	}
 
@@ -409,11 +406,11 @@ func main() {
 				os.Exit(1)
 			}
 			log.Infof("Changing default FORWARD chain policy to ACCEPT")
-			iptm.CreateIP4Chain("filter", "FLANNEL-FWD")
+			trafficMngr.CreateIP4Chain("filter", "FLANNEL-FWD")
 			getRules := func() []trafficmngr.IPTablesRule {
-				return iptm.ForwardRules(net.String())
+				return trafficMngr.ForwardRules(net.String())
 			}
-			go iptm.SetupAndEnsureIP4Tables(getRules, opts.iptablesResyncSeconds)
+			go trafficMngr.SetupAndEnsureIP4Tables(getRules, opts.iptablesResyncSeconds)
 		}
 		if config.EnableIPv6 {
 			ip6net, err := config.GetFlannelIPv6Network(&bn.Lease().IPv6Subnet)
@@ -424,11 +421,11 @@ func main() {
 				os.Exit(1)
 			}
 			log.Infof("IPv6: Changing default FORWARD chain policy to ACCEPT")
-			iptm.CreateIP6Chain("filter", "FLANNEL-FWD")
+			trafficMngr.CreateIP6Chain("filter", "FLANNEL-FWD")
 			getRules := func() []trafficmngr.IPTablesRule {
-				return iptm.ForwardRules(ip6net.String())
+				return trafficMngr.ForwardRules(ip6net.String())
 			}
-			go iptm.SetupAndEnsureIP6Tables(getRules, opts.iptablesResyncSeconds)
+			go trafficMngr.SetupAndEnsureIP6Tables(getRules, opts.iptablesResyncSeconds)
 		}
 	}
 
@@ -662,3 +659,7 @@ func ReadIP6CIDRsFromSubnetFile(path string, CIDRKey string) []ip.IP6Net {
 	}
 	return prevCIDRs
 }
+
+func newTrafficManager() trafficmngr.TrafficManager {
+	return iptables.IPTablesManager{}
+}