print columns and field selectors

Author: robertgraeff

api/crds/manifests/openmcp.cloud_clusterproviders.yaml

@@ -16,7 +16,11 @@ spec:
     singular: clusterprovider
   scope: Cluster
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: ClusterProvider is the Schema for the clusterproviders API.
@@ -160,6 +164,8 @@ spec:
             - observedGeneration
             type: object
         type: object
+    selectableFields:
+    - jsonPath: .status.phase
     served: true
     storage: true
     subresources:

api/crds/manifests/openmcp.cloud_platformservices.yaml

@@ -16,7 +16,11 @@ spec:
     singular: platformservice
   scope: Cluster
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: PlatformService is the Schema for the platformservices API.
@@ -160,6 +164,8 @@ spec:
             - observedGeneration
             type: object
         type: object
+    selectableFields:
+    - jsonPath: .status.phase
     served: true
     storage: true
     subresources:

api/crds/manifests/openmcp.cloud_serviceproviders.yaml

@@ -16,7 +16,11 @@ spec:
     singular: serviceprovider
   scope: Cluster
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: ServiceProvider is the Schema for the serviceproviders API.
@@ -160,6 +164,8 @@ spec:
             - observedGeneration
             type: object
         type: object
+    selectableFields:
+    - jsonPath: .status.phase
     served: true
     storage: true
     subresources:

api/provider/v1alpha1/clusterprovider_types.go

@@ -38,6 +38,8 @@ type ClusterProviderStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
 // +kubebuilder:metadata:labels="openmcp.cloud/cluster=platform"
+// +kubebuilder:selectablefield:JSONPath=".status.phase"
+// +kubebuilder:printcolumn:JSONPath=".status.phase",name="Phase",type=string
 
 // ClusterProvider is the Schema for the clusterproviders API.
 type ClusterProvider struct {

api/provider/v1alpha1/platformservice_types.go

@@ -38,6 +38,8 @@ type PlatformServiceStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
 // +kubebuilder:metadata:labels="openmcp.cloud/cluster=platform"
+// +kubebuilder:selectablefield:JSONPath=".status.phase"
+// +kubebuilder:printcolumn:JSONPath=".status.phase",name="Phase",type=string
 
 // PlatformService is the Schema for the platformservices API.
 type PlatformService struct {

api/provider/v1alpha1/serviceprovider_types.go

@@ -38,6 +38,8 @@ type ServiceProviderStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
 // +kubebuilder:metadata:labels="openmcp.cloud/cluster=platform"
+// +kubebuilder:selectablefield:JSONPath=".status.phase"
+// +kubebuilder:printcolumn:JSONPath=".status.phase",name="Phase",type=string
 
 // ServiceProvider is the Schema for the serviceproviders API.
 type ServiceProvider struct {

internal/controllers/provider/controller.go

@@ -219,7 +219,10 @@ func (r *ProviderReconciler) checkReconcileAnnotation(
 ) error {
 	if controller.HasAnnotationWithValue(provider, constants.OperationAnnotation, constants.OperationAnnotationValueReconcile) && deploymentStatus.Phase == phaseReady {
 		log := logging.FromContextOrPanic(ctx)
+		log.Debug("reconciling due to reconcile annotation")
 		deploymentStatus.Phase = phaseProgressing
+		deploymentStatus.ObservedGeneration = provider.GetGeneration()
+		resetConditions(provider, deploymentStatus)
 
 		if err := DeploymentStatusIntoUnstructured(deploymentStatus, provider); err != nil {
 			log.Error(err, "failed to handle reconcile annotation")
@@ -266,8 +269,8 @@ func (r *ProviderReconciler) removeFinalizer(ctx context.Context, provider *unst
 func (r *ProviderReconciler) observeGeneration(provider *unstructured.Unstructured, status *v1alpha1.DeploymentStatus) {
 	gen := provider.GetGeneration()
 	if status.ObservedGeneration != gen {
-		status.ObservedGeneration = gen
 		status.Phase = phaseProgressing
+		status.ObservedGeneration = gen
 		resetConditions(provider, status)
 	}
 }