reactor code and fix some bug

Signed-off-by: duanmengkk <[email protected]>

pkg/kubenest/constants/constant.go

@@ -39,7 +39,7 @@ const (
 	//controlplane apiserver
 	ApiServer                     = "apiserver"
 	ApiServerReplicas             = 2
-	ApiServerServiceSubnet        = "10.237.6.18/29"
+	ApiServerServiceSubnet        = "10.237.6.0/18"
 	ApiServerEtcdListenClientPort = 2379
 	ApiServerServiceType          = "NodePort"
 	// APICallRetryInterval defines how long kubeadm should wait before retrying a failed API operation

pkg/kubenest/controlplane/component.go

@@ -12,8 +12,8 @@ import (
 	"k8s.io/klog/v2"
 
 	"github.com/kosmos.io/kosmos/pkg/kubenest/constants"
-	controller "github.com/kosmos.io/kosmos/pkg/kubenest/manifest/controlplane/kube-controller"
-	scheduler "github.com/kosmos.io/kosmos/pkg/kubenest/manifest/controlplane/scheduler"
+	controller "github.com/kosmos.io/kosmos/pkg/kubenest/manifest/controlplane/kubecontroller"
+	"github.com/kosmos.io/kosmos/pkg/kubenest/manifest/controlplane/scheduler"
 	"github.com/kosmos.io/kosmos/pkg/kubenest/util"
 )
 
@@ -115,16 +115,17 @@ func getComponentConfigmaps(component string) []string {
 func getKubeControllerManagerManifest(name, namespace string) (*appsv1.Deployment, error) {
 	imageRepository, imageVersion := util.GetImageMessage()
 	kubeControllerManagerBytes, err := util.ParseTemplate(controller.KubeControllerManagerDeployment, struct {
-		DeploymentName, Namespace, ImageRepository, Version string
-		VirtualClusterCertsSecret, KubeconfigSecret         string
-		Replicas                                            int32
+		DeploymentName, Namespace, ImageRepository, Version        string
+		VirtualClusterCertsSecret, KubeconfigSecret, ServiceSubnet string
+		Replicas                                                   int32
 	}{
 		DeploymentName:            fmt.Sprintf("%s-%s", name, "kube-controller-manager"),
 		Namespace:                 namespace,
 		ImageRepository:           imageRepository,
 		Version:                   imageVersion,
 		VirtualClusterCertsSecret: fmt.Sprintf("%s-%s", name, "cert"),
 		KubeconfigSecret:          fmt.Sprintf("%s-%s", name, "admin-config"),
+		ServiceSubnet:             constants.ApiServerServiceSubnet,
 		Replicas:                  constants.KubeControllerReplicas,
 	})
 	if err != nil {
@@ -147,15 +148,15 @@ func getVirtualClusterSchedulerConfigMapManifest(name, namespace string) (*v1.Co
 		Namespace:      namespace,
 	})
 	if err != nil {
-		return nil, fmt.Errorf("error when parsing virtualCluster-scheduler configMap template: %w", err)
+		return nil, fmt.Errorf("error when parsing virtualCluster scheduler configMap template: %w", err)
 	}
 
-	scheduler := &v1.ConfigMap{}
-	if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), virtualClusterSchedulerConfigMapBytes, scheduler); err != nil {
-		return nil, fmt.Errorf("err when decoding virtualCluster-scheduler configMap: %w", err)
+	config := &v1.ConfigMap{}
+	if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), virtualClusterSchedulerConfigMapBytes, config); err != nil {
+		return nil, fmt.Errorf("err when decoding virtualCluster-config configMap: %w", err)
 	}
 
-	return scheduler, nil
+	return config, nil
 }
 
 func getVirtualClusterSchedulerManifest(name, namespace string) (*appsv1.Deployment, error) {
@@ -177,10 +178,10 @@ func getVirtualClusterSchedulerManifest(name, namespace string) (*appsv1.Deploym
 		return nil, fmt.Errorf("error when parsing virtualCluster-scheduler deployment template: %w", err)
 	}
 
-	scheduler := &appsv1.Deployment{}
-	if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), virtualClusterSchedulerBytes, scheduler); err != nil {
+	deploy := &appsv1.Deployment{}
+	if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), virtualClusterSchedulerBytes, deploy); err != nil {
 		return nil, fmt.Errorf("err when decoding virtualCluster-scheduler deployment: %w", err)
 	}
 
-	return scheduler, nil
+	return deploy, nil
 }

pkg/kubenest/controlplane/rbac.go

@@ -9,7 +9,7 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	clientsetscheme "k8s.io/client-go/kubernetes/scheme"
 
-	"github.com/kosmos.io/kosmos/pkg/kubenest/manifest/controlplane/rbac"
+	"github.com/kosmos.io/kosmos/pkg/kubenest/manifest/controlplane/scheduler"
 	"github.com/kosmos.io/kosmos/pkg/kubenest/util"
 )
 
@@ -27,7 +27,7 @@ func EnsureVirtualSchedulerRBAC(client clientset.Interface, namespace string) er
 }
 
 func grantVirtualClusterResourceClusterSA(client clientset.Interface, namespace string) error {
-	virtualClusterResourceClusterSABytes, err := util.ParseTemplate(rbac.VirtualSchedulerSA, struct {
+	virtualClusterResourceClusterSABytes, err := util.ParseTemplate(scheduler.VirtualSchedulerSA, struct {
 		Namespace string
 	}{
 		Namespace: namespace,
@@ -43,7 +43,7 @@ func grantVirtualClusterResourceClusterSA(client clientset.Interface, namespace
 }
 
 func grantVirtualClusterResourceClusterRoleBinding(client clientset.Interface, namespace string) error {
-	virtualClusterResourceClusterRoleBindingBytes, err := util.ParseTemplate(rbac.VirtualSchedulerRoleBinding, struct {
+	virtualClusterResourceClusterRoleBindingBytes, err := util.ParseTemplate(scheduler.VirtualSchedulerRoleBinding, struct {
 		Namespace string
 	}{
 		Namespace: namespace,
@@ -61,7 +61,7 @@ func grantVirtualClusterResourceClusterRoleBinding(client clientset.Interface, n
 
 func grantVirtualClusterResourceClusterRole(client clientset.Interface) error {
 	viewClusterrole := &rbacv1.ClusterRole{}
-	if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), []byte(rbac.VirtualSchedulerRole), viewClusterrole); err != nil {
+	if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), []byte(scheduler.VirtualSchedulerRole), viewClusterrole); err != nil {
 		return fmt.Errorf("err when decoding virtualCluster scheduler  Clusterrole: %w", err)
 	}
 	return util.CreateOrUpdateClusterRole(client, viewClusterrole)

pkg/kubenest/manifest/controlplane/kube-controller/manifests_deployment.go → pkg/kubenest/manifest/controlplane/kubecontroller/manifests_deployment.go

@@ -1,4 +1,4 @@
-package kube_controller
+package kubecontroller
 
 const (
 	// KubeControllerManagerDeployment is KubeControllerManage deployment manifest
@@ -66,7 +66,7 @@ spec:
         - --node-cidr-mask-size=24
         - --root-ca-file=/etc/virtualcluster/pki/ca.crt
         - --service-account-private-key-file=/etc/virtualcluster/pki/virtualCluster.key
-        - --service-cluster-ip-range=10.96.0.0/12
+        - --service-cluster-ip-range={{ .ServiceSubnet }}
         - --use-service-account-credentials=true
         - --v=4
         livenessProbe:

pkg/kubenest/manifest/controlplane/scheduler/manifest_configmap.go

@@ -1,4 +1,4 @@
-package kube_controller
+package scheduler
 
 const (
 	VirtualClusterSchedulerConfigMap = `

pkg/kubenest/manifest/controlplane/scheduler/manifest_deployment.go

@@ -1,4 +1,4 @@
-package kube_controller
+package scheduler
 
 const (
 	VirtualClusterSchedulerDeployment = `

pkg/kubenest/manifest/controlplane/rbac/manifests_rbac.go → pkg/kubenest/manifest/controlplane/scheduler/manifests_rbac.go

@@ -1,4 +1,4 @@
-package rbac
+package scheduler
 
 const (
 	VirtualSchedulerSA = `