fix kubebuilder CRD generation annotations

Author: Diaphteiros

api/clusters/v1alpha1/accessrequest_types.go

@@ -46,7 +46,10 @@ type AccessRequestStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +kubebuilder:resource:shortName=ar;areq
 // +kubebuilder:metadata:labels="openmcp.cloud/cluster=platform"
+// +kubebuilder:selectablefield:JSONPath=".status.phase"
+// +kubebuilder:printcolumn:JSONPath=".status.phase",name="Phase",type=string
 
 // AccessRequest is the Schema for the accessrequests API
 type AccessRequest struct {

api/clusters/v1alpha1/cluster_types.go

@@ -82,14 +82,13 @@ const (
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:metadata:labels="openmcp.cloud/cluster=platform"
-// +kubebuilder:selectablefield:JSONPath=".spec.clusterProfileRef.name"
+// +kubebuilder:selectablefield:JSONPath=".spec.profile"
 // +kubebuilder:printcolumn:JSONPath=".spec.purposes",name="Purposes",type=string
 // +kubebuilder:printcolumn:JSONPath=`.status.phase`,name="Phase",type=string
 // +kubebuilder:printcolumn:JSONPath=`.metadata.annotations["clusters.openmcp.cloud/k8sversion"]`,name="Version",type=string
 // +kubebuilder:printcolumn:JSONPath=`.metadata.annotations["clusters.openmcp.cloud/profile"]`,name="Profile",type=string
-// +kubebuilder:printcolumn:JSONPath=`.metadata.labels["environment.clusters.openmcp.cloud"]`,name="Env",type=string,priority=10
 // +kubebuilder:printcolumn:JSONPath=`.metadata.labels["provider.clusters.openmcp.cloud"]`,name="Provider",type=string, priority=10
-// +kubebuilder:printcolumn:JSONPath=".spec.clusterProfileRef.name",name="ProfileRef",type=string,priority=10
+// +kubebuilder:printcolumn:JSONPath=".spec.profile",name="ProfileRef",type=string,priority=10
 // +kubebuilder:printcolumn:JSONPath=`.metadata.annotations["clusters.openmcp.cloud/providerinfo"]`,name="Info",type=string,priority=10
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 

api/clusters/v1alpha1/clusterrequest_types.go

@@ -29,7 +29,7 @@ type RequestPhase string
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:shortName=cr;creq;request
+// +kubebuilder:resource:shortName=cr;creq
 // +kubebuilder:metadata:labels="openmcp.cloud/cluster=platform"
 // +kubebuilder:selectablefield:JSONPath=".spec.purpose"
 // +kubebuilder:selectablefield:JSONPath=".status.phase"

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

@@ -13,10 +13,17 @@ spec:
     kind: AccessRequest
     listKind: AccessRequestList
     plural: accessrequests
+    shortNames:
+    - ar
+    - areq
     singular: accessrequest
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: AccessRequest is the Schema for the accessrequests API
@@ -229,6 +236,8 @@ spec:
             - phase
             type: object
         type: object
+    selectableFields:
+    - jsonPath: .status.phase
     served: true
     storage: true
     subresources:

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

@@ -16,7 +16,6 @@ spec:
     shortNames:
     - cr
     - creq
-    - request
     singular: clusterrequest
   scope: Namespaced
   versions:

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

@@ -29,15 +29,11 @@ spec:
     - jsonPath: .metadata.annotations["clusters.openmcp.cloud/profile"]
       name: Profile
       type: string
-    - jsonPath: .metadata.labels["environment.clusters.openmcp.cloud"]
-      name: Env
-      priority: 10
-      type: string
     - jsonPath: .metadata.labels["provider.clusters.openmcp.cloud"]
       name: Provider
       priority: 10
       type: string
-    - jsonPath: .spec.clusterProfileRef.name
+    - jsonPath: .spec.profile
       name: ProfileRef
       priority: 10
       type: string
@@ -194,7 +190,7 @@ spec:
             type: object
         type: object
     selectableFields:
-    - jsonPath: .spec.clusterProfileRef.name
+    - jsonPath: .spec.profile
     served: true
     storage: true
     subresources: