Merge pull request kubernetes-sigs#282 from Gonfidel/gonfidel/implement_kro_labels_for_rgd_crds

Implement KRO Labels For RGD CRDs

Author: a-hilaly

pkg/controller/resourcegraphdefinition/controller_reconcile.go

@@ -43,18 +43,21 @@ func (r *ResourceGraphDefinitionReconciler) reconcileResourceGraphDefinition(ctx
 		return nil, nil, err
 	}
 
-	// Ensure CRD exists and is up to date
-	log.V(1).Info("reconciling resource graph definition CRD")
-	if err := r.reconcileResourceGraphDefinitionCRD(ctx, processedRGD.Instance.GetCRD()); err != nil {
-		return processedRGD.TopologicalOrder, resourcesInfo, err
-	}
-
 	// Setup metadata labeling
 	graphExecLabeler, err := r.setupLabeler(rgd)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to setup labeler: %w", err)
 	}
 
+	crd := processedRGD.Instance.GetCRD()
+	graphExecLabeler.ApplyLabels(&crd.ObjectMeta)
+
+	// Ensure CRD exists and is up to date
+	log.V(1).Info("reconciling resource graph definition CRD")
+	if err := r.reconcileResourceGraphDefinitionCRD(ctx, crd); err != nil {
+		return processedRGD.TopologicalOrder, resourcesInfo, err
+	}
+
 	// Setup and start microcontroller
 	gvr := processedRGD.Instance.GetGroupVersionResource()
 	controller := r.setupMicroController(gvr, processedRGD, rgd.Spec.DefaultServiceAccounts, graphExecLabeler)

pkg/metadata/labels.go

@@ -117,7 +117,6 @@ func NewResourceGraphDefinitionLabeler(rgMeta metav1.Object) GenericLabeler {
 	return map[string]string{
 		ResourceGraphDefinitionIDLabel:        string(rgMeta.GetUID()),
 		ResourceGraphDefinitionNameLabel:      rgMeta.GetName(),
-		ResourceGraphDefinitionNamespaceLabel: rgMeta.GetNamespace(),
 	}
 }