refactor(yurt-manager): 更新 CRD 分类并移除 YurtAppDaemon 相关代码 (#2320)

- 将 CRD 的 categories 从 "all" 修改为 "yurt"，以更好地组织 OpenYurt 资源
- 移除了 YurtAppDaemon 相关的控制器和类型定义
- 更新了所有受影响的 CRD 文件和 Go 源码文件

charts/yurt-manager/crds/apps.openyurt.io_nodebuckets.yaml

@@ -8,7 +8,7 @@ spec:
   group: apps.openyurt.io
   names:
     categories:
-    - all
+    - yurt
     kind: NodeBucket
     listKind: NodeBucketList
     plural: nodebuckets

charts/yurt-manager/crds/apps.openyurt.io_nodepools.yaml

@@ -8,7 +8,7 @@ spec:
   group: apps.openyurt.io
   names:
     categories:
-      - all
+      - yurt
     kind: NodePool
     listKind: NodePoolList
     plural: nodepools

charts/yurt-manager/crds/apps.openyurt.io_yurtappdaemons.yaml

@@ -8,7 +8,7 @@ spec:
   group: apps.openyurt.io
   names:
     categories:
-    - all
+    - yurt
     kind: YurtAppDaemon
     listKind: YurtAppDaemonList
     plural: yurtappdaemons

charts/yurt-manager/crds/apps.openyurt.io_yurtappsets.yaml

@@ -8,7 +8,7 @@ spec:
   group: apps.openyurt.io
   names:
     categories:
-      - all
+      - yurt
     kind: YurtAppSet
     listKind: YurtAppSetList
     plural: yurtappsets

charts/yurt-manager/crds/iot.openyurt.io_platformadmins.yaml

@@ -8,7 +8,7 @@ spec:
   group: iot.openyurt.io
   names:
     categories:
-    - all
+    - yurt
     kind: PlatformAdmin
     listKind: PlatformAdminList
     plural: platformadmins

charts/yurt-manager/crds/network.openyurt.io_poolservices.yaml

@@ -8,7 +8,7 @@ spec:
   group: network.openyurt.io
   names:
     categories:
-    - all
+    - yurt
     kind: PoolService
     listKind: PoolServiceList
     plural: poolservices

charts/yurt-manager/crds/raven.openyurt.io_gateways.yaml

@@ -8,7 +8,7 @@ spec:
   group: raven.openyurt.io
   names:
     categories:
-      - all
+      - yurt
     kind: Gateway
     listKind: GatewayList
     plural: gateways

cmd/yurt-manager/names/controller_names.go

@@ -24,7 +24,6 @@ const (
 	ServiceTopologyEndpointsController     = "service-topology-endpoints-controller"
 	ServiceTopologyEndpointSliceController = "service-topology-endpointslice-controller"
 	YurtAppSetController                   = "yurt-app-set-controller"
-	YurtAppDaemonController                = "yurt-app-daemon-controller"
 	YurtStaticSetController                = "yurt-static-set-controller"
 	DelegateLeaseController                = "delegate-lease-controller"
 	PodBindingController                   = "pod-binding-controller"
@@ -50,7 +49,6 @@ func YurtManagerControllerAliases() map[string]string {
 		"servicetopologyendpoints":      ServiceTopologyEndpointsController,
 		"servicetopologyendpointslices": ServiceTopologyEndpointSliceController,
 		"yurtappset":                    YurtAppSetController,
-		"yurtappdaemon":                 YurtAppDaemonController,
 		"yurtstaticset":                 YurtStaticSetController,
 		"delegatelease":                 DelegateLeaseController,
 		"podbinding":                    PodBindingController,

hack/make-rules/add_controller.sh

@@ -319,7 +319,7 @@ type ${KIND_FIRST_UPPER}Status struct {
 // +k8s:openapi-gen=true
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:scope=${SCOPE},path=${KIND_PLURAL},shortName=${SHORTNAME},categories=all
+// +kubebuilder:resource:scope=${SCOPE},path=${KIND_PLURAL},shortName=${SHORTNAME},categories=yurt
 // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp",description="CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC."
 
 // ${KIND_FIRST_UPPER} is the Schema for the samples API

pkg/apis/apps/v1alpha1/default.go

@@ -223,28 +223,6 @@ func SetDefaultsYurtStaticSet(obj *YurtStaticSet) {
 	obj.Spec.Template.Namespace = obj.Namespace
 }
 
-// SetDefaultsYurtAppDaemon set default values for YurtAppDaemon.
-func SetDefaultsYurtAppDaemon(obj *YurtAppDaemon) {
-
-	if obj.Spec.RevisionHistoryLimit == nil {
-		obj.Spec.RevisionHistoryLimit = utilpointer.To[int32](10)
-	}
-
-	if obj.Spec.WorkloadTemplate.StatefulSetTemplate != nil {
-		SetDefaultPodSpec(&obj.Spec.WorkloadTemplate.StatefulSetTemplate.Spec.Template.Spec)
-		for i := range obj.Spec.WorkloadTemplate.StatefulSetTemplate.Spec.VolumeClaimTemplates {
-			a := &obj.Spec.WorkloadTemplate.StatefulSetTemplate.Spec.VolumeClaimTemplates[i]
-			v1.SetDefaults_PersistentVolumeClaim(a)
-			v1.SetDefaults_ResourceList(&a.Spec.Resources.Limits)
-			v1.SetDefaults_ResourceList(&a.Spec.Resources.Requests)
-			v1.SetDefaults_ResourceList(&a.Status.Capacity)
-		}
-	}
-	if obj.Spec.WorkloadTemplate.DeploymentTemplate != nil {
-		SetDefaultPodSpec(&obj.Spec.WorkloadTemplate.DeploymentTemplate.Spec.Template.Spec)
-	}
-}
-
 // SetDefaultsNodeBucket set default values for NodeBucket.
 func SetDefaultsNodeBucket(obj *NodeBucket) {
 	// example for set default value for NodeBucket

pkg/apis/apps/v1alpha1/nodebucket_types.go

@@ -30,7 +30,7 @@ type Node struct {
 // +k8s:openapi-gen=true
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:scope=Cluster,path=nodebuckets,shortName=nb,categories=all
+// +kubebuilder:resource:scope=Cluster,path=nodebuckets,shortName=nb,categories=yurt
 // +kubebuilder:printcolumn:name="NUM-NODES",type="integer",JSONPath=".numNodes",description="NumNodes represents the number of nodes in the NodeBucket."
 // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp",description="CreationTimestamp is a timestamp representing the server time when this object was created. It is not guaranteed to be set in happens-before order across separate operations. Clients may not set this value. It is represented in RFC3339 form and is in UTC."
 

pkg/apis/apps/v1alpha1/nodepool_types.go

@@ -70,7 +70,7 @@ type NodePoolStatus struct {
 
 // +genclient:nonNamespaced
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:scope=Cluster,path=nodepools,shortName=np,categories=all
+// +kubebuilder:resource:scope=Cluster,path=nodepools,shortName=np,categories=yurt
 // +kubebuilder:subresource:status
 // +kubebuilder:deprecatedversion:warning="apps.openyurt.io/v1alpha1 NodePool is deprecated in v1.0.0+; use apps.openyurt.io/v1beta1 NodePool"
 // +kubebuilder:printcolumn:name="Type",type="string",JSONPath=".spec.type",description="The type of nodepool"

pkg/apis/apps/v1alpha1/yurtappset_types.go

@@ -211,7 +211,7 @@ type YurtAppSetCondition struct {
 
 // +genclient
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:shortName=yas,categories=all
+// +kubebuilder:resource:shortName=yas,categories=yurt
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="READY",type="integer",JSONPath=".status.readyReplicas",description="The number of pods ready."
 // +kubebuilder:printcolumn:name="WorkloadTemplate",type="string",JSONPath=".status.templateType",description="The WorkloadTemplate Type."