feat(controller): use commonapi.ObjectReference

Author: maximiliantech

internal/controllers/accessrequest/controller.go

@@ -19,6 +19,8 @@ import (
 	cconst "github.com/openmcp-project/openmcp-operator/api/clusters/v1alpha1/constants"
 	apiconst "github.com/openmcp-project/openmcp-operator/api/constants"
 	"github.com/openmcp-project/openmcp-operator/internal/config"
+
+	commonapi "github.com/openmcp-project/openmcp-operator/api/common"
 )
 
 const ControllerName = "AccessRequest"
@@ -168,7 +170,7 @@ func (r *AccessRequestReconciler) reconcile(ctx context.Context, req reconcile.R
 	// set cluster reference, if only the request reference is set
 	if ar.Spec.ClusterRef == nil {
 		log.Info("Setting cluster reference in AccessRequest", "clusterName", c.Name, "clusterNamespace", c.Namespace)
-		ar.Spec.ClusterRef = &clustersv1alpha1.NamespacedObjectReference{}
+		ar.Spec.ClusterRef = &commonapi.ObjectReference{}
 		ar.Spec.ClusterRef.Name = c.Name
 		ar.Spec.ClusterRef.Namespace = c.Namespace
 	}

internal/controllers/scheduler/controller.go

@@ -23,8 +23,11 @@ import (
 
 	clustersv1alpha1 "github.com/openmcp-project/openmcp-operator/api/clusters/v1alpha1"
 	cconst "github.com/openmcp-project/openmcp-operator/api/clusters/v1alpha1/constants"
+	"github.com/openmcp-project/openmcp-operator/api/common"
 	apiconst "github.com/openmcp-project/openmcp-operator/api/constants"
 	"github.com/openmcp-project/openmcp-operator/internal/config"
+
+	commonapi "github.com/openmcp-project/openmcp-operator/api/common"
 )
 
 const ControllerName = "Scheduler"
@@ -163,7 +166,7 @@ func (r *ClusterScheduler) handleCreateOrUpdate(ctx context.Context, req reconci
 	}
 	if cluster != nil {
 		log.Info("Recovered cluster from referencing finalizer", "clusterName", cluster.Name, "clusterNamespace", cluster.Namespace)
-		rr.Object.Status.Cluster = &clustersv1alpha1.NamespacedObjectReference{}
+		rr.Object.Status.Cluster = &commonapi.ObjectReference{}
 		rr.Object.Status.Cluster.Name = cluster.Name
 		rr.Object.Status.Cluster.Namespace = cluster.Namespace
 		return rr
@@ -249,7 +252,7 @@ func (r *ClusterScheduler) handleCreateOrUpdate(ctx context.Context, req reconci
 	}
 
 	// add cluster reference to request
-	rr.Object.Status.Cluster = &clustersv1alpha1.NamespacedObjectReference{}
+	rr.Object.Status.Cluster = &common.ObjectReference{}
 	rr.Object.Status.Cluster.Name = cluster.Name
 	rr.Object.Status.Cluster.Namespace = cluster.Namespace
 

lib/clusteraccess/clusteraccess.go

@@ -21,6 +21,8 @@ import (
 	clustersv1alpha1 "github.com/openmcp-project/openmcp-operator/api/clusters/v1alpha1"
 	constv1alpha1 "github.com/openmcp-project/openmcp-operator/api/constants"
 	libutils "github.com/openmcp-project/openmcp-operator/lib/utils"
+
+	commonapi "github.com/openmcp-project/openmcp-operator/api/common"
 )
 
 const (
@@ -190,10 +192,8 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, request reconcile.Reques
 	log.Debug("Create and wait for MCP cluster access request", "accessRequestName", requestNameMCP, "accessRequestNamespace", requestNamespace)
 
 	mcpAccessRequest, err := ensureAccessRequest(ctx, r.platformClusterClient,
-		requestNameMCP, requestNamespace, &clustersv1alpha1.NamespacedObjectReference{
-			ObjectReference: clustersv1alpha1.ObjectReference{
-				Name: request.Name,
-			},
+		requestNameMCP, requestNamespace, &commonapi.ObjectReference{
+			Name:      request.Name,
 			Namespace: requestNamespace,
 		}, nil, r.mcpPermissions, metadata)
 
@@ -235,10 +235,8 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, request reconcile.Reques
 	log.Debug("Create and wait for Workload cluster access request", "accessRequestName", requestNameWorkload, "accessRequestNamespace", requestNamespace)
 
 	workloadAccessRequest, err := ensureAccessRequest(ctx, r.platformClusterClient,
-		requestNameWorkload, requestNamespace, &clustersv1alpha1.NamespacedObjectReference{
-			ObjectReference: clustersv1alpha1.ObjectReference{
-				Name: requestNameWorkload,
-			},
+		requestNameWorkload, requestNamespace, &commonapi.ObjectReference{
+			Name:      requestNameWorkload,
 			Namespace: requestNamespace,
 		}, nil, r.workloadPermissions, metadata)
 
@@ -388,10 +386,8 @@ func (m *managerImpl) CreateAndWaitForCluster(ctx context.Context, clusterName,
 	}
 
 	accessRequestMutator := newAccessRequestMutator(ar.Name, ar.Namespace)
-	accessRequestMutator.WithRequestRef(&clustersv1alpha1.NamespacedObjectReference{
-		ObjectReference: clustersv1alpha1.ObjectReference{
-			Name: cr.Name,
-		},
+	accessRequestMutator.WithRequestRef(&commonapi.ObjectReference{
+		Name:      cr.Name,
 		Namespace: cr.Namespace,
 	})
 	accessRequestMutator.WithPermissions(permissions)
@@ -470,7 +466,7 @@ func ensureClusterRequest(ctx context.Context, platformClusterClient client.Clie
 }
 
 func ensureAccessRequest(ctx context.Context, platformClusterClient client.Client, requestName, requestNamespace string,
-	requestRef *clustersv1alpha1.NamespacedObjectReference, clusterRef *clustersv1alpha1.NamespacedObjectReference,
+	requestRef *commonapi.ObjectReference, clusterRef *commonapi.ObjectReference,
 	permissions []clustersv1alpha1.PermissionsRequest, metadata resources.MetadataMutator) (*clustersv1alpha1.AccessRequest, error) {
 
 	mutator := newAccessRequestMutator(requestName, requestNamespace).
@@ -641,8 +637,8 @@ func (m *clusterRequestMutator) Mutate(clusterRequest *clustersv1alpha1.ClusterR
 type accessRequestMutator struct {
 	name        string
 	namespace   string
-	requestRef  *clustersv1alpha1.NamespacedObjectReference
-	clusterRef  *clustersv1alpha1.NamespacedObjectReference
+	requestRef  *commonapi.ObjectReference
+	clusterRef  *commonapi.ObjectReference
 	permissions []clustersv1alpha1.PermissionsRequest
 	metadata    resources.MetadataMutator
 }
@@ -654,12 +650,12 @@ func newAccessRequestMutator(name, namespace string) *accessRequestMutator {
 	}
 }
 
-func (m *accessRequestMutator) WithRequestRef(requestRef *clustersv1alpha1.NamespacedObjectReference) *accessRequestMutator {
+func (m *accessRequestMutator) WithRequestRef(requestRef *commonapi.ObjectReference) *accessRequestMutator {
 	m.requestRef = requestRef
 	return m
 }
 
-func (m *accessRequestMutator) WithClusterRef(clusterRef *clustersv1alpha1.NamespacedObjectReference) *accessRequestMutator {
+func (m *accessRequestMutator) WithClusterRef(clusterRef *commonapi.ObjectReference) *accessRequestMutator {
 	m.clusterRef = clusterRef
 	return m
 }

lib/clusteraccess/clusteraccess_test.go

@@ -207,18 +207,14 @@ var _ = Describe("ClusterAccessReconciler", func() {
 			Expect(env.Client().Status().Update(env.Ctx, accessRequestWorkload)).To(Succeed())
 
 			// set the secret reference for the MCP access request and the workload access request
-			accessRequestMCP.Status.SecretRef = &clustersv1alpha1.NamespacedObjectReference{
-				ObjectReference: clustersv1alpha1.ObjectReference{
-					Name: "mcp-access",
-				},
+			accessRequestMCP.Status.SecretRef = &commonapi.ObjectReference{
+				Name:      "mcp-access",
 				Namespace: expectedRequestNamespace,
 			}
 			Expect(env.Client().Status().Update(env.Ctx, accessRequestMCP)).To(Succeed())
 
-			accessRequestWorkload.Status.SecretRef = &clustersv1alpha1.NamespacedObjectReference{
-				ObjectReference: clustersv1alpha1.ObjectReference{
-					Name: "workload-access",
-				},
+			accessRequestWorkload.Status.SecretRef = &commonapi.ObjectReference{
+				Name:      "workload-access",
 				Namespace: expectedRequestNamespace,
 			}
 			Expect(env.Client().Status().Update(env.Ctx, accessRequestWorkload)).To(Succeed())
@@ -370,10 +366,8 @@ var _ = Describe("ClusterAccessManager", func() {
 			if accessRequest.Status.Phase != clustersv1alpha1.REQUEST_GRANTED {
 				accessRequest.Status.Phase = clustersv1alpha1.REQUEST_GRANTED
 
-				accessRequest.Status.SecretRef = &clustersv1alpha1.NamespacedObjectReference{
-					ObjectReference: clustersv1alpha1.ObjectReference{
-						Name: "access",
-					},
+				accessRequest.Status.SecretRef = &commonapi.ObjectReference{
+					Name:      "access",
 					Namespace: "default",
 				}