feat: use commonapi.ObjectReference

Author: maximiliantech

api/clusters/v1alpha1/accessrequest_types.go

@@ -22,14 +22,14 @@ type AccessRequestSpec struct {
 	// This value is immutable.
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="clusterRef is immutable"
 	// +optional
-	ClusterRef *NamespacedObjectReference `json:"clusterRef,omitempty"`
+	ClusterRef *commonapi.ObjectReference `json:"clusterRef,omitempty"`
 
 	// RequestRef is the reference to the ClusterRequest for whose Cluster access is requested.
 	// Is ignored if clusterRef is set.
 	// This value is immutable.
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="requestRef is immutable"
 	// +optional
-	RequestRef *NamespacedObjectReference `json:"requestRef,omitempty"`
+	RequestRef *commonapi.ObjectReference `json:"requestRef,omitempty"`
 
 	// Permissions are the requested permissions.
 	Permissions []PermissionsRequest `json:"permissions"`
@@ -51,7 +51,7 @@ type AccessRequestStatus struct {
 	commonapi.Status `json:",inline"`
 
 	// SecretRef holds the reference to the secret that contains the actual credentials.
-	SecretRef *NamespacedObjectReference `json:"secretRef,omitempty"`
+	SecretRef *commonapi.ObjectReference `json:"secretRef,omitempty"`
 }
 
 func (ars AccessRequestStatus) IsGranted() bool {

api/clusters/v1alpha1/cluster_types.go

@@ -20,7 +20,7 @@ type ClusterSpec struct {
 	// ClusterConfigs allows to reference any amount of provider-specific cluster configuration objects.
 	// The k8s resource kind that is referenced by this depends on the provider (which is defined by the profile).
 	// +optional
-	ClusterConfigs []ObjectReference `json:"clusterConfigs,omitempty"`
+	ClusterConfigs []commonapi.ObjectReference `json:"clusterConfigs,omitempty"`
 
 	// Kubernetes configuration for the cluster.
 	Kubernetes K8sConfiguration `json:"kubernetes,omitempty"`

api/clusters/v1alpha1/clusterprofile_types.go

@@ -2,15 +2,17 @@ package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	commonapi "github.com/openmcp-project/openmcp-operator/api/common"
 )
 
 // ClusterProfileSpec defines the desired state of Provider.
 type ClusterProfileSpec struct {
 	// ProviderRef is a reference to the ClusterProvider
-	ProviderRef ObjectReference `json:"providerRef"`
+	ProviderRef commonapi.ObjectReference `json:"providerRef"`
 
 	// ProviderConfigRef is a reference to the provider-specific configuration.
-	ProviderConfigRef ObjectReference `json:"providerConfigRef"`
+	ProviderConfigRef commonapi.ObjectReference `json:"providerConfigRef"`
 
 	// SupportedVersions are the supported Kubernetes versions.
 	SupportedVersions []SupportedK8sVersion `json:"supportedVersions"`

api/clusters/v1alpha1/clusterrequest_types.go

@@ -28,7 +28,7 @@ type ClusterRequestStatus struct {
 	// Note that this information needs to be recoverable in case this status is lost, e.g. by adding a back reference in form of a finalizer to the Cluster resource.
 	// +optional
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="cluster is immutable"
-	Cluster *NamespacedObjectReference `json:"cluster,omitempty"`
+	Cluster *commonapi.ObjectReference `json:"cluster,omitempty"`
 }
 
 func (crs ClusterRequestStatus) IsGranted() bool {

api/clusters/v1alpha1/shared_types.go

@@ -101,19 +101,6 @@ func (cc Condition) IsUnknown() bool {
 	return cc.Status == CONDITION_UNKNOWN
 }
 
-type ObjectReference struct {
-	// Name is the name of the referenced resource.
-	// +kubebuilder:validation:MinLength=1
-	Name string `json:"name"`
-}
-
-type NamespacedObjectReference struct {
-	ObjectReference `json:",inline"`
-
-	// Namespace is the namespace of the referenced resource.
-	Namespace string `json:"namespace"`
-}
-
 // CommonStatus is a status shared by multiple resource.
 // Note that a 'phase' is also part of the status, but it cannot be included in this struct.
 // The reason is that we want to use string-like types for the phase, but the goddamn code generation does not support generics, no matter which annotations are added.

api/clusters/v1alpha1/zz_generated.deepcopy.go

@@ -54,11 +54,10 @@ spec:
                   This value is immutable.
                 properties:
                   name:
-                    description: Name is the name of the referenced resource.
-                    minLength: 1
+                    description: Name is the name of the object.
                     type: string
                   namespace:
-                    description: Namespace is the namespace of the referenced resource.
+                    description: Namespace is the namespace of the object.
                     type: string
                 required:
                 - name
@@ -139,11 +138,10 @@ spec:
                   This value is immutable.
                 properties:
                   name:
-                    description: Name is the name of the referenced resource.
-                    minLength: 1
+                    description: Name is the name of the object.
                     type: string
                   namespace:
-                    description: Namespace is the namespace of the referenced resource.
+                    description: Namespace is the namespace of the object.
                     type: string
                 required:
                 - name
@@ -233,11 +231,10 @@ spec:
                   the actual credentials.
                 properties:
                   name:
-                    description: Name is the name of the referenced resource.
-                    minLength: 1
+                    description: Name is the name of the object.
                     type: string
                   namespace:
-                    description: Namespace is the namespace of the referenced resource.
+                    description: Namespace is the namespace of the object.
                     type: string
                 required:
                 - name

api/crds/manifests/clusters.openmcp.cloud_accessrequests.yaml

@@ -55,21 +55,27 @@ spec:
                   configuration.
                 properties:
                   name:
-                    description: Name is the name of the referenced resource.
-                    minLength: 1
+                    description: Name is the name of the object.
+                    type: string
+                  namespace:
+                    description: Namespace is the namespace of the object.
                     type: string
                 required:
                 - name
+                - namespace
                 type: object
               providerRef:
                 description: ProviderRef is a reference to the ClusterProvider
                 properties:
                   name:
-                    description: Name is the name of the referenced resource.
-                    minLength: 1
+                    description: Name is the name of the object.
+                    type: string
+                  namespace:
+                    description: Namespace is the namespace of the object.
                     type: string
                 required:
                 - name
+                - namespace
                 type: object
               supportedVersions:
                 description: SupportedVersions are the supported Kubernetes versions.

api/crds/manifests/clusters.openmcp.cloud_clusterprofiles.yaml

@@ -74,11 +74,10 @@ spec:
                   Note that this information needs to be recoverable in case this status is lost, e.g. by adding a back reference in form of a finalizer to the Cluster resource.
                 properties:
                   name:
-                    description: Name is the name of the referenced resource.
-                    minLength: 1
+                    description: Name is the name of the object.
                     type: string
                   namespace:
-                    description: Namespace is the namespace of the referenced resource.
+                    description: Namespace is the namespace of the object.
                     type: string
                 required:
                 - name

api/crds/manifests/clusters.openmcp.cloud_clusterrequests.yaml

@@ -74,13 +74,18 @@ spec:
                   ClusterConfigs allows to reference any amount of provider-specific cluster configuration objects.
                   The k8s resource kind that is referenced by this depends on the provider (which is defined by the profile).
                 items:
+                  description: ObjectReference is a reference to an object in any
+                    namespace.
                   properties:
                     name:
-                      description: Name is the name of the referenced resource.
-                      minLength: 1
+                      description: Name is the name of the object.
+                      type: string
+                    namespace:
+                      description: Namespace is the namespace of the object.
                       type: string
                   required:
                   - name
+                  - namespace
                   type: object
                 type: array
               kubernetes: