feat(sync): only sync kubeconfig with Ready status

Author: onuryilmaz

cmd/sync.go

@@ -13,6 +13,7 @@ import (
 	"maps"
 	"strings"
 
+	greenhousemetav1alpha1 "github.com/cloudoperators/greenhouse/api/meta/v1alpha1"
 	"github.com/cloudoperators/greenhouse/api/v1alpha1"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -91,6 +92,9 @@ func runSync(cmd *cobra.Command, args []string) error {
 		}
 		clusterKubeconfigs = list.Items
 	}
+	// Filter only Ready ClusterKubeconfigs
+	clusterKubeconfigs = filterReady(clusterKubeconfigs)
+
 	if len(clusterKubeconfigs) == 0 {
 		log.Println("No ClusterKubeconfigs found to sync.")
 		return nil
@@ -124,6 +128,21 @@ func runSync(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
+// filterReady returns only ClusterKubeconfigs that have Ready condition set to True.
+func filterReady(items []v1alpha1.ClusterKubeconfig) []v1alpha1.ClusterKubeconfig {
+	if len(items) == 0 {
+		return items
+	}
+	eligible := make([]v1alpha1.ClusterKubeconfig, 0, len(items))
+	for _, ckc := range items {
+		cond := ckc.Status.Conditions.GetConditionByType(greenhousemetav1alpha1.ReadyCondition)
+		if cond == nil || cond.IsTrue() {
+			eligible = append(eligible, ckc)
+		}
+	}
+	return eligible
+}
+
 // buildIncomingKubeconfig converts the list of typed ClusterKubeconfig objects
 // into a clientcmdapi.Config.
 func buildIncomingKubeconfig(items []v1alpha1.ClusterKubeconfig) (*clientcmdapi.Config, error) {

cmd/sync_test.go

@@ -7,7 +7,10 @@ import (
 	"bytes"
 	"testing"
 
+	greenhousemetav1alpha1 "github.com/cloudoperators/greenhouse/api/meta/v1alpha1"
+	greenhousev1alpha1 "github.com/cloudoperators/greenhouse/api/v1alpha1"
 	. "github.com/onsi/gomega"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 )
 
@@ -145,3 +148,62 @@ func TestGenerateAuthInfoKey_CertBased(t *testing.T) {
 	g.Expect(ka).To(Equal(kb))
 	g.Expect(bytes.HasPrefix([]byte(ka), []byte("cert:"))).To(BeTrue(), "cert-based key should have cert: prefix")
 }
+
+func TestFilterReady_IncludesOnlyReady(t *testing.T) {
+	g := NewWithT(t)
+
+	readyCkc := greenhousev1alpha1.ClusterKubeconfig{
+		ObjectMeta: metav1.ObjectMeta{Name: "ready-cluster"},
+		Status:     greenhousev1alpha1.ClusterKubeconfigStatus{},
+	}
+	// Set Ready=True
+	readyCkc.Status.Conditions.SetConditions(
+		greenhousemetav1alpha1.TrueCondition(
+			greenhousemetav1alpha1.ReadyCondition,
+			"TestReason",
+			"ready",
+		),
+	)
+
+	notReadyCkc := greenhousev1alpha1.ClusterKubeconfig{
+		ObjectMeta: metav1.ObjectMeta{Name: "notready-cluster"},
+		Status:     greenhousev1alpha1.ClusterKubeconfigStatus{},
+	}
+	// Set Ready=False
+	notReadyCkc.Status.Conditions.SetConditions(
+		greenhousemetav1alpha1.FalseCondition(
+			greenhousemetav1alpha1.ReadyCondition,
+			"TestReason",
+			"not ready",
+		),
+	)
+
+	noCondCkc := greenhousev1alpha1.ClusterKubeconfig{
+		ObjectMeta: metav1.ObjectMeta{Name: "nocond-cluster"},
+	}
+
+	out := filterReady([]greenhousev1alpha1.ClusterKubeconfig{readyCkc, notReadyCkc, noCondCkc})
+	g.Expect(out).To(HaveLen(1))
+	g.Expect(out[0].Name).To(Equal("ready-cluster"))
+}
+
+func TestFilterReady_EmptyAndNoneReady(t *testing.T) {
+	g := NewWithT(t)
+
+	// Empty input
+	out := filterReady(nil)
+	g.Expect(out).To(BeNil())
+
+	// None ready input
+	a := greenhousev1alpha1.ClusterKubeconfig{ObjectMeta: metav1.ObjectMeta{Name: "a"}}
+	a.Status.Conditions.SetConditions(
+		greenhousemetav1alpha1.FalseCondition(
+			greenhousemetav1alpha1.ReadyCondition,
+			"TestReason",
+			"not ready",
+		),
+	)
+	b := greenhousev1alpha1.ClusterKubeconfig{ObjectMeta: metav1.ObjectMeta{Name: "b"}}
+	out2 := filterReady([]greenhousev1alpha1.ClusterKubeconfig{a, b})
+	g.Expect(out2).To(HaveLen(0))
+}

e2e/sync_test.go

@@ -32,7 +32,8 @@ func TestE2E_Sync(t *testing.T) {
 	crFile := filepath.Join(os.TempDir(), "clusterkubeconfig-e2e.yaml")
 
 	// Prefer applying the CRD from the repository path that matches the provided spec (greenhouse.sap group).
-	remoteCRD := "https://raw.githubusercontent.com/cloudoperators/greenhouse/refs/heads/main/charts/manager/crds/greenhouse.sap_clusterkubeconfigs.yaml"
+	// Use the correct raw URL format: /{owner}/{repo}/{branch}/{path}
+	remoteCRD := "https://raw.githubusercontent.com/cloudoperators/greenhouse/main/charts/manager/crds/greenhouse.sap_clusterkubeconfigs.yaml"
 
 	// Try local cache first (optional), otherwise fall back to the remote CRD above.
 	appliedCRD := false
@@ -103,6 +104,20 @@ spec:
 		t.Fatalf("apply CR failed: %v (stderr: %s)", err, stderr)
 	}
 
+	// Since cloudctl sync only considers ClusterKubeconfigs with Ready=True,
+	// patch the status of our demo resource accordingly and wait until it's reflected.
+	// Note: We don't have a controller in this e2e setup, so we set the status manually.
+	if _, stderr, err := runCmd(
+		"kubectl", "--kubeconfig", kubeconfig,
+		"-n", ns,
+		"patch", "clusterkubeconfig", "demo",
+		"--type", "merge",
+		"--subresource", "status",
+		"-p", `{"status":{"conditions":[{"type":"Ready","status":"True","reason":"E2E","message":"ready"}]}}`,
+	); err != nil {
+		t.Fatalf("patch status failed: %v (stderr: %s)", err, stderr)
+	}
+
 	// Target kubeconfig file
 	targetKubeconfig := filepath.Join(os.TempDir(), "e2e-sync-target-kubeconfig")
 	createEmptyKubeconfigFile(t, targetKubeconfig)