chore: 1 - remove v1alpha1 CRP and MC validation (#302)

Author: weng271190436

cmd/hubagent/main.go

@@ -44,7 +44,6 @@ import (
 	clusterv1beta1 "github.com/kubefleet-dev/kubefleet/apis/cluster/v1beta1"
 	placementv1alpha1 "github.com/kubefleet-dev/kubefleet/apis/placement/v1alpha1"
 	placementv1beta1 "github.com/kubefleet-dev/kubefleet/apis/placement/v1beta1"
-	fleetv1alpha1 "github.com/kubefleet-dev/kubefleet/apis/v1alpha1"
 	"github.com/kubefleet-dev/kubefleet/cmd/hubagent/options"
 	"github.com/kubefleet-dev/kubefleet/cmd/hubagent/workload"
 	mcv1beta1 "github.com/kubefleet-dev/kubefleet/pkg/controllers/membercluster/v1beta1"
@@ -71,7 +70,6 @@ const (
 
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-	utilruntime.Must(fleetv1alpha1.AddToScheme(scheme))
 	utilruntime.Must(workv1alpha1.AddToScheme(scheme))
 	utilruntime.Must(placementv1beta1.AddToScheme(scheme))
 	utilruntime.Must(clusterv1beta1.AddToScheme(scheme))
@@ -203,7 +201,7 @@ func SetupWebhook(mgr manager.Manager, webhookClientConnectionType options.Webho
 		klog.ErrorS(err, "unable to add WebhookConfig")
 		return err
 	}
-	if err = webhook.AddToManager(mgr, whiteListedUsers, isFleetV1Beta1API, denyModifyMemberClusterLabels); err != nil {
+	if err = webhook.AddToManager(mgr, whiteListedUsers, denyModifyMemberClusterLabels); err != nil {
 		klog.ErrorS(err, "unable to register webhooks to the manager")
 		return err
 	}

cmd/memberagent/main.go

@@ -51,7 +51,6 @@ import (
 
 	clusterv1beta1 "github.com/kubefleet-dev/kubefleet/apis/cluster/v1beta1"
 	placementv1beta1 "github.com/kubefleet-dev/kubefleet/apis/placement/v1beta1"
-	fleetv1alpha1 "github.com/kubefleet-dev/kubefleet/apis/v1alpha1"
 	imcv1beta1 "github.com/kubefleet-dev/kubefleet/pkg/controllers/internalmembercluster/v1beta1"
 	"github.com/kubefleet-dev/kubefleet/pkg/controllers/workapplier"
 	workv1alpha1controller "github.com/kubefleet-dev/kubefleet/pkg/controllers/workv1alpha1"
@@ -113,7 +112,6 @@ func init() {
 	klog.InitFlags(nil)
 
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-	utilruntime.Must(fleetv1alpha1.AddToScheme(scheme))
 	utilruntime.Must(workv1alpha1.AddToScheme(scheme))
 	utilruntime.Must(clusterv1beta1.AddToScheme(scheme))
 	utilruntime.Must(placementv1beta1.AddToScheme(scheme))

pkg/utils/apiresources.go

@@ -28,7 +28,6 @@ import (
 
 	clusterv1beta1 "github.com/kubefleet-dev/kubefleet/apis/cluster/v1beta1"
 	placementv1beta1 "github.com/kubefleet-dev/kubefleet/apis/placement/v1beta1"
-	fleetv1alpha1 "github.com/kubefleet-dev/kubefleet/apis/v1alpha1"
 )
 
 var (
@@ -187,9 +186,7 @@ func NewResourceConfig(isAllowList bool) *ResourceConfig {
 	if r.isAllowList {
 		return r
 	}
-	// TODO: remove after we remove v1alpha1 support
-	// disable v1alpha1 related resources by default
-	r.AddGroup(fleetv1alpha1.GroupVersion.Group)
+	// TODO (weiweng): remove workv1alpha1 in next PR
 	r.AddGroupVersionKind(WorkV1Alpha1GVK)
 
 	// disable cluster group by default

pkg/utils/apiresources_test.go

@@ -284,16 +284,6 @@ func TestResourceConfigMixedParse(t *testing.T) {
 func TestDefaultResourceConfigGroupVersionKindParse(t *testing.T) {
 	resourcesInDefaultDisabledList := []schema.GroupVersionKind{
 		corev1PodGVK, corev1NodeGVK,
-		{
-			Group:   "fleet.azure.com",
-			Version: "v1beta1",
-			Kind:    "MemberCluster",
-		},
-		{
-			Group:   "fleet.azure.com",
-			Version: "v1alpha1",
-			Kind:    "MemberCluster",
-		},
 		{
 			Group:   "events.k8s.io",
 			Version: "v1beta1",

pkg/utils/common.go

@@ -49,7 +49,6 @@ import (
 
 	clusterv1beta1 "github.com/kubefleet-dev/kubefleet/apis/cluster/v1beta1"
 	placementv1beta1 "github.com/kubefleet-dev/kubefleet/apis/placement/v1beta1"
-	fleetv1alpha1 "github.com/kubefleet-dev/kubefleet/apis/v1alpha1"
 	"github.com/kubefleet-dev/kubefleet/pkg/utils/condition"
 	"github.com/kubefleet-dev/kubefleet/pkg/utils/controller"
 	"github.com/kubefleet-dev/kubefleet/pkg/utils/informer"
@@ -113,11 +112,6 @@ const (
 )
 
 var (
-	FleetRule = rbacv1.PolicyRule{
-		Verbs:     []string{"*"},
-		APIGroups: []string{fleetv1alpha1.GroupVersion.Group},
-		Resources: []string{"*"},
-	}
 	FleetClusterRule = rbacv1.PolicyRule{
 		Verbs:     []string{"*"},
 		APIGroups: []string{clusterv1beta1.GroupVersion.Group},
@@ -147,18 +141,6 @@ var (
 
 // Those are the GVR/GVKs in use by Fleet source code.
 var (
-	ClusterResourcePlacementV1Alpha1GVK = schema.GroupVersionKind{
-		Group:   fleetv1alpha1.GroupVersion.Group,
-		Version: fleetv1alpha1.GroupVersion.Version,
-		Kind:    "ClusterResourcePlacement",
-	}
-
-	ClusterResourcePlacementV1Alpha1GVR = schema.GroupVersionResource{
-		Group:    fleetv1alpha1.GroupVersion.Group,
-		Version:  fleetv1alpha1.GroupVersion.Version,
-		Resource: fleetv1alpha1.ClusterResourcePlacementResource,
-	}
-
 	ClusterResourcePlacementGVR = schema.GroupVersionResource{
 		Group:    placementv1beta1.GroupVersion.Group,
 		Version:  placementv1beta1.GroupVersion.Version,
@@ -249,12 +231,6 @@ var (
 		Kind:    "Event",
 	}
 
-	IMCV1Alpha1MetaGVK = metav1.GroupVersionKind{
-		Group:   fleetv1alpha1.GroupVersion.Group,
-		Version: fleetv1alpha1.GroupVersion.Version,
-		Kind:    "InternalMemberCluster",
-	}
-
 	IngressClassGVR = schema.GroupVersionResource{
 		Group:    networkingv1.SchemeGroupVersion.Group,
 		Version:  networkingv1.SchemeGroupVersion.Version,
@@ -285,24 +261,6 @@ var (
 		Resource: "limitranges",
 	}
 
-	MCV1Alpha1MetaGVK = metav1.GroupVersionKind{
-		Group:   fleetv1alpha1.GroupVersion.Group,
-		Version: fleetv1alpha1.GroupVersion.Version,
-		Kind:    "MemberCluster",
-	}
-
-	MCV1Alpha1GVK = schema.GroupVersionKind{
-		Group:   fleetv1alpha1.GroupVersion.Group,
-		Version: fleetv1alpha1.GroupVersion.Version,
-		Kind:    fleetv1alpha1.MemberClusterKind,
-	}
-
-	MCV1Alpha1GVR = schema.GroupVersionResource{
-		Group:    fleetv1alpha1.GroupVersion.Group,
-		Version:  fleetv1alpha1.GroupVersion.Version,
-		Resource: fleetv1alpha1.MemberClusterResource,
-	}
-
 	MCMetaGVK = metav1.GroupVersionKind{
 		Group:   clusterv1beta1.GroupVersion.Group,
 		Version: clusterv1beta1.GroupVersion.Version,
@@ -387,6 +345,7 @@ var (
 		Resource: "storageclasses",
 	}
 
+	// TODO (weiweng): remove workv1alpha1 in next PR
 	WorkV1Alpha1MetaGVK = metav1.GroupVersionKind{
 		Group:   workv1alpha1.GroupVersion.Group,
 		Version: workv1alpha1.GroupVersion.Version,

pkg/utils/validator/clusterresourceplacement.go

@@ -34,7 +34,6 @@ import (
 	"k8s.io/klog/v2"
 
 	placementv1beta1 "github.com/kubefleet-dev/kubefleet/apis/placement/v1beta1"
-	fleetv1alpha1 "github.com/kubefleet-dev/kubefleet/apis/v1alpha1"
 	"github.com/kubefleet-dev/kubefleet/pkg/propertyprovider"
 	"github.com/kubefleet-dev/kubefleet/pkg/utils/controller"
 	"github.com/kubefleet-dev/kubefleet/pkg/utils/informer"
@@ -54,49 +53,6 @@ var (
 	resourceCapacityTypes             = supportedResourceCapacityTypes()
 )
 
-// ValidateClusterResourcePlacementAlpha validates a ClusterResourcePlacement v1alpha1 object.
-func ValidateClusterResourcePlacementAlpha(clusterResourcePlacement *fleetv1alpha1.ClusterResourcePlacement) error {
-	allErr := make([]error, 0)
-
-	// we leverage the informer manager to do the resource scope validation
-	if ResourceInformer == nil {
-		allErr = append(allErr, fmt.Errorf("cannot perform resource scope check for now, please retry"))
-	}
-
-	for _, selector := range clusterResourcePlacement.Spec.ResourceSelectors {
-		if selector.LabelSelector != nil {
-			if len(selector.Name) != 0 {
-				allErr = append(allErr, fmt.Errorf("the labelSelector and name fields are mutually exclusive in selector %+v", selector))
-			}
-			if _, err := metav1.LabelSelectorAsSelector(selector.LabelSelector); err != nil {
-				allErr = append(allErr, fmt.Errorf("the labelSelector in resource selector %+v is invalid: %w", selector, err))
-			}
-		}
-		if ResourceInformer != nil {
-			gvk := schema.GroupVersionKind{
-				Group:   selector.Group,
-				Version: selector.Version,
-				Kind:    selector.Kind,
-			}
-			// TODO: Ensure gvk created from resource selector is valid.
-			if !ResourceInformer.IsClusterScopedResources(gvk) {
-				allErr = append(allErr, fmt.Errorf("the resource is not found in schema (please retry) or it is not a cluster scoped resource: %v", gvk))
-			}
-		}
-	}
-
-	if clusterResourcePlacement.Spec.Policy != nil && clusterResourcePlacement.Spec.Policy.Affinity != nil &&
-		clusterResourcePlacement.Spec.Policy.Affinity.ClusterAffinity != nil {
-		for _, selector := range clusterResourcePlacement.Spec.Policy.Affinity.ClusterAffinity.ClusterSelectorTerms {
-			if _, err := metav1.LabelSelectorAsSelector(&selector.LabelSelector); err != nil {
-				allErr = append(allErr, fmt.Errorf("the labelSelector in cluster selector %+v is invalid: %w", selector, err))
-			}
-		}
-	}
-
-	return apiErrors.NewAggregate(allErr)
-}
-
 // ValidateClusterResourcePlacement validates a ClusterResourcePlacement object.
 func ValidateClusterResourcePlacement(clusterResourcePlacement *placementv1beta1.ClusterResourcePlacement) error {
 	allErr := make([]error, 0)