Merge pull request kosmos-io#424 from GreatLazyMan/virtualcluster_joi…

…n_controller title: virtualcluster join controller
GreatLazyMan · Mar 12, 2024 · 57f162a · 57f162a
2 parents ff48a76 + 09c7910
commit 57f162a
Show file tree

Hide file tree

Showing 7 changed files with 544 additions and 12 deletions.
diff --git a/cmd/clustertree-operator/app/tree_operator.go b/cmd/clustertree-operator/app/tree_operator.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/client-go/tools/clientcmd"
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/klog/v2"
@@ -55,9 +56,15 @@ func run(ctx context.Context, opts *options.Options) error {
 	}
 	config.QPS, config.Burst = opts.KubernetesOptions.QPS, opts.KubernetesOptions.Burst
 
+	newscheme := scheme.NewSchema()
+	err = apiextensionsv1.AddToScheme(newscheme)
+	if err != nil {
+		panic(err)
+	}
+
 	mgr, err := controllerruntime.NewManager(config, controllerruntime.Options{
 		Logger:                  klog.Background(),
-		Scheme:                  scheme.NewSchema(),
+		Scheme:                  newscheme,
 		LeaderElection:          opts.LeaderElection.LeaderElect,
 		LeaderElectionID:        opts.LeaderElection.ResourceName,
 		LeaderElectionNamespace: opts.LeaderElection.ResourceNamespace,
@@ -76,8 +83,9 @@ func run(ctx context.Context, opts *options.Options) error {
 	}
 
 	VirtualClusterJoinController := controller.VirtualClusterJoinController{
-		Client:        mgr.GetClient(),
-		EventRecorder: mgr.GetEventRecorderFor(constants.JoinControllerName),
+		Client:         mgr.GetClient(),
+		EventRecorder:  mgr.GetEventRecorderFor(constants.JoinControllerName),
+		KubeconfigPath: opts.KubernetesOptions.KubeConfig,
 	}
 	if err = VirtualClusterJoinController.SetupWithManager(mgr); err != nil {
 		return fmt.Errorf("error starting %s: %v", constants.JoinControllerName, err)

diff --git a/deploy/crds/kosmos.io_virtualclusters.yaml b/deploy/crds/kosmos.io_virtualclusters.yaml
@@ -75,9 +75,3 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/pkg/kosmosctl/manifest/manifest_crds.go b/pkg/kosmosctl/manifest/manifest_crds.go
@@ -420,6 +420,8 @@ spec:
             properties:
               clusterLinkOptions:
                 properties:
+                  autodetectionMethod:
+                    type: string
                   bridgeCIDRs:
                     default:
                       ip: 220.0.0.0/8
@@ -652,7 +654,6 @@ spec:
     storage: true
     subresources: {}
 `
-
 const NodeConfig = `---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

diff --git a/pkg/treeoperator/constants/constant.go b/pkg/treeoperator/constants/constant.go
@@ -3,4 +3,9 @@ package constants
 const (
 	InitControllerName = "virtual-cluster-init-controller"
 	JoinControllerName = "virtual-cluster-join-controller"
+
+	DefauleImageRepositoryEnv     = "IMAGE_REPOSITIRY"
+	DefauleImageVersionEnv        = "IMAGE_VERSION"
+	VirtualClusterStatusCompleted = "Completed"
+	VirtualClusterFinalizerName   = "kosmos.io/virtual-cluster-finalizer"
 )