feat: Backport changes from KubeFleet (09/08/2025) (#1187)

Author: ryanzhang-oss

.github/.copilot/breadcrumbs/2025-06-24-0900-rollout-controller-binding-interface-refactor.md

@@ -328,7 +328,7 @@ go build ./pkg/controllers/rollout/ ./pkg/utils/binding/ ./pkg/utils/controller/
 5. **Import Updates for Helper Function Usage**:
    ```go
    // Added import for placement key type
-   "github.com/kubefleet-dev/kubefleet/pkg/scheduler/queue"
+   "go.goms.io/fleet/pkg/scheduler/queue"
    ```
 
 5. **Field Access Pattern Updates**:

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
     if: needs.detect-noop.outputs.noop != 'true'
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -65,7 +65,7 @@ jobs:
     if: needs.detect-noop.outputs.noop != 'true'
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -120,7 +120,7 @@ jobs:
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 

.github/workflows/code-lint.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -59,7 +59,7 @@ jobs:
 
     steps:
     - name: Set up Go ${{ env.GO_VERSION }}
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         go-version: ${{ env.GO_VERSION }}
 

.github/workflows/trivy.yml

@@ -39,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest #Latest tag points to the latest LTS release of Ubuntu per docker hub
     steps:
       - name: Set up Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 

.github/workflows/upgrade.yml

@@ -39,7 +39,7 @@ jobs:
     if: needs.detect-noop.outputs.noop != 'true'
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -122,7 +122,7 @@ jobs:
     if: needs.detect-noop.outputs.noop != 'true'
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -205,7 +205,7 @@ jobs:
     if: needs.detect-noop.outputs.noop != 'true'
     steps:
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 

apis/placement/v1beta1/commons.go

@@ -55,6 +55,8 @@ const (
 	ResourceEnvelopeKind = "ResourceEnvelope"
 	// ClusterResourceEnvelopeKind is the kind of the ClusterResourceEnvelope.
 	ClusterResourceEnvelopeKind = "ClusterResourceEnvelope"
+	// ClusterResourcePlacementStatusKind is the kind of the ClusterResourcePlacementStatus.
+	ClusterResourcePlacementStatusKind = "ClusterResourcePlacementStatus"
 )
 
 const (

cmd/hubagent/workload/setup.go

@@ -38,6 +38,7 @@ import (
 	"go.goms.io/fleet/pkg/controllers/bindingwatcher"
 	"go.goms.io/fleet/pkg/controllers/clusterinventory/clusterprofile"
 	"go.goms.io/fleet/pkg/controllers/clusterresourceplacementeviction"
+	"go.goms.io/fleet/pkg/controllers/clusterresourceplacementstatuswatcher"
 	"go.goms.io/fleet/pkg/controllers/memberclusterplacement"
 	"go.goms.io/fleet/pkg/controllers/overrider"
 	"go.goms.io/fleet/pkg/controllers/placement"
@@ -96,6 +97,7 @@ var (
 		placementv1beta1.GroupVersion.WithKind(placementv1beta1.ClusterResourceOverrideSnapshotKind),
 		placementv1beta1.GroupVersion.WithKind(placementv1beta1.ResourceOverrideKind),
 		placementv1beta1.GroupVersion.WithKind(placementv1beta1.ResourceOverrideSnapshotKind),
+		placementv1beta1.GroupVersion.WithKind(placementv1beta1.ClusterResourcePlacementStatusKind),
 	}
 
 	// There's a prerequisite that v1Beta1RequiredGVKs must be installed too.
@@ -222,6 +224,15 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
 			return err
 		}
 
+		klog.Info("Setting up clusterResourcePlacementStatus watcher")
+		if err := (&clusterresourceplacementstatuswatcher.Reconciler{
+			Client:              mgr.GetClient(),
+			PlacementController: clusterResourcePlacementControllerV1Beta1,
+		}).SetupWithManager(mgr); err != nil {
+			klog.ErrorS(err, "Unable to set up the clusterResourcePlacementStatus watcher")
+			return err
+		}
+
 		klog.Info("Setting up clusterSchedulingPolicySnapshot watcher")
 		if err := (&schedulingpolicysnapshot.Reconciler{
 			Client:              mgr.GetClient(),

examples/test-crp9.yaml

@@ -0,0 +1,15 @@
+apiVersion: placement.kubernetes-fleet.io/v1beta1
+kind: ClusterResourcePlacement
+metadata:
+  name: crp-9
+spec:
+  resourceSelectors:
+    - group: ""
+      kind: Namespace
+      name: test-ns
+      version: v1
+  policy:
+    placementType: PickAll
+  strategy:
+    type: RollingUpdate
+  statusReportingScope: NamespaceAccessible

pkg/controllers/bindingwatcher/suite_test.go

@@ -20,6 +20,7 @@ import (
 	"flag"
 	"path/filepath"
 	"testing"
+	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -122,6 +123,14 @@ var _ = BeforeSuite(func() {
 		err = mgr.Start(ctx)
 		Expect(err).Should(Succeed(), "failed to run manager")
 	}()
+
+	// Note (chenyu1): for the binding watcher integration tests, must wait for the cache to sync
+	// before moving onto the test stage, otherwise some Update events might not be caught properly.
+	//
+	// This is wrapped in an Eventually block as the manager might not have started yet.
+	Eventually(func() bool {
+		return mgr.GetCache().WaitForCacheSync(ctx)
+	}, time.Second*10, time.Second*2).To(BeTrue(), "failed to wait for cache to sync")
 })
 
 var _ = AfterSuite(func() {

pkg/controllers/bindingwatcher/watcher_integration_test.go

@@ -40,7 +40,7 @@ const (
 	testReason1                      = "testReason1"
 	testReason2                      = "testReason2"
 
-	eventuallyTimeout    = time.Second * 20
+	eventuallyTimeout    = time.Second * 10
 	consistentlyDuration = time.Second * 10
 	interval             = time.Millisecond * 250
 )