Merge pull request #470 from duanmengkk/main

modify virtualcluster's definition

deploy/crds/kosmos.io_virtualclusters.yaml

@@ -34,7 +34,15 @@ spec:
           spec:
             description: Spec is the specification for the behaviour of the VirtualCluster.
             properties:
-              PromotePolicies:
+              externalIP:
+                description: ExternalIP is the external ip of the virtual kubernetes's
+                  control plane
+                type: string
+              kubeconfig:
+                description: Kubeconfig is the kubeconfig of the virtual kubernetes's
+                  control plane
+                type: string
+              promotePolicies:
                 description: PromotePolicies definites the policies for promote to
                   the kubernetes's control plane
                 items:
@@ -88,17 +96,10 @@ spec:
                     nodeCount:
                       description: NodeCount is the number of nodes to promote to
                         the kubernetes's control plane
+                      format: int32
                       type: integer
                   type: object
                 type: array
-              externalIP:
-                description: ExternalIP is the external ip of the virtual kubernetes's
-                  control plane
-                type: string
-              kubeconfig:
-                description: Kubeconfig is the kubeconfig of the virtual kubernetes's
-                  control plane
-                type: string
               promoteResources:
                 description: PromoteResources definites the resources for promote
                   to the kubernetes's control plane, the resources can be nodes or
@@ -109,9 +110,6 @@ spec:
                       kubernetes's control plane
                     items:
                       properties:
-                        address:
-                          description: Address defines node ip
-                          type: string
                         nodeName:
                           description: NodeName defines node name
                           type: string

pkg/apis/kosmos/v1alpha1/podconvertpolicy_types.go

@@ -27,7 +27,7 @@ type PodConvertPolicySpec struct {
 
 	// A label query over a set of resources.
 	// If name is not empty, LeafNodeSelector will be ignored.
-	// +option
+	// +optional
 	LeafNodeSelector *metav1.LabelSelector `json:"leafNodeSelector,omitempty"`
 
 	// Converters are some converter for convert pod when pod synced from root cluster to leaf cluster

pkg/apis/kosmos/v1alpha1/virtualcluster_types.go

@@ -44,7 +44,7 @@ type VirtualClusterSpec struct {
 
 	// PromotePolicies definites the policies for promote to the kubernetes's control plane
 	// +optional
-	PromotePolicies []PromotePolicy `json:"PromotePolicies,omitempty"`
+	PromotePolicies []PromotePolicy `json:"promotePolicies,omitempty"`
 
 	// PromoteResources definites the resources for promote to the kubernetes's control plane,
 	// the resources can be nodes or just cpu,memory or gpu resources
@@ -55,11 +55,11 @@ type VirtualClusterSpec struct {
 type PromotePolicy struct {
 	// LabelSelector is used to select nodes that are eligible for promotion to the kubernetes's control plane.
 	// +optional
-	LabelSelector metav1.LabelSelector `json:"labelSelector,omitempty"`
+	LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty"`
 
 	// NodeCount is the number of nodes to promote to the kubernetes's control plane
 	// +optional
-	NodeCount int16 `json:"nodeCount,omitempty"`
+	NodeCount *int32 `json:"nodeCount,omitempty"`
 }
 
 type PromoteResources struct {
@@ -76,9 +76,6 @@ type NodeInfo struct {
 	//NodeName defines node name
 	//+optional
 	NodeName string `json:"nodeName,omitempty"`
-	//Address defines node ip
-	//+optional
-	Address string `json:"address,omitempty"`
 }
 
 type VirtualClusterStatus struct {