fix alias name

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

Author: Arvind Thirumurugan

approval-controller-metric-collector/approval-request-controller/pkg/controller/controller.go

@@ -107,7 +107,7 @@ func (r *Reconciler) reconcileApprovalRequestObj(ctx context.Context, approvalRe
 
 	// Handle deletion
 	if !obj.GetDeletionTimestamp().IsZero() {
-		return r.handleDelete(ctx, approvalReqObj, isClusterScoped)
+		return r.handleDelete(ctx, approvalReqObj)
 	}
 
 	// Check if the approval request is already approved or rejected - stop reconciliation if so
@@ -523,7 +523,7 @@ func (r *Reconciler) checkWorkloadHealthAndApprove(
 }
 
 // handleDelete handles the deletion of an ApprovalRequest or ClusterApprovalRequest
-func (r *Reconciler) handleDelete(ctx context.Context, approvalReqObj placementv1beta1.ApprovalRequestObj, isClusterScoped bool) (ctrl.Result, error) {
+func (r *Reconciler) handleDelete(ctx context.Context, approvalReqObj placementv1beta1.ApprovalRequestObj) (ctrl.Result, error) {
 	obj := approvalReqObj.(client.Object)
 	if !controllerutil.ContainsFinalizer(obj, metricCollectorFinalizer) {
 		return ctrl.Result{}, nil

approval-controller-metric-collector/metric-collector/pkg/controller/collector.go

@@ -30,7 +30,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/klog/v2"
 
-	placementv1alpha1 "github.com/arvindthiru/kubefleet-cookbook/approval-controller-metric-collector/approval-request-controller/apis/metric/v1alpha1"
+	localv1alpha1 "github.com/arvindthiru/kubefleet-cookbook/approval-controller-metric-collector/approval-request-controller/apis/metric/v1alpha1"
 )
 
 // PrometheusClient is the interface for querying Prometheus
@@ -151,7 +151,7 @@ type PrometheusResult struct {
 }
 
 // collectFromPrometheus collects metrics from a Prometheus endpoint
-func (r *Reconciler) collectFromPrometheus(ctx context.Context, mc *placementv1alpha1.MetricCollector) ([]placementv1alpha1.WorkloadMetrics, error) {
+func (r *Reconciler) collectFromPrometheus(ctx context.Context, mc *localv1alpha1.MetricCollector) ([]localv1alpha1.WorkloadMetrics, error) {
 	// Create Prometheus client without auth (simplified)
 	promClient := NewPrometheusClient(mc.Spec.PrometheusURL, "", nil)
 
@@ -171,7 +171,7 @@ func (r *Reconciler) collectFromPrometheus(ctx context.Context, mc *placementv1a
 	}
 
 	// Extract metrics for each workload
-	workloadMetrics := make([]placementv1alpha1.WorkloadMetrics, 0, len(data.Result))
+	workloadMetrics := make([]localv1alpha1.WorkloadMetrics, 0, len(data.Result))
 	for _, res := range data.Result {
 		namespace := res.Metric["namespace"]
 		workloadName := res.Metric["app"]
@@ -188,7 +188,7 @@ func (r *Reconciler) collectFromPrometheus(ctx context.Context, mc *placementv1a
 			}
 		}
 
-		wm := placementv1alpha1.WorkloadMetrics{
+		wm := localv1alpha1.WorkloadMetrics{
 			Namespace:    namespace,
 			WorkloadName: workloadName,
 			Health:       health == 1.0, // Convert to boolean: 1.0 = true, 0.0 = false
@@ -201,7 +201,7 @@ func (r *Reconciler) collectFromPrometheus(ctx context.Context, mc *placementv1a
 }
 
 // buildPromQLQuery builds a PromQL query for workload_health metric
-func buildPromQLQuery(mc *placementv1alpha1.MetricCollector) string {
+func buildPromQLQuery(mc *localv1alpha1.MetricCollector) string {
 	// Query all workload_health metrics (MetricCollector is cluster-scoped)
 	return `workload_health`
 }

approval-controller-metric-collector/metric-collector/pkg/controller/controller.go

@@ -32,7 +32,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
-	placementv1alpha1 "github.com/arvindthiru/kubefleet-cookbook/approval-controller-metric-collector/approval-request-controller/apis/metric/v1alpha1"
+	localv1alpha1 "github.com/arvindthiru/kubefleet-cookbook/approval-controller-metric-collector/approval-request-controller/apis/metric/v1alpha1"
 )
 
 const (
@@ -68,7 +68,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	}()
 
 	// Fetch the MetricCollector instance (cluster-scoped)
-	mc := &placementv1alpha1.MetricCollector{}
+	mc := &localv1alpha1.MetricCollector{}
 	if err := r.MemberClient.Get(ctx, client.ObjectKey{Name: req.Name}, mc); err != nil {
 		if errors.IsNotFound(err) {
 			klog.V(2).InfoS("MetricCollector not found, ignoring", "metricCollector", req.Name)
@@ -123,14 +123,14 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	if collectErr != nil {
 		klog.ErrorS(collectErr, "Failed to collect metrics", "metricCollector", req.Name)
 		meta.SetStatusCondition(&mc.Status.Conditions, metav1.Condition{
-			Type:               placementv1alpha1.MetricCollectorConditionTypeReady,
+			Type:               localv1alpha1.MetricCollectorConditionTypeReady,
 			Status:             metav1.ConditionTrue,
 			ObservedGeneration: mc.Generation,
 			Reason:             "CollectorConfigured",
 			Message:            "Collector is configured",
 		})
 		meta.SetStatusCondition(&mc.Status.Conditions, metav1.Condition{
-			Type:               placementv1alpha1.MetricCollectorConditionTypeCollecting,
+			Type:               localv1alpha1.MetricCollectorConditionTypeCollecting,
 			Status:             metav1.ConditionFalse,
 			ObservedGeneration: mc.Generation,
 			Reason:             "CollectionFailed",
@@ -139,14 +139,14 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	} else {
 		klog.V(2).InfoS("Successfully collected metrics", "metricCollector", req.Name, "workloads", len(collectedMetrics))
 		meta.SetStatusCondition(&mc.Status.Conditions, metav1.Condition{
-			Type:               placementv1alpha1.MetricCollectorConditionTypeReady,
+			Type:               localv1alpha1.MetricCollectorConditionTypeReady,
 			Status:             metav1.ConditionTrue,
 			ObservedGeneration: mc.Generation,
 			Reason:             "CollectorConfigured",
 			Message:            "Collector is configured and collecting metrics",
 		})
 		meta.SetStatusCondition(&mc.Status.Conditions, metav1.Condition{
-			Type:               placementv1alpha1.MetricCollectorConditionTypeCollecting,
+			Type:               localv1alpha1.MetricCollectorConditionTypeCollecting,
 			Status:             metav1.ConditionTrue,
 			ObservedGeneration: mc.Generation,
 			Reason:             "MetricsCollected",
@@ -163,15 +163,15 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 	if err := r.syncReportToHub(ctx, mc); err != nil {
 		klog.ErrorS(err, "Failed to sync MetricCollectorReport to hub", "metricCollector", req.Name)
 		meta.SetStatusCondition(&mc.Status.Conditions, metav1.Condition{
-			Type:               placementv1alpha1.MetricCollectorConditionTypeReported,
+			Type:               localv1alpha1.MetricCollectorConditionTypeReported,
 			Status:             metav1.ConditionFalse,
 			ObservedGeneration: mc.Generation,
 			Reason:             "ReportSyncFailed",
 			Message:            fmt.Sprintf("Failed to sync report to hub: %v", err),
 		})
 	} else {
 		meta.SetStatusCondition(&mc.Status.Conditions, metav1.Condition{
-			Type:               placementv1alpha1.MetricCollectorConditionTypeReported,
+			Type:               localv1alpha1.MetricCollectorConditionTypeReported,
 			Status:             metav1.ConditionTrue,
 			ObservedGeneration: mc.Generation,
 			Reason:             "ReportSyncSucceeded",
@@ -190,15 +190,15 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 }
 
 // syncReportToHub syncs the MetricCollectorReport to the hub cluster
-func (r *Reconciler) syncReportToHub(ctx context.Context, mc *placementv1alpha1.MetricCollector) error {
+func (r *Reconciler) syncReportToHub(ctx context.Context, mc *localv1alpha1.MetricCollector) error {
 	// Use the reportNamespace from the MetricCollector spec
 	reportNamespace := mc.Spec.ReportNamespace
 	if reportNamespace == "" {
 		return fmt.Errorf("reportNamespace is not set in MetricCollector spec")
 	}
 
 	// Create or update MetricCollectorReport on hub
-	report := &placementv1alpha1.MetricCollectorReport{
+	report := &localv1alpha1.MetricCollectorReport{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      mc.Name,
 			Namespace: reportNamespace,
@@ -209,7 +209,7 @@ func (r *Reconciler) syncReportToHub(ctx context.Context, mc *placementv1alpha1.
 	}
 
 	// Check if report already exists
-	existingReport := &placementv1alpha1.MetricCollectorReport{}
+	existingReport := &localv1alpha1.MetricCollectorReport{}
 	err := r.HubClient.Get(ctx, client.ObjectKey{Name: mc.Name, Namespace: reportNamespace}, existingReport)
 
 	now := metav1.Now()
@@ -251,7 +251,7 @@ func (r *Reconciler) syncReportToHub(ctx context.Context, mc *placementv1alpha1.
 }
 
 // deleteReportFromHub deletes the MetricCollectorReport from the hub cluster
-func (r *Reconciler) deleteReportFromHub(ctx context.Context, mc *placementv1alpha1.MetricCollector) error {
+func (r *Reconciler) deleteReportFromHub(ctx context.Context, mc *localv1alpha1.MetricCollector) error {
 	// Use the reportNamespace from the MetricCollector spec
 	reportNamespace := mc.Spec.ReportNamespace
 	if reportNamespace == "" {
@@ -260,7 +260,7 @@ func (r *Reconciler) deleteReportFromHub(ctx context.Context, mc *placementv1alp
 	}
 
 	// Try to delete MetricCollectorReport on hub
-	report := &placementv1alpha1.MetricCollectorReport{}
+	report := &localv1alpha1.MetricCollectorReport{}
 	err := r.HubClient.Get(ctx, client.ObjectKey{Name: mc.Name, Namespace: reportNamespace}, report)
 	if err != nil {
 		if errors.IsNotFound(err) {
@@ -283,6 +283,6 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 	r.recorder = mgr.GetEventRecorderFor("metriccollector-controller")
 	return ctrl.NewControllerManagedBy(mgr).
 		Named("metriccollector-controller").
-		For(&placementv1alpha1.MetricCollector{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
+		For(&localv1alpha1.MetricCollector{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
 		Complete(r)
 }