Merge branch 'main' into add-rp-e2e-test

ryanzhang-oss · web-flow · commit 759517c171f9 · 2025-08-20T12:09:50.000-07:00
diff --git a/cmd/hubagent/workload/setup.go b/cmd/hubagent/workload/setup.go
@@ -53,10 +53,10 @@ import (
 	"github.com/kubefleet-dev/kubefleet/pkg/scheduler/framework"
 	"github.com/kubefleet-dev/kubefleet/pkg/scheduler/profile"
 	"github.com/kubefleet-dev/kubefleet/pkg/scheduler/queue"
-	schedulercrbwatcher "github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/clusterresourcebinding"
-	schedulercrpwatcher "github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/clusterresourceplacement"
-	schedulercspswatcher "github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/clusterschedulingpolicysnapshot"
+	schedulerbindingwatcher "github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/binding"
 	"github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/membercluster"
+	schedulerplacementwatcher "github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/placement"
+	schedulerspswatcher "github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/schedulingpolicysnapshot"
 	"github.com/kubefleet-dev/kubefleet/pkg/utils"
 	"github.com/kubefleet-dev/kubefleet/pkg/utils/controller"
 	"github.com/kubefleet-dev/kubefleet/pkg/utils/informer"
@@ -371,7 +371,7 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
 
 		// Set up the watchers for the controller
 		klog.Info("Setting up the clusterResourcePlacement watcher for scheduler")
-		if err := (&schedulercrpwatcher.Reconciler{
+		if err := (&schedulerplacementwatcher.Reconciler{
 			Client:             mgr.GetClient(),
 			SchedulerWorkQueue: defaultSchedulingQueue,
 		}).SetupWithManagerForClusterResourcePlacement(mgr); err != nil {
@@ -380,7 +380,7 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
 		}
 
 		klog.Info("Setting up the clusterSchedulingPolicySnapshot watcher for scheduler")
-		if err := (&schedulercspswatcher.Reconciler{
+		if err := (&schedulerspswatcher.Reconciler{
 			Client:             mgr.GetClient(),
 			SchedulerWorkQueue: defaultSchedulingQueue,
 		}).SetupWithManagerForClusterSchedulingPolicySnapshot(mgr); err != nil {
@@ -389,7 +389,7 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
 		}
 
 		klog.Info("Setting up the clusterResourceBinding watcher for scheduler")
-		if err := (&schedulercrbwatcher.Reconciler{
+		if err := (&schedulerbindingwatcher.Reconciler{
 			Client:             mgr.GetClient(),
 			SchedulerWorkQueue: defaultSchedulingQueue,
 		}).SetupWithManagerForClusterResourceBinding(mgr); err != nil {
@@ -399,7 +399,7 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
 
 		if opts.EnableResourcePlacement {
 			klog.Info("Setting up the resourcePlacement watcher for scheduler")
-			if err := (&schedulercrpwatcher.Reconciler{
+			if err := (&schedulerplacementwatcher.Reconciler{
 				Client:             mgr.GetClient(),
 				SchedulerWorkQueue: defaultSchedulingQueue,
 			}).SetupWithManagerForResourcePlacement(mgr); err != nil {
@@ -408,7 +408,7 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
 			}
 
 			klog.Info("Setting up the schedulingPolicySnapshot watcher for scheduler")
-			if err := (&schedulercspswatcher.Reconciler{
+			if err := (&schedulerspswatcher.Reconciler{
 				Client:             mgr.GetClient(),
 				SchedulerWorkQueue: defaultSchedulingQueue,
 			}).SetupWithManagerForSchedulingPolicySnapshot(mgr); err != nil {
@@ -417,7 +417,7 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
 			}
 
 			klog.Info("Setting up the resourceBinding watcher for scheduler")
-			if err := (&schedulercrbwatcher.Reconciler{
+			if err := (&schedulerbindingwatcher.Reconciler{
 				Client:             mgr.GetClient(),
 				SchedulerWorkQueue: defaultSchedulingQueue,
 			}).SetupWithManagerForResourceBinding(mgr); err != nil {
diff --git a/pkg/scheduler/watchers/binding/controller_integration_test.go b/pkg/scheduler/watchers/binding/controller_integration_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clusterresourcebinding
+package binding
 
 import (
 	"fmt"
diff --git a/pkg/scheduler/watchers/binding/suite_test.go b/pkg/scheduler/watchers/binding/suite_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clusterresourcebinding
+package binding
 
 import (
 	"context"
@@ -49,7 +49,7 @@ var (
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
 
-	RunSpecs(t, "Scheduler Source Cluster Resource Binding Controller Suite")
+	RunSpecs(t, "Scheduler Source Binding Controller Suite")
 }
 
 var _ = BeforeSuite(func() {
diff --git a/pkg/scheduler/watchers/binding/watcher.go b/pkg/scheduler/watchers/binding/watcher.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clusterresourcebinding
+package binding
 
 import (
 	"context"
diff --git a/pkg/scheduler/watchers/placement/controller_integration_test.go b/pkg/scheduler/watchers/placement/controller_integration_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clusterresourceplacement
+package placement
 
 import (
 	"fmt"
diff --git a/pkg/scheduler/watchers/placement/suite_test.go b/pkg/scheduler/watchers/placement/suite_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clusterresourceplacement
+package placement
 
 import (
 	"context"
@@ -49,7 +49,7 @@ var (
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
 
-	RunSpecs(t, "Scheduler Source Cluster Resource Placement Controller Suite")
+	RunSpecs(t, "Scheduler Source Placement Controller Suite")
 }
 
 var _ = BeforeSuite(func() {
diff --git a/pkg/scheduler/watchers/placement/watcher.go b/pkg/scheduler/watchers/placement/watcher.go
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package clusterresourceplacement features a controller that enqueues placement objects for the
+// Package placement features a controller that enqueues placement objects for the
 // scheduler to process where the placement object is marked for deletion.
-package clusterresourceplacement
+package placement
 
 import (
 	"context"
diff --git a/pkg/scheduler/watchers/schedulingpolicysnapshot/controller_integration_test.go b/pkg/scheduler/watchers/schedulingpolicysnapshot/controller_integration_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clusterschedulingpolicysnapshot
+package schedulingpolicysnapshot
 
 import (
 	"fmt"
diff --git a/pkg/scheduler/watchers/schedulingpolicysnapshot/suite_test.go b/pkg/scheduler/watchers/schedulingpolicysnapshot/suite_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clusterschedulingpolicysnapshot
+package schedulingpolicysnapshot
 
 import (
 	"context"
@@ -49,7 +49,7 @@ var (
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
 
-	RunSpecs(t, "Scheduler Source Cluster Scheduling Policy Snapshot Controller Suite")
+	RunSpecs(t, "Scheduler Source Scheduling Policy Snapshot Controller Suite")
 }
 
 var _ = BeforeSuite(func() {
diff --git a/pkg/scheduler/watchers/schedulingpolicysnapshot/watcher.go b/pkg/scheduler/watchers/schedulingpolicysnapshot/watcher.go
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package clusterschedulingpolicysnapshot features a controller that enqueues placement objects for the
+// Package schedulingpolicysnapshot features a controller that enqueues placement objects for the
 // scheduler to process where there is a change in their scheduling policy snapshots.
-package clusterschedulingpolicysnapshot
+package schedulingpolicysnapshot
 
 import (
 	"context"
diff --git a/test/apis/placement/v1beta1/api_validation_integration_test.go b/test/apis/placement/v1beta1/api_validation_integration_test.go
@@ -1174,18 +1174,18 @@ var _ = Describe("Test placement v1beta1 API validation", func() {
 			})
 
 			It("should deny update of ClusterResourceOverride placement name", func() {
-				Expect(hubClient.Get(ctx, types.NamespacedName{Name: croName}, &cro)).Should(Succeed())
-				cro.Spec.Placement.Name = "different-placement"
-				err := hubClient.Update(ctx, &cro)
+				updatedCRO := cro.DeepCopy()
+				updatedCRO.Spec.Placement.Name = "different-placement"
+				err := hubClient.Update(ctx, updatedCRO)
 				var statusErr *k8sErrors.StatusError
 				Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Update ClusterResourceOverride call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 				Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("The placement field is immutable"))
 			})
 
 			It("should deny update of ClusterResourceOverride placement scope", func() {
-				Expect(hubClient.Get(ctx, types.NamespacedName{Name: croName}, &cro)).Should(Succeed())
-				cro.Spec.Placement.Scope = placementv1beta1.NamespaceScoped
-				err := hubClient.Update(ctx, &cro)
+				updatedCRO := cro.DeepCopy()
+				updatedCRO.Spec.Placement.Scope = placementv1beta1.NamespaceScoped
+				err := hubClient.Update(ctx, updatedCRO)
 				var statusErr *k8sErrors.StatusError
 				Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Update ClusterResourceOverride call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 				Expect(statusErr.ErrStatus.Message).Should(ContainSubstring("placement reference cannot be Namespaced scope"))
@@ -1211,9 +1211,9 @@ var _ = Describe("Test placement v1beta1 API validation", func() {
 			})
 
 			It("should deny update of ClusterResourceOverride placement from non-nil to nil", func() {
-				Expect(hubClient.Get(ctx, types.NamespacedName{Name: croName}, &cro)).Should(Succeed())
-				cro.Spec.Placement = nil
-				err := hubClient.Update(ctx, &cro)
+				updatedCRO := cro.DeepCopy()
+				updatedCRO.Spec.Placement = nil
+				err := hubClient.Update(ctx, updatedCRO)
 				var statusErr *k8sErrors.StatusError
 				Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Update ClusterResourceOverride call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 				Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("The placement field is immutable"))
@@ -1294,9 +1294,9 @@ var _ = Describe("Test placement v1beta1 API validation", func() {
 			})
 
 			It("should deny update of ResourceOverride placement name", func() {
-				Expect(hubClient.Get(ctx, types.NamespacedName{Namespace: testNamespace, Name: roName}, &ro)).Should(Succeed())
-				ro.Spec.Placement.Name = "different-placement"
-				err := hubClient.Update(ctx, &ro)
+				updatedRO := ro.DeepCopy()
+				updatedRO.Spec.Placement.Name = "different-placement"
+				err := hubClient.Update(ctx, updatedRO)
 				var statusErr *k8sErrors.StatusError
 				Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Update ResourceOverride call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 				Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("The placement field is immutable"))
@@ -1323,18 +1323,18 @@ var _ = Describe("Test placement v1beta1 API validation", func() {
 			})
 
 			It("should deny update of ResourceOverride placement from non-nil to nil", func() {
-				Expect(hubClient.Get(ctx, types.NamespacedName{Namespace: testNamespace, Name: roName}, &ro)).Should(Succeed())
-				ro.Spec.Placement = nil
-				err := hubClient.Update(ctx, &ro)
+				updatedRO := ro.DeepCopy()
+				updatedRO.Spec.Placement = nil
+				err := hubClient.Update(ctx, updatedRO)
 				var statusErr *k8sErrors.StatusError
 				Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Update ResourceOverride call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 				Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("The placement field is immutable"))
 			})
 
 			It("should deny update of ResourceOverride placement from cluster-scoped to namespace-scoped", func() {
-				Expect(hubClient.Get(ctx, types.NamespacedName{Namespace: testNamespace, Name: roName}, &ro)).Should(Succeed())
-				ro.Spec.Placement.Scope = placementv1beta1.NamespaceScoped
-				err := hubClient.Update(ctx, &ro)
+				updatedRO := ro.DeepCopy()
+				updatedRO.Spec.Placement.Scope = placementv1beta1.NamespaceScoped
+				err := hubClient.Update(ctx, updatedRO)
 				var statusErr *k8sErrors.StatusError
 				Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Update ResourceOverride call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 				Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("The placement field is immutable"))
diff --git a/test/apis/v1alpha1/zz_generated.deepcopy.go b/test/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/test/scheduler/suite_test.go b/test/scheduler/suite_test.go
@@ -49,10 +49,10 @@ import (
 	"github.com/kubefleet-dev/kubefleet/pkg/scheduler"
 	"github.com/kubefleet-dev/kubefleet/pkg/scheduler/clustereligibilitychecker"
 	"github.com/kubefleet-dev/kubefleet/pkg/scheduler/queue"
-	"github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/clusterresourcebinding"
-	"github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/clusterresourceplacement"
-	"github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/clusterschedulingpolicysnapshot"
+	"github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/binding"
 	"github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/membercluster"
+	"github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/placement"
+	"github.com/kubefleet-dev/kubefleet/pkg/scheduler/watchers/schedulingpolicysnapshot"
 )
 
 const (
@@ -583,28 +583,28 @@ func beforeSuiteForProcess1() []byte {
 	)
 
 	// Register the watchers.
-	crpReconciler := clusterresourceplacement.Reconciler{
+	crpReconciler := placement.Reconciler{
 		Client:             hubClient,
 		SchedulerWorkQueue: schedulerWorkQueue,
 	}
 	err = crpReconciler.SetupWithManagerForClusterResourcePlacement(ctrlMgr)
 	Expect(err).NotTo(HaveOccurred(), "Failed to set up CRP watcher with controller manager")
 
-	rpReconciler := clusterresourceplacement.Reconciler{
+	rpReconciler := placement.Reconciler{
 		Client:             hubClient,
 		SchedulerWorkQueue: schedulerWorkQueue,
 	}
 	err = rpReconciler.SetupWithManagerForResourcePlacement(ctrlMgr)
 	Expect(err).NotTo(HaveOccurred(), "Failed to set up RP watcher with controller manager")
 
-	clusterPolicySnapshotWatcher := clusterschedulingpolicysnapshot.Reconciler{
+	clusterPolicySnapshotWatcher := schedulingpolicysnapshot.Reconciler{
 		Client:             hubClient,
 		SchedulerWorkQueue: schedulerWorkQueue,
 	}
 	err = clusterPolicySnapshotWatcher.SetupWithManagerForClusterSchedulingPolicySnapshot(ctrlMgr)
 	Expect(err).NotTo(HaveOccurred(), "Failed to set up cluster policy snapshot watcher with controller manager")
 
-	policySnapshotWatcher := clusterschedulingpolicysnapshot.Reconciler{
+	policySnapshotWatcher := schedulingpolicysnapshot.Reconciler{
 		Client:             hubClient,
 		SchedulerWorkQueue: schedulerWorkQueue,
 	}
@@ -620,14 +620,14 @@ func beforeSuiteForProcess1() []byte {
 	err = memberClusterWatcher.SetupWithManager(ctrlMgr)
 	Expect(err).NotTo(HaveOccurred(), "Failed to set up member cluster watcher with controller manager")
 
-	clusterResourceBindingWatcher := clusterresourcebinding.Reconciler{
+	clusterResourceBindingWatcher := binding.Reconciler{
 		Client:             hubClient,
 		SchedulerWorkQueue: schedulerWorkQueue,
 	}
 	err = clusterResourceBindingWatcher.SetupWithManagerForClusterResourceBinding(ctrlMgr)
 	Expect(err).NotTo(HaveOccurred(), "Failed to set up cluster resource binding watcher with controller manager")
 
-	resourceBindingWatcher := clusterresourcebinding.Reconciler{
+	resourceBindingWatcher := binding.Reconciler{
 		Client:             hubClient,
 		SchedulerWorkQueue: schedulerWorkQueue,
 	}
