Merge pull request #60 from tssurya/bug-2034411

openshift-merge-robot · web-flow · commit fccaf1d98186 · 2022-02-09T19:05:50.000-05:00
Bug 2034411: Call ip6tables for v6 mode
diff --git a/pkg/macvlan/macvlan.go b/pkg/macvlan/macvlan.go
@@ -490,7 +490,13 @@ func macvlanCmdAdd(args *skel.CmdArgs) error {
 			}
 		}
 
-		ipt, err := iptables.New()
+		var ipt *iptables.IPTables
+		if isIPv6 {
+			ipt, err = iptables.NewWithProtocol(iptables.ProtocolIPv6)
+		} else {
+			ipt, err = iptables.NewWithProtocol(iptables.ProtocolIPv4)
+		}
+
 		if err != nil {
 			logging.Errorf("failed to get IPTables: %v", err)
 			return fmt.Errorf("failed to get IPTables: %v", err)

Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,13 @@ func macvlanCmdAdd(args *skel.CmdArgs) error {`
`490`	`490`	`}`
`491`	`491`	`}`
`492`	`492`
`493`		`- ipt, err := iptables.New()`
	`493`	`+ var ipt *iptables.IPTables`
	`494`	`+ if isIPv6 {`
	`495`	`+ ipt, err = iptables.NewWithProtocol(iptables.ProtocolIPv6)`
	`496`	`+ } else {`
	`497`	`+ ipt, err = iptables.NewWithProtocol(iptables.ProtocolIPv4)`
	`498`	`+ }`
	`499`	`+`
`494`	`500`	`if err != nil {`
`495`	`501`	`logging.Errorf("failed to get IPTables: %v", err)`
`496`	`502`	`return fmt.Errorf("failed to get IPTables: %v", err)`