handle both approval request objects

Signed-off-by: Arvind Thirumurugan <[email protected]>

Author: Arvind Thirumurugan

cmd/hubagent/workload/setup.go

@@ -33,6 +33,7 @@ import (
 	clusterv1beta1 "github.com/kubefleet-dev/kubefleet/apis/cluster/v1beta1"
 	placementv1beta1 "github.com/kubefleet-dev/kubefleet/apis/placement/v1beta1"
 	"github.com/kubefleet-dev/kubefleet/cmd/hubagent/options"
+	"github.com/kubefleet-dev/kubefleet/pkg/controllers/approvalrequest"
 	"github.com/kubefleet-dev/kubefleet/pkg/controllers/bindingwatcher"
 	"github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterinventory/clusterprofile"
 	"github.com/kubefleet-dev/kubefleet/pkg/controllers/clusterresourceplacementeviction"
@@ -328,6 +329,26 @@ func SetupControllers(ctx context.Context, wg *sync.WaitGroup, mgr ctrl.Manager,
 					return err
 				}
 			}
+
+			// Set up the cluster approval request controller
+			klog.Info("Setting up clusterApprovalRequest controller")
+			if err = (&approvalrequest.Reconciler{
+				Client: mgr.GetClient(),
+			}).SetupWithManagerForClusterApprovalRequest(mgr); err != nil {
+				klog.ErrorS(err, "Unable to set up clusterApprovalRequest controller")
+				return err
+			}
+
+			// Set up the approval request controller for namespaced resources
+			if opts.EnableResourcePlacement {
+				klog.Info("Setting up approvalRequest controller")
+				if err = (&approvalrequest.Reconciler{
+					Client: mgr.GetClient(),
+				}).SetupWithManagerForApprovalRequest(mgr); err != nil {
+					klog.ErrorS(err, "Unable to set up approvalRequest controller")
+					return err
+				}
+			}
 		}
 
 		// Set up the work generator

examples/fleet_v1beta1_membercluster.yaml

@@ -2,6 +2,9 @@ apiVersion: cluster.kubernetes-fleet.io/v1beta1
 kind: MemberCluster
 metadata:
   name: kind-cluster-1
+  labels:
+    environment: staging
+    kubernetes-fleet.io/cluster-name: kind-cluster-1
 spec:
   identity:
     name: fleet-member-agent-cluster-1

examples/stagedupdaterun/clusterStagedUpdateRun.yaml

@@ -6,37 +6,37 @@ spec:
   placementName: example-placement
   resourceSnapshotIndex: "0"
   stagedRolloutStrategyName: example-strategy
-status:
-  policySnapshotIndexUsed: "0"
-  policyObservedClusterCount: 3
-  appliedStrategy:
-    type: Immediate
-  stagedUpdateStrategySnapshot:
-    stages:
-      - name: stage1
-        labelSelector:
-          matchLabels:
-            environment: production
-        sortingLabelKey: priority
-        afterStageTasks:
-          - type: TimedWait
-            waitTime: 1h
-  stagesStatus:
-    - stageName: stage1
-      clusters:
-        - clusterName: cluster1
-          conditions:
-            - type: Started
-              status: "True"
-      startTime: "2023-10-01T00:00:00Z"
-      endTime: "2023-10-01T01:00:00Z"
-      conditions:
-        - type: Progressing
-          status: "True"
-  conditions:
-    - type: Initialized
-      status: "True"
-    - type: Progressing
-      status: "True"
-    - type: Succeeded
-      status: "False"
+# status:
+#   policySnapshotIndexUsed: "0"
+#   policyObservedClusterCount: 3
+#   appliedStrategy:
+#     type: Immediate
+#   stagedUpdateStrategySnapshot:
+#     stages:
+#       - name: stage1
+#         labelSelector:
+#           matchLabels:
+#             environment: production
+#         sortingLabelKey: priority
+#         afterStageTasks:
+#           - type: TimedWait
+#             waitTime: 1h
+#   stagesStatus:
+#     - stageName: stage1
+#       clusters:
+#         - clusterName: cluster1
+#           conditions:
+#             - type: Started
+#               status: "True"
+#       startTime: "2023-10-01T00:00:00Z"
+#       endTime: "2023-10-01T01:00:00Z"
+#       conditions:
+#         - type: Progressing
+#           status: "True"
+#   conditions:
+#     - type: Initialized
+#       status: "True"
+#     - type: Progressing
+#       status: "True"
+#     - type: Succeeded
+#       status: "False"

examples/stagedupdaterun/example-crp.yaml

@@ -6,12 +6,12 @@ spec:
   resourceSelectors:
     - group: ""
       kind: Namespace
-      name: test-namespace
+      name: test-ns
       version: v1
   policy:
     placementType: PickAll
-    tolerations:
-      - key: gpu-workload
-        operator: Exists
+    # tolerations:
+    #   - key: gpu-workload
+    #     operator: Exists
   strategy:
     type: External

examples/stagedupdaterun/updateStrategy.yaml

@@ -8,22 +8,22 @@ spec:
       labelSelector:
         matchLabels:
           environment: staging
-      afterStageTasks:
-        - type: TimedWait
-          waitTime: 1h
-    - name: canary
-      labelSelector:
-        matchLabels:
-          environment: canary
-      sortingLabelKey: name
-      afterStageTasks:
-        - type: Approval
-    - name: production
-      labelSelector:
-        matchLabels:
-          environment: production
-      sortingLabelKey: order
       afterStageTasks:
         - type: Approval
-        - type: TimedWait
-          waitTime: 1h
+          # waitTime: 1h
+    # - name: canary
+    #   labelSelector:
+    #     matchLabels:
+    #       environment: canary
+    #   sortingLabelKey: name
+    #   afterStageTasks:
+    #     - type: Approval
+    # - name: production
+    #   labelSelector:
+    #     matchLabels:
+    #       environment: production
+    #   sortingLabelKey: order
+    #   afterStageTasks:
+    #     - type: Approval
+    #     - type: TimedWait
+    #       waitTime: 1h