removed the interface as it was not needed

Author: Skarlso

api/v1alpha1/componentversion_types.go

@@ -11,7 +11,6 @@ import (
 	"github.com/fluxcd/pkg/apis/meta"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 const (
@@ -190,16 +189,6 @@ func (in ComponentVersion) GetRequeueAfter() time.Duration {
 	return in.Spec.Interval.Duration
 }
 
-func (in *ComponentVersionList) List() []client.Object {
-	var result []client.Object
-	for _, o := range in.Items {
-		o := o
-		result = append(result, &o)
-	}
-
-	return result
-}
-
 //+kubebuilder:object:root=true
 //+kubebuilder:resource:shortName=cv
 //+kubebuilder:subresource:status

api/v1alpha1/configuration_types.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 //+kubebuilder:object:root=true
@@ -77,16 +76,6 @@ func (in *Configuration) GetStatus() *MutationStatus {
 	return &in.Status
 }
 
-func (in *ConfigurationList) List() []client.Object {
-	var result []client.Object
-	for _, o := range in.Items {
-		o := o
-		result = append(result, &o)
-	}
-
-	return result
-}
-
 //+kubebuilder:object:root=true
 
 // ConfigurationList contains a list of Configuration

api/v1alpha1/localization_types.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 //+kubebuilder:object:root=true
@@ -76,16 +75,6 @@ func (in *Localization) GetStatus() *MutationStatus {
 	return &in.Status
 }
 
-func (in *LocalizationList) List() []client.Object {
-	var result []client.Object
-	for _, o := range in.Items {
-		o := o
-		result = append(result, &o)
-	}
-
-	return result
-}
-
 //+kubebuilder:object:root=true
 
 // LocalizationList contains a list of Localization

api/v1alpha1/resource_types.go

@@ -9,7 +9,6 @@ import (
 
 	ocmmetav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 // ResourceSpec defines the desired state of Resource
@@ -116,16 +115,6 @@ func (in Resource) GetSnapshotName() string {
 	return in.Status.SnapshotName
 }
 
-func (in *ResourceList) List() []client.Object {
-	var result []client.Object
-	for _, o := range in.Items {
-		o := o
-		result = append(result, &o)
-	}
-
-	return result
-}
-
 //+kubebuilder:object:root=true
 
 // ResourceList contains a list of Resource

controllers/componentversion_controller.go

@@ -18,7 +18,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
 	kuberecorder "k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
@@ -27,6 +29,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
 	"github.com/open-component-model/ocm/pkg/contexts/ocm"
@@ -83,10 +86,34 @@ func (r *ComponentVersionReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		For(&v1alpha1.ComponentVersion{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
 		Watches(
 			&source.Kind{Type: &corev1.Secret{}},
-			handler.EnqueueRequestsFromMapFunc(findRegistrySecrets(r.Client, sourceKey, &v1alpha1.ComponentVersionList{}))).
+			handler.EnqueueRequestsFromMapFunc(r.findObjects(sourceKey))).
 		Complete(r)
 }
 
+// findObjects finds component versions that have a key for the secret that triggered this watch event.
+func (r *ComponentVersionReconciler) findObjects(key string) handler.MapFunc {
+	return func(obj client.Object) []reconcile.Request {
+		list := &v1alpha1.ComponentVersionList{}
+		if err := r.List(context.Background(), list, &client.ListOptions{
+			FieldSelector: fields.OneTermEqualSelector(key, client.ObjectKeyFromObject(obj).String()),
+		}); err != nil {
+			return []reconcile.Request{}
+		}
+
+		requests := make([]reconcile.Request, len(list.Items))
+		for i, item := range list.Items {
+			requests[i] = reconcile.Request{
+				NamespacedName: types.NamespacedName{
+					Name:      item.GetName(),
+					Namespace: item.GetNamespace(),
+				},
+			}
+		}
+
+		return requests
+	}
+}
+
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
 func (r *ComponentVersionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, retErr error) {

controllers/configuration_controller.go

@@ -309,7 +309,7 @@ func (r *ConfigurationReconciler) reconcile(
 	return ctrl.Result{RequeueAfter: obj.GetRequeueAfter()}, nil
 }
 
-// The purpose of the findRegistrySecrets function is to identify whether a given Kubernetes object
+// The purpose of the findObjects function is to identify whether a given Kubernetes object
 // is referenced by a Configuration. This is done by checking whether the object is a ComponentVersion
 // or a Snapshot. If it's a ComponentVersion, we look for all Configurations that reference
 // it by name. If it's a Snapshot, we first identify its owner and then look for Configurations

controllers/find_registry_secrets.go

@@ -290,7 +290,7 @@ func (r *LocalizationReconciler) reconcile(
 	return ctrl.Result{RequeueAfter: obj.GetRequeueAfter()}, nil
 }
 
-// The purpose of the findRegistrySecrets function is to identify whether a given Kubernetes object
+// The purpose of the findObjects function is to identify whether a given Kubernetes object
 // is referenced by a Localization. This is done by checking whether the object is a ComponentVersion
 // or a Snapshot. If it's a ComponentVersion, we look for all Configurations that reference
 // it by name. If it's a Snapshot, we first identify its owner and then look for Localization