Skip to content

Commit

Permalink
fix: allow mirror config update
Browse files Browse the repository at this point in the history
  • Loading branch information
@oilbeater
oilbeater committed Sep 14, 2020
1 parent 045c6e4 commit 729ed3c
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 19 deletions.
6 changes: 2 additions & 4 deletions cmd/daemon/cniserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@ func main() {
klog.Fatalf("parse config failed %v", err)
}

if config.EnableMirror {
if err = daemon.InitMirror(config); err != nil {
klog.Fatalf("failed to init mirror nic, %v", err)
}
if err = daemon.InitMirror(config); err != nil {
klog.Fatalf("failed to init mirror nic, %v", err)
}

if err = daemon.InitNodeGateway(config); err != nil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/daemon/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ func ParseFlags() (*Configuration, error) {
argPprofPort = pflag.Int("pprof-port", 10665, "The port to get profiling data, default: 10665")

argsNetworkType = pflag.String("network-type", "geneve", "The ovn network type, default: geneve")
argsDefaultProviderName = pflag.String("default-provider-name", "provider", "The vlan or xvlan type default provider interface name, default: provider")
argsDefaultInterfaceName = pflag.String("default-interface-name", "", "The default host interface name in the vlan/xvlan type")
argsDefaultProviderName = pflag.String("default-provider-name", "provider", "The vlan or vxlan type default provider interface name, default: provider")
argsDefaultInterfaceName = pflag.String("default-interface-name", "", "The default host interface name in the vlan/vxlan type")
)

// mute info log for ipset lib
Expand Down
7 changes: 6 additions & 1 deletion pkg/daemon/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,12 @@ func InitNodeGateway(config *Configuration) error {
}

func InitMirror(config *Configuration) error {
return configureMirror(config.MirrorNic, config.MTU)
if config.EnableMirror {
return configureMirror(config.MirrorNic, config.MTU)
} else {
return removeMirror(config.MirrorNic)
}

}

func InitVlan(config *Configuration) error {
Expand Down
35 changes: 23 additions & 12 deletions pkg/daemon/ovs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (csh cniServerHandler) configureNic(podName, podNamespace, netns, container
ifaceID := fmt.Sprintf("%s.%s", podName, podNamespace)
ovs.CleanDuplicatePort(ifaceID)
// Add veth pair host end to ovs port
output, err := ovs.Exec("--may-exist", "add-port", "br-int", hostNicName, "--",
output, err := ovs.Exec(ovs.MayExist, "add-port", "br-int", hostNicName, "--",
"set", "interface", hostNicName, fmt.Sprintf("external_ids:iface-id=%s", ifaceID))
if err != nil {
return fmt.Errorf("add nic to ovs failed %v: %q", err, output)
Expand All @@ -48,7 +48,7 @@ func (csh cniServerHandler) configureNic(podName, podNamespace, netns, container
if err != nil {
return fmt.Errorf("failed to parse mac %s %v", macAddr, err)
}
if err = configureHostNic(hostNicName, vlanID, macAddr); err != nil {
if err = configureHostNic(hostNicName, vlanID); err != nil {
return err
}
if err = ovs.SetInterfaceBandwidth(fmt.Sprintf("%s.%s", podName, podNamespace), ingress, egress); err != nil {
Expand All @@ -68,7 +68,7 @@ func (csh cniServerHandler) configureNic(podName, podNamespace, netns, container
func (csh cniServerHandler) deleteNic(podName, podNamespace, containerID, deviceID string) error {
hostNicName, _ := generateNicName(containerID)
// Remove ovs port
output, err := ovs.Exec("--if-exists", "--with-iface", "del-port", "br-int", hostNicName)
output, err := ovs.Exec(ovs.IfExists, "--with-iface", "del-port", "br-int", hostNicName)
if err != nil {
return fmt.Errorf("failed to delete ovs port %v, %q", err, output)
}
Expand Down Expand Up @@ -97,7 +97,7 @@ func generateNicName(containerID string) (string, string) {
return fmt.Sprintf("%s_h", containerID[0:12]), fmt.Sprintf("%s_c", containerID[0:12])
}

func configureHostNic(nicName, vlanID string, macAddr net.HardwareAddr) error {
func configureHostNic(nicName, vlanID string) error {
hostLink, err := netlink.LinkByName(nicName)
if err != nil {
return fmt.Errorf("can not find host nic %s %v", nicName, err)
Expand Down Expand Up @@ -208,12 +208,12 @@ func waiteNetworkReady(gateway string) error {
}

func configureNodeNic(portName, ip, gw string, macAddr net.HardwareAddr, mtu int) error {
raw, err := ovs.Exec("--may-exist", "add-port", "br-int", util.NodeNic, "--",
raw, err := ovs.Exec(ovs.MayExist, "add-port", "br-int", util.NodeNic, "--",
"set", "interface", util.NodeNic, "type=internal", "--",
"set", "interface", util.NodeNic, fmt.Sprintf("external_ids:iface-id=%s", portName))
if err != nil {
klog.Errorf("failed to configure node nic %s %q", portName, raw)
return fmt.Errorf(string(raw))
return fmt.Errorf(raw)
}

if err = configureNic(util.NodeNic, ip, macAddr, mtu); err != nil {
Expand Down Expand Up @@ -242,15 +242,15 @@ func configureNodeNic(portName, ip, gw string, macAddr net.HardwareAddr, mtu int
}

func configureMirror(portName string, mtu int) error {
raw, err := ovs.Exec("--may-exist", "add-port", "br-int", portName, "--",
raw, err := ovs.Exec(ovs.MayExist, "add-port", "br-int", portName, "--",
"set", "interface", portName, "type=internal", "--",
"clear", "bridge", "br-int", "mirrors", "--",
"--id=@mirror0", "get", "port", portName, "--",
"--id=@m", "create", "mirror", "name=m0", "select_all=true", "output_port=@mirror0", "--",
"add", "bridge", "br-int", "mirrors", "@m")
if err != nil {
klog.Errorf("failed to configure mirror nic %s %q", portName, raw)
return fmt.Errorf(string(raw))
return fmt.Errorf(raw)
}

mirrorLink, err := netlink.LinkByName(portName)
Expand All @@ -271,6 +271,17 @@ func configureMirror(portName string, mtu int) error {
return nil
}

func removeMirror(portName string) error {
raw, err := ovs.Exec(ovs.IfExists, "--with-iface", "del-port", "br-int", portName, "--",
"clear", "bridge", "br-int", "mirrors", "--",
ovs.IfExists, "destroy", "mirror", "m0")
if err != nil {
klog.Errorf("failed to remove mirror config, %v, %q", err, raw)
return fmt.Errorf(raw)
}
return nil
}

func configureNic(link, ip string, macAddr net.HardwareAddr, mtu int) error {
nodeLink, err := netlink.LinkByName(link)
if err != nil {
Expand Down Expand Up @@ -303,19 +314,19 @@ func configureNic(link, ip string, macAddr net.HardwareAddr, mtu int) error {
}

func configProviderPort(providerInterfaceName string) error {
output, err := ovs.Exec("--may-exist", "add-br", "br-provider", "--",
output, err := ovs.Exec(ovs.MayExist, "add-br", "br-provider", "--",
"set", "open", ".", fmt.Sprintf("external-ids:ovn-bridge-mappings=%s:br-provider", providerInterfaceName))
if err != nil {
return fmt.Errorf("failed to create bridge br-provider, %v: %q", err, output)
}

output, err = ovs.Exec("--may-exist", "add-port", "br-provider", "provider-int", "--",
output, err = ovs.Exec(ovs.MayExist, "add-port", "br-provider", "provider-int", "--",
"set", "interface", "provider-int", "type=patch", "options:peer=int-provider")
if err != nil {
return fmt.Errorf("failed to create patch port provider-int, %v: %q", err, output)
}

output, err = ovs.Exec("--may-exist", "add-port", "br-int", "int-provider", "--",
output, err = ovs.Exec(ovs.MayExist, "add-port", "br-int", "int-provider", "--",
"set", "interface", "int-provider", "type=patch", "options:peer=provider-int")
if err != nil {
return fmt.Errorf("failed to create patch port int-provider, %v: %q", err, output)
Expand Down Expand Up @@ -345,7 +356,7 @@ func providerBridgeExists() (bool, error) {
// A physical Ethernet device that is part of an Open vSwitch bridge should not have an IP address. If one does, then that IP address will not be fully functional.
// More info refer http://docs.openvswitch.org/en/latest/faq/issues
func configProviderNic(nicName string) error {
_, err := ovs.Exec("--may-exist", "add-port", "br-provider", nicName)
_, err := ovs.Exec(ovs.MayExist, "add-port", "br-provider", nicName)
return err
}

Expand Down

0 comments on commit 729ed3c

Please sign in to comment.