Merge pull request #1496 from zhouqiu0103/add-vip

Clean up the vip when delete cluster or nodes
kubesphere · Sep 8, 2022 · 2d2fd3d · 2d2fd3d
2 parents c2d063c + b1be963
commit 2d2fd3d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/pkg/loadbalancer/module.go b/pkg/loadbalancer/module.go
@@ -353,15 +353,24 @@ func (k *DeleteVIPModule) Init() {
 	k.Name = "DeleteVIPModule"
 	k.Desc = "Delete VIP"
 
+	getInterface := &task.RemoteTask{
+		Name:     "GetNodeInterface",
+		Desc:     "Get Node Interface",
+		Hosts:    k.Runtime.GetHostsByRole(common.Master),
+		Action:   new(GetInterfaceName),
+		Parallel: true,
+	}
+
 	DeleteVIP := &task.RemoteTask{
-		Name:     "GenerateKubevipManifest",
-		Desc:     "Generate kubevip manifest at other master",
+		Name:     "Delete VIP",
+		Desc:     "Delete the VIP",
 		Hosts:    k.Runtime.GetHostsByRole(common.Master),
 		Action:   new(DeleteVIP),
 		Parallel: true,
 	}
 
 	k.Tasks = []task.Interface{
+		getInterface,
 		DeleteVIP,
 	}
 }
diff --git a/pkg/loadbalancer/tasks.go b/pkg/loadbalancer/tasks.go
@@ -303,12 +303,12 @@ type DeleteVIP struct {
 }
 
 func (g *DeleteVIP) Execute(runtime connector.Runtime) error {
-	if g.KubeConf.Cluster.ControlPlaneEndpoint.KubeVip.Mode == "BGP" {
-		cmd := fmt.Sprintf("ip addr del %s dev lo", g.KubeConf.Cluster.ControlPlaneEndpoint.Address)
-		_, err := runtime.GetRunner().SudoCmd(cmd, false)
-		if err != nil {
-			return err
-		}
+	host := runtime.RemoteHost()
+	interfaceName, ok := host.GetCache().GetMustString("interface")
+	if !ok {
+		return errors.New("get interface failed")
 	}
+	cmd := fmt.Sprintf("ip addr del %s dev %s", g.KubeConf.Cluster.ControlPlaneEndpoint.Address, interfaceName)
+	runtime.GetRunner().SudoCmd(cmd, false)
 	return nil
 }