automatically clean dummy interface and iptables rule when yurthub is…

… stopped by k8s (#530)
openyurtio · Oct 25, 2021 · ad08d1c · ad08d1c
1 parent e3b0f65
commit ad08d1c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/cmd/yurthub/yurthub.go b/cmd/yurthub/yurthub.go
@@ -22,12 +22,12 @@ import (
 	"time"
 
 	"github.com/openyurtio/openyurt/cmd/yurthub/app"
-	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/apiserver/pkg/server"
 )
 
 func main() {
 	rand.Seed(time.Now().UnixNano())
-	cmd := app.NewCmdStartYurtHub(wait.NeverStop)
+	cmd := app.NewCmdStartYurtHub(server.SetupSignalHandler())
 	cmd.Flags().AddGoFlagSet(flag.CommandLine)
 	if err := cmd.Execute(); err != nil {
 		panic(err)

diff --git a/pkg/yurthub/network/iptables.go b/pkg/yurthub/network/iptables.go
@@ -84,3 +84,12 @@ func (im *IptablesManager) EnsureIptablesRules() error {
 	}
 	return nil
 }
+
+func (im *IptablesManager) CleanUpIptablesRules() {
+	for _, rule := range im.rules {
+		err := im.iptables.DeleteRule(rule.table, rule.chain, rule.args...)
+		if err != nil {
+			klog.Errorf("failed to delete iptables rule(%s -t %s %s %s), %v", rule.pos, rule.table, rule.chain, strings.Join(rule.args, " "), err)
+		}
+	}
+}
diff --git a/pkg/yurthub/network/network.go b/pkg/yurthub/network/network.go
@@ -76,6 +76,11 @@ func (m *NetworkManager) Run(stopCh <-chan struct{}) {
 			select {
 			case <-stopCh:
 				klog.Infof("exit network manager run goroutine normally")
+				m.iptablesManager.CleanUpIptablesRules()
+				err := m.ifController.DeleteDummyInterface(m.dummyIfName)
+				if err != nil {
+					klog.Errorf("failed to delete dummy interface %s, %v", m.dummyIfName, err)
+				}
 				return
 			case <-ticker.C:
 				if err := m.configureNetwork(); err != nil {