Merge pull request #356 from alauda/fix/gc-node

fix: gc node lsp
kubeovn · May 25, 2020 · e967b4c · e967b4c
2 parents a5e978b + 84b6cdc
commit e967b4c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/pkg/controller/gc.go b/pkg/controller/gc.go
@@ -117,10 +117,6 @@ func (c *Controller) gcLogicalSwitchPort() error {
 		return err
 	}
 	for _, lsp := range lsps {
-		if !strings.Contains(lsp, ".") {
-			// ignore router ports
-			continue
-		}
 		if !util.IsStringIn(lsp, ipNames) {
 			klog.Infof("gc logical switch port %s", lsp)
 			if err := c.ovnClient.DeletePort(lsp); err != nil {

diff --git a/pkg/ovs/ovn-nbctl.go b/pkg/ovs/ovn-nbctl.go
@@ -164,7 +164,7 @@ func (c Client) LogicalSwitchExists(logicalSwitch string) (bool, error) {
 }
 
 func (c Client) ListLogicalSwitchPort() ([]string, error) {
-	output, err := c.ovnNbCommand("--format=csv", "--data=bare", "--no-heading", "--columns=name", "list", "logical_switch_port")
+	output, err := c.ovnNbCommand("--format=csv", "--data=bare", "--no-heading", "--columns=name", "find", "logical_switch_port", "type!=router")
 	if err != nil {
 		klog.Errorf("failed to list logical switch port, %v", err)
 		return nil, err