feat(clusterkubeconfigs): add print column (#1613)

fix(clusterkubeconfigs): fix error handling when missing fields

Update internal/controller/cluster/kubeconfig_controller.go



(chore): fix curl quotes

quotes on a mobile device differ (my bad)

(chore): revert string emptiness check on byte data

Signed-off-by: abhijith-darshan <[email protected]>

Author: onuryilmaz

api/v1alpha1/clusterkubeconfig_types.go

@@ -67,6 +67,7 @@ type ClusterKubeconfigPreferences struct {
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:shortName=ckc;cluster-kubeconfigs
+//+kubebuilder:printcolumn:name="Ready",type="string",JSONPath=`.status.statusConditions.conditions[?(@.type == "Ready")].status`
 
 // ClusterKubeconfig is the Schema for the clusterkubeconfigs API
 // ObjectMeta.OwnerReferences is used to link the ClusterKubeconfig to the Cluster

charts/manager/crds/greenhouse.sap_clusterkubeconfigs.yaml

@@ -20,7 +20,11 @@ spec:
     singular: clusterkubeconfig
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .status.statusConditions.conditions[?(@.type == "Ready")].status
+      name: Ready
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: |-

internal/controller/cluster/kubeconfig_controller.go

@@ -9,6 +9,7 @@ import (
 	"errors"
 
 	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/types"
 	"k8s.io/client-go/tools/clientcmd"
@@ -96,6 +97,16 @@ func (r *KubeconfigReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 				},
 			}}
 		kubeconfig.Spec.Kubeconfig.CurrentContext = cluster.Name
+
+		// ensure the ClusterKubeconfig resource exists before any status patches happen later
+		if err := r.Create(ctx, &kubeconfig); err != nil {
+			if !apierrors.IsAlreadyExists(err) {
+				l.Error(err, "failed to create initial ClusterKubeconfig resource")
+				return ctrl.Result{}, err
+			}
+		} else {
+			l.Info("created initial ClusterKubeconfig resource")
+		}
 	}
 
 	// get oidc info from organization
@@ -132,7 +143,27 @@ func (r *KubeconfigReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	}
 
 	// collect cluster connection data and update kubeconfig
-	rootKubeCfg := secret.Data[greenhouseapis.GreenHouseKubeConfigKey]
+	rootKubeCfg, hasKey := secret.Data[greenhouseapis.GreenHouseKubeConfigKey]
+	if !hasKey || len(rootKubeCfg) == 0 {
+		kubeconfig.Status.Conditions.SetConditions(
+			greenhousemetav1alpha1.TrueCondition(
+				v1alpha1.KubeconfigReconcileFailedCondition,
+				"KubeconfigMissing",
+				"secret data key greenhousekubeconfig missing or empty",
+			),
+		)
+		// patch status before returning on error
+		result, perr := clientutil.PatchStatus(ctx, r.Client, &kubeconfig, func() error {
+			kubeconfig.Status = calculateKubeconfigStatus(&kubeconfig)
+			return nil
+		})
+		if perr != nil {
+			log.FromContext(ctx).Error(perr, "error setting status")
+		}
+		l.Info("status updated", "result", result)
+		return ctrl.Result{}, nil
+	}
+
 	kubeCfg, err := clientcmd.Load(rootKubeCfg)
 	if err != nil {
 		kubeconfig.Status.Conditions.SetConditions(greenhousemetav1alpha1.TrueCondition(v1alpha1.KubeconfigReconcileFailedCondition, "KubeconfigLoadError", err.Error()))
@@ -153,6 +184,25 @@ func (r *KubeconfigReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		clusterCfg = v
 		break
 	}
+	if clusterCfg == nil {
+		kubeconfig.Status.Conditions.SetConditions(
+			greenhousemetav1alpha1.TrueCondition(
+				v1alpha1.KubeconfigReconcileFailedCondition,
+				"KubeconfigInvalid",
+				"no clusters found in kubeconfig",
+			),
+		)
+		// patch status before returning on error
+		result, perr := clientutil.PatchStatus(ctx, r.Client, &kubeconfig, func() error {
+			kubeconfig.Status = calculateKubeconfigStatus(&kubeconfig)
+			return nil
+		})
+		if perr != nil {
+			log.FromContext(ctx).Error(perr, "error setting status")
+		}
+		l.Info("status updated", "result", result)
+		return ctrl.Result{}, nil
+	}
 
 	// collect oidc data and update kubeconfig
 	result, err := clientutil.CreateOrPatch(ctx, r.Client, &kubeconfig, func() error {