Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dd2dab
remove CRP and MC validation
Oct 23, 2025
0471c75
add TODO for workv1alpha1
Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions cmd/hubagent/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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))
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 0 additions & 2 deletions cmd/memberagent/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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))
Expand Down
5 changes: 1 addition & 4 deletions pkg/utils/apiresources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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)
Copy link
Collaborator

@jwtty jwtty Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this can be removed too?

Copy link
Collaborator

@jwtty jwtty Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want to do it in another PR, pls add a TODO comment.

Copy link
Collaborator Author

@weng271190436 weng271190436 Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added a TODO comment. In fact I already have my next PR stacking on top of this one which is dedicated to removing v1alpha1work

#303


// disable cluster group by default
Expand Down
10 changes: 0 additions & 10 deletions pkg/utils/apiresources_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
43 changes: 1 addition & 42 deletions pkg/utils/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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},
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
}

Copy link
Collaborator

@jwtty jwtty Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about workV1alpha1 resources below?

Copy link
Collaborator Author

@weng271190436 weng271190436 Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added a TODO comment. In fact I already have my next PR stacking on top of this one which is dedicated to removing v1alpha1work

#303

MCMetaGVK = metav1.GroupVersionKind{
Group: clusterv1beta1.GroupVersion.Group,
Version: clusterv1beta1.GroupVersion.Version,
Expand Down Expand Up @@ -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,
Expand Down
44 changes: 0 additions & 44 deletions pkg/utils/validator/clusterresourceplacement.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
Expand Down
Loading
Loading