add ClusterStagedWorkloadTracker and StagedWorkloadTracker

Signed-off-by: Arvind Thirumurugan <arvindth@microsoft.com>

Author: Arvind Thirumurugan

approval-controller-metric-collector/README.md

@@ -29,8 +29,15 @@ This solution introduces three new CRDs that work together with KubeFleet's nati
    - Contains collected `workload_health` metrics for all workloads in a cluster
    - Updated every 30 seconds by the metric collector
 
-3. **WorkloadTracker** (cluster-scoped)
-   - Defines which workloads to monitor and their health thresholds
+3. **ClusterStagedWorkloadTracker** (cluster-scoped)
+   - Defines which workloads to monitor for a ClusterStagedUpdateRun
+   - The name must match the ClusterStagedUpdateRun name
+   - Specifies namespace, workload name, and expected health status
+   - Used by approval-request-controller to determine if stage is ready for approval
+
+4. **StagedWorkloadTracker** (namespaced)
+   - Defines which workloads to monitor for a StagedUpdateRun
+   - The name and namespace must match the StagedUpdateRun name and namespace
    - Specifies namespace, workload name, and expected health status
    - Used by approval-request-controller to determine if stage is ready for approval
 
@@ -61,7 +68,9 @@ This solution introduces three new CRDs that work together with KubeFleet's nati
 4. **Health Evaluation**
    - Approval-request-controller monitors `MetricCollectorReports` from all stage clusters
    - Every 15 seconds, it:
-     - Fetches the `WorkloadTracker` to know which workloads to check
+     - Fetches the appropriate workload tracker:
+       - For cluster-scoped: `ClusterStagedWorkloadTracker` with same name as ClusterStagedUpdateRun
+       - For namespace-scoped: `StagedWorkloadTracker` with same name and namespace as StagedUpdateRun
      - For each cluster in the stage:
        - Reads its `MetricCollectorReport` from `fleet-member-<cluster-name>` namespace
        - Verifies all tracked workloads are present and healthy
@@ -171,18 +180,30 @@ The script performs the following:
 1. Builds the `approval-request-controller:latest` image
 2. Loads the image into the kind hub cluster
 3. Verifies that required kubefleet CRDs are installed
-4. Installs the controller via Helm with the custom CRDs (MetricCollector, MetricCollectorReport, WorkloadTracker)
+4. Installs the controller via Helm with the custom CRDs (MetricCollector, MetricCollectorReport, ClusterStagedWorkloadTracker, StagedWorkloadTracker)
 5. Verifies the installation
 
 ### 6. Configure Workload Tracker
 
-Apply the WorkloadTracker to define which workloads to monitor:
+Apply the appropriate workload tracker based on which type of staged update you'll use:
+
+#### For Cluster-Scoped Updates (ClusterStagedUpdateRun):
+
+```bash
+# Apply ClusterStagedWorkloadTracker
+# Important: The name must match your ClusterStagedUpdateRun name
+kubectl apply -f ./examples/workloadtracker/clusterstagedworkloadtracker.yaml
+```
+
+#### For Namespace-Scoped Updates (StagedUpdateRun):
 
 ```bash
-kubectl apply -f ./examples/workloadtracker/
+# Apply StagedWorkloadTracker
+# Important: The name and namespace must match your StagedUpdateRun name and namespace
+kubectl apply -f ./examples/workloadtracker/stagedworkloadtracker.yaml
 ```
 
-This tells the approval controller which workloads to track and what health thresholds to use.
+This tells the approval controller which workloads to track.
 
 ### 7. Install Metric Collector (Member Clusters)
 
@@ -442,7 +463,10 @@ kubectl get metriccollectorreport -A
 - Ensure workloads have Prometheus scrape annotations
 
 ### Approvals not happening
-- Check WorkloadTracker resources define correct health thresholds
+- Check that the workload tracker name matches the update run name:
+  - For ClusterStagedUpdateRun: ClusterStagedWorkloadTracker name must match
+  - For StagedUpdateRun: StagedWorkloadTracker name and namespace must match
+- Verify workload tracker resources define correct health thresholds
 - Verify MetricCollectorReports are being created on the hub
 - Review approval-request-controller logs for decision-making details
 

approval-controller-metric-collector/approval-request-controller/apis/metric/v1alpha1/workloadtracker_types.go

@@ -38,8 +38,11 @@ type WorkloadReference struct {
 // +kubebuilder:storageversion
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// WorkloadTracker expresses user intent to track certain workloads
-type WorkloadTracker struct {
+// ClusterStagedWorkloadTracker expresses user intent to track certain workloads for a ClusterStagedUpdateRun.
+// The name of this resource should match the name of the ClusterStagedUpdateRun it is used for.
+// For example, if the ClusterStagedUpdateRun is named "example-cluster-staged-run", the
+// ClusterStagedWorkloadTracker should also be named "example-cluster-staged-run".
+type ClusterStagedWorkloadTracker struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
@@ -51,13 +54,47 @@ type WorkloadTracker struct {
 // +kubebuilder:object:root=true
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// WorkloadTrackerList contains a list of WorkloadTracker
-type WorkloadTrackerList struct {
+// ClusterStagedWorkloadTrackerList contains a list of ClusterStagedWorkloadTracker
+type ClusterStagedWorkloadTrackerList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []WorkloadTracker `json:"items"`
+	Items           []ClusterStagedWorkloadTracker `json:"items"`
+}
+
+// +genclient
+// +kubebuilder:object:root=true
+// +kubebuilder:resource:scope="Namespaced",categories={fleet,fleet-placement}
+// +kubebuilder:storageversion
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// StagedWorkloadTracker expresses user intent to track certain workloads for a StagedUpdateRun.
+// The name and namespace of this resource should match the name and namespace of the StagedUpdateRun it is used for.
+// For example, if the StagedUpdateRun is named "example-staged-run" in namespace "test-ns", the
+// StagedWorkloadTracker should also be named "example-staged-run" in namespace "test-ns".
+type StagedWorkloadTracker struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// Workloads is a list of workloads to track
+	// +optional
+	Workloads []WorkloadReference `json:"workloads,omitempty"`
+}
+
+// +kubebuilder:object:root=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// StagedWorkloadTrackerList contains a list of StagedWorkloadTracker
+type StagedWorkloadTrackerList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []StagedWorkloadTracker `json:"items"`
 }
 
 func init() {
-	SchemeBuilder.Register(&WorkloadTracker{}, &WorkloadTrackerList{})
+	SchemeBuilder.Register(
+		&ClusterStagedWorkloadTracker{},
+		&ClusterStagedWorkloadTrackerList{},
+		&StagedWorkloadTracker{},
+		&StagedWorkloadTrackerList{},
+	)
 }

approval-controller-metric-collector/approval-request-controller/apis/metric/v1alpha1/zz_generated.deepcopy.go

@@ -0,0 +1 @@
+../../../../config/crd/bases/metric.kubernetes-fleet.io_clusterstagedworkloadtrackers.yaml

approval-controller-metric-collector/approval-request-controller/charts/approval-request-controller/templates/crds/metric.kubernetes-fleet.io_clusterstagedworkloadtrackers.yaml

@@ -0,0 +1 @@
+../../../../config/crd/bases/metric.kubernetes-fleet.io_stagedworkloadtrackers.yaml

approval-controller-metric-collector/approval-request-controller/charts/approval-request-controller/templates/crds/metric.kubernetes-fleet.io_stagedworkloadtrackers.yaml

@@ -4,23 +4,27 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.0
-  name: workloadtrackers.metric.kubernetes-fleet.io
+  name: clusterstagedworkloadtrackers.metric.kubernetes-fleet.io
 spec:
   group: metric.kubernetes-fleet.io
   names:
     categories:
     - fleet
     - fleet-placement
-    kind: WorkloadTracker
-    listKind: WorkloadTrackerList
-    plural: workloadtrackers
-    singular: workloadtracker
+    kind: ClusterStagedWorkloadTracker
+    listKind: ClusterStagedWorkloadTrackerList
+    plural: clusterstagedworkloadtrackers
+    singular: clusterstagedworkloadtracker
   scope: Cluster
   versions:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: WorkloadTracker expresses user intent to track certain workloads
+        description: |-
+          ClusterStagedWorkloadTracker expresses user intent to track certain workloads for a ClusterStagedUpdateRun.
+          The name of this resource should match the name of the ClusterStagedUpdateRun it is used for.
+          For example, if the ClusterStagedUpdateRun is named "example-cluster-staged-run", the
+          ClusterStagedWorkloadTracker should also be named "example-cluster-staged-run".
         properties:
           apiVersion:
             description: |-