sync with latest changes

controllers/components/dashboard/dashboard_controller.go

@@ -44,7 +44,7 @@ import (
 func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.Manager) error {
 	componentName := computeComponentName()
 
-	_, err := reconciler.ComponentReconcilerFor(mgr, &componentsv1.Dashboard{}).
+	_, err := reconciler.ReconcilerFor(mgr, &componentsv1.Dashboard{}).
 		// operands - owned
 		Owns(&corev1.ConfigMap{}).
 		Owns(&corev1.Secret{}).

controllers/components/dashboard/dashboard_controller_actions.go

@@ -111,11 +111,7 @@ func updateStatus(ctx context.Context, rr *odhtypes.ReconciliationRequest) error
 		&rl,
 		client.InNamespace(rr.DSCI.Spec.ApplicationsNamespace),
 		client.MatchingLabels(map[string]string{
-<<<<<<< HEAD
-			labels.ComponentPartOf: strings.ToLower(componentsv1.DashboardKind),
-=======
-			labels.PlatformPartOf: componentsv1.DashboardInstanceName,
->>>>>>> 51e8117b (Update label to platform.opendatahub.io)
+			labels.PlatformPartOf: strings.ToLower(componentsv1.DashboardKind),
 		}),
 	)
 

controllers/components/datasciencepipelines/datasciencepipelines_controller.go

@@ -48,7 +48,7 @@ var (
 )
 
 func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.Manager) error {
-	_, err := reconciler.ComponentReconcilerFor(mgr, &componentsv1.DataSciencePipelines{}).
+	_, err := reconciler.ReconcilerFor(mgr, &componentsv1.DataSciencePipelines{}).
 		// customized Owns() for Component with new predicates
 		Owns(&corev1.ConfigMap{}).
 		Owns(&corev1.Secret{}).

controllers/components/kueue/kueue_controller.go

@@ -39,7 +39,7 @@ import (
 )
 
 func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.Manager) error {
-	_, err := reconciler.ComponentReconcilerFor(mgr, &componentsv1.Kueue{}).
+	_, err := reconciler.ReconcilerFor(mgr, &componentsv1.Kueue{}).
 		// customized Owns() for Component with new predicates
 		Owns(&corev1.ConfigMap{}).
 		Owns(&corev1.Secret{}).

controllers/components/modelregistry/modelregistry_controller.go

@@ -43,7 +43,7 @@ import (
 )
 
 func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.Manager) error {
-	_, err := reconciler.ComponentReconcilerFor(mgr, &componentsv1.ModelRegistry{}).
+	_, err := reconciler.ReconcilerFor(mgr, &componentsv1.ModelRegistry{}).
 		Owns(&corev1.ConfigMap{}).
 		Owns(&corev1.Secret{}).
 		Owns(&rbacv1.Role{}).

controllers/components/ray/ray_controller.go

@@ -37,7 +37,7 @@ import (
 )
 
 func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.Manager) error {
-	_, err := reconciler.ComponentReconcilerFor(mgr, &componentsv1.Ray{}).
+	_, err := reconciler.ReconcilerFor(mgr, &componentsv1.Ray{}).
 		// customized Owns() for Component with new predicates
 		Owns(&corev1.ConfigMap{}).
 		Owns(&corev1.Secret{}).

controllers/components/trainingoperator/trainingoperator_controller.go

@@ -37,7 +37,7 @@ import (
 )
 
 func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.Manager) error {
-	_, err := reconciler.ComponentReconcilerFor(mgr, &componentsv1.TrainingOperator{}).
+	_, err := reconciler.ReconcilerFor(mgr, &componentsv1.TrainingOperator{}).
 		// customized Owns() for Component with new predicates
 		Owns(&corev1.ConfigMap{}).
 		Owns(&promv1.PodMonitor{}).

controllers/components/trustyai/trustyai_controller.go

@@ -36,7 +36,7 @@ import (
 )
 
 func (s *componentHandler) NewComponentReconciler(ctx context.Context, mgr ctrl.Manager) error {
-	_, err := reconciler.ComponentReconcilerFor(mgr, &componentsv1.TrustyAI{}).
+	_, err := reconciler.ReconcilerFor(mgr, &componentsv1.TrustyAI{}).
 		// customized Owns() for Component with new predicates
 		Owns(&corev1.ConfigMap{}).
 		Owns(&corev1.ServiceAccount{}).

controllers/services/monitoring/monitoring_controller.go

@@ -41,7 +41,7 @@ const serviceName = "monitoring"
 
 // NewServiceReconciler creates a ServiceReconciler for the Monitoring API.
 func NewServiceReconciler(ctx context.Context, mgr ctrl.Manager) error {
-	_, err := reconciler.ReconcilerFor(mgr, servicesv1.MonitoringInstanceName, &servicesv1.Monitoring{}).
+	_, err := reconciler.ReconcilerFor(mgr, &servicesv1.Monitoring{}).
 		// operands - owned
 		Owns(&corev1.ConfigMap{}).
 		Owns(&corev1.Secret{}).

pkg/controller/actions/deploy/action_deploy.go

@@ -167,8 +167,8 @@ func (a *Action) deploy(
 	resources.SetAnnotation(&obj, annotations.PlatformType, string(rr.Release.Name))
 	resources.SetAnnotation(&obj, annotations.PlatformVersion, rr.Release.Version.String())
 
-	if resources.GetLabel(&obj, labels.ComponentPartOf) == "" && fo != "" {
-		resources.SetLabel(&obj, labels.ComponentPartOf, fo)
+	if resources.GetLabel(&obj, labels.PlatformPartOf) == "" && fo != "" {
+		resources.SetLabel(&obj, labels.PlatformPartOf, fo)
 	}
 
 	// backup copy for caching

pkg/controller/actions/deploy/action_deploy_test.go

@@ -81,7 +81,7 @@ func TestDeployAction(t *testing.T) {
 	g.Expect(err).ShouldNot(HaveOccurred())
 
 	g.Expect(obj1).Should(And(
-		jq.Match(`.metadata.labels."%s" == "%s"`, labels.ComponentPartOf, strings.ToLower(componentsv1.DashboardKind)),
+		jq.Match(`.metadata.labels."%s" == "%s"`, labels.PlatformPartOf, strings.ToLower(componentsv1.DashboardKind)),
 		jq.Match(`.metadata.annotations."%s" == "%s"`, annotations.InstanceGeneration, strconv.FormatInt(rr.Instance.GetGeneration(), 10)),
 		jq.Match(`.metadata.annotations."%s" == "%s"`, annotations.PlatformVersion, "1.2.3"),
 		jq.Match(`.metadata.annotations."%s" == "%s"`, annotations.PlatformType, string(cluster.OpenDataHub)),

pkg/controller/actions/gc/action_gc.go

@@ -95,7 +95,7 @@ func (a *Action) run(ctx context.Context, rr *odhTypes.ReconciliationRequest) er
 	selector := a.selector
 	if selector == nil {
 		selector = labels.SelectorFromSet(map[string]string{
-			odhLabels.ComponentPartOf: strings.ToLower(kind),
+			odhLabels.PlatformPartOf: strings.ToLower(kind),
 		})
 	}
 

pkg/controller/actions/gc/action_gc_test.go

@@ -213,7 +213,7 @@ func TestGcAction(t *testing.T) {
 				l[k] = v
 			}
 
-			l[labels.ComponentPartOf] = strings.ToLower(componentsv1.DashboardKind)
+			l[labels.PlatformPartOf] = strings.ToLower(componentsv1.DashboardKind)
 
 			cm := corev1.ConfigMap{
 				ObjectMeta: metav1.ObjectMeta{

pkg/controller/actions/updatestatus/action_update_status.go

@@ -48,13 +48,13 @@ func (a *Action) run(ctx context.Context, rr *types.ReconciliationRequest) error
 		l[k] = v
 	}
 
-	if l[labels.ComponentPartOf] == "" {
+	if l[labels.PlatformPartOf] == "" {
 		kind, err := resources.KindForObject(rr.Client.Scheme(), rr.Instance)
 		if err != nil {
 			return err
 		}
 
-		l[labels.ComponentPartOf] = strings.ToLower(kind)
+		l[labels.PlatformPartOf] = strings.ToLower(kind)
 	}
 
 	obj, ok := rr.Instance.(types.ResourceObject)

pkg/controller/actions/updatestatus/action_update_status_test.go

@@ -43,7 +43,7 @@ func TestUpdateStatusActionNotReady(t *testing.T) {
 				Name:      "my-deployment",
 				Namespace: ns,
 				Labels: map[string]string{
-					labels.ComponentPartOf: ns,
+					labels.PlatformPartOf: ns,
 				},
 			},
 			Status: appsv1.DeploymentStatus{
@@ -60,7 +60,7 @@ func TestUpdateStatusActionNotReady(t *testing.T) {
 				Name:      "my-deployment-2",
 				Namespace: ns,
 				Labels: map[string]string{
-					labels.ComponentPartOf: ns,
+					labels.PlatformPartOf: ns,
 				},
 			},
 			Status: appsv1.DeploymentStatus{
@@ -73,7 +73,7 @@ func TestUpdateStatusActionNotReady(t *testing.T) {
 	g.Expect(err).ShouldNot(HaveOccurred())
 
 	action := updatestatus.NewAction(
-		updatestatus.WithSelectorLabel(labels.ComponentPartOf, ns))
+		updatestatus.WithSelectorLabel(labels.PlatformPartOf, ns))
 
 	rr := types.ReconciliationRequest{
 		Client:   cl,
@@ -114,7 +114,7 @@ func TestUpdateStatusActionReady(t *testing.T) {
 				Name:      "my-deployment",
 				Namespace: ns,
 				Labels: map[string]string{
-					labels.ComponentPartOf: ns,
+					labels.PlatformPartOf: ns,
 				},
 			},
 			Status: appsv1.DeploymentStatus{
@@ -131,7 +131,7 @@ func TestUpdateStatusActionReady(t *testing.T) {
 				Name:      "my-deployment-2",
 				Namespace: ns,
 				Labels: map[string]string{
-					labels.ComponentPartOf: ns,
+					labels.PlatformPartOf: ns,
 				},
 			},
 			Status: appsv1.DeploymentStatus{
@@ -144,7 +144,7 @@ func TestUpdateStatusActionReady(t *testing.T) {
 	g.Expect(err).ShouldNot(HaveOccurred())
 
 	action := updatestatus.NewAction(
-		updatestatus.WithSelectorLabel(labels.ComponentPartOf, ns))
+		updatestatus.WithSelectorLabel(labels.PlatformPartOf, ns))
 
 	rr := types.ReconciliationRequest{
 		Client:   cl,
@@ -185,7 +185,7 @@ func TestUpdateStatusActionReadyAutoSelector(t *testing.T) {
 				Name:      "my-deployment",
 				Namespace: ns,
 				Labels: map[string]string{
-					labels.ComponentPartOf: strings.ToLower(componentsv1.DashboardKind),
+					labels.PlatformPartOf: strings.ToLower(componentsv1.DashboardKind),
 				},
 			},
 			Status: appsv1.DeploymentStatus{
@@ -202,7 +202,7 @@ func TestUpdateStatusActionReadyAutoSelector(t *testing.T) {
 				Name:      "my-deployment-2",
 				Namespace: ns,
 				Labels: map[string]string{
-					labels.ComponentPartOf: strings.ToLower(componentsv1.DashboardKind),
+					labels.PlatformPartOf: strings.ToLower(componentsv1.DashboardKind),
 				},
 			},
 			Status: appsv1.DeploymentStatus{
@@ -255,7 +255,7 @@ func TestUpdateStatusActionNotReadyNotFound(t *testing.T) {
 				Name:      "my-deployment",
 				Namespace: ns,
 				Labels: map[string]string{
-					labels.ComponentPartOf: ns,
+					labels.PlatformPartOf: ns,
 				},
 			},
 			Status: appsv1.DeploymentStatus{
@@ -272,7 +272,7 @@ func TestUpdateStatusActionNotReadyNotFound(t *testing.T) {
 				Name:      "my-deployment-2",
 				Namespace: ns,
 				Labels: map[string]string{
-					labels.ComponentPartOf: ns,
+					labels.PlatformPartOf: ns,
 				},
 			},
 			Status: appsv1.DeploymentStatus{