Merge pull request #489 from qiuwei68/feature_hostports

feat: add ReleaseHostPort for api server and service
kosmos-io · Apr 25, 2024 · 251d1f5 · 251d1f5
2 parents 08051b0 + 1ab4b0c
commit 251d1f5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/pkg/kubenest/controller/virtualcluster_init_controller.go b/pkg/kubenest/controller/virtualcluster_init_controller.go
@@ -320,7 +320,6 @@ func (c *VirtualClusterInitController) assignNodesByPolicy(virtualCluster *v1alp
 				return nil, errors.Wrapf(err, "Failed to update globalNode %s to InUse", updated.Name)
 			}
 		}
-
 	} else { // nodes needs to decrease
 		klog.V(2).Infof("Try decrease nodes %d for policy %s", -requestNodesChanged, policy.LabelSelector.String())
 		decrease := int(-requestNodesChanged)

diff --git a/pkg/kubenest/controlplane/apiserver.go b/pkg/kubenest/controlplane/apiserver.go
@@ -8,6 +8,7 @@ import (
 	kuberuntime "k8s.io/apimachinery/pkg/runtime"
 	clientset "k8s.io/client-go/kubernetes"
 	clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/klog/v2"
 
 	"github.com/kosmos.io/kosmos/pkg/kubenest/constants"
 	vcnodecontroller "github.com/kosmos.io/kosmos/pkg/kubenest/controller/virtualcluster.node.controller"
@@ -27,11 +28,15 @@ func EnsureVirtualClusterAPIServer(client clientset.Interface, name, namespace s
 	return nil
 }
 
-func DeleteVirtualClusterAPIServer(client clientset.Interface, name, namespace string) error {
+func DeleteVirtualClusterAPIServer(client clientset.Interface, name, namespace string, manager *vcnodecontroller.HostPortManager) error {
 	deployName := fmt.Sprintf("%s-%s", name, "apiserver")
 	if err := util.DeleteDeployment(client, deployName, namespace); err != nil {
 		return errors.Wrapf(err, "Failed to delete deployment %s/%s", deployName, namespace)
 	}
+	err := manager.ReleaseHostPort(name)
+	if err != nil {
+		klog.Errorf("Error releasing host port for cluster %s: %v", name, err)
+	}
 	return nil
 }
 

diff --git a/pkg/kubenest/controlplane/service.go b/pkg/kubenest/controlplane/service.go
@@ -32,7 +32,7 @@ func EnsureVirtualClusterService(client clientset.Interface, name, namespace str
 	return nil
 }
 
-func DeleteVirtualClusterService(client clientset.Interface, name, namespace string) error {
+func DeleteVirtualClusterService(client clientset.Interface, name, namespace string, manager *vcnodecontroller.HostPortManager) error {
 	services := []string{
 		fmt.Sprintf("%s-%s", name, "apiserver"),
 		fmt.Sprintf("%s-%s", name, "etcd"),
@@ -49,6 +49,11 @@ func DeleteVirtualClusterService(client clientset.Interface, name, namespace str
 		}
 	}
 
+	err := manager.ReleaseHostPort(name)
+	if err != nil {
+		klog.Errorf("Error releasing host port for cluster %s: %v", name, err)
+	}
+
 	klog.V(2).Infof("Successfully uninstalled service for virtualcluster %s", name)
 	return nil
 }

diff --git a/pkg/kubenest/tasks/apiserver.go b/pkg/kubenest/tasks/apiserver.go
@@ -101,6 +101,7 @@ func uninstallVirtualClusterAPIServer(r workflow.RunData) error {
 		data.RemoteClient(),
 		data.GetName(),
 		data.GetNamespace(),
+		data.GetHostPortManager(),
 	)
 	if err != nil {
 		return fmt.Errorf("failed to install virtual cluster apiserver component, err: %w", err)

diff --git a/pkg/kubenest/tasks/service.go b/pkg/kubenest/tasks/service.go
@@ -78,6 +78,7 @@ func uninstallVirtualClusterService(r workflow.RunData) error {
 		data.RemoteClient(),
 		data.GetName(),
 		data.GetNamespace(),
+		data.GetHostPortManager(),
 	)
 	if err != nil {
 		return fmt.Errorf("failed to uninstall virtual cluster service , err: %w", err)