fix: Weave-Clickhouse

api/v2/weightsandbiases_types.go

@@ -834,6 +834,8 @@ type ObjectStoreInfraStatus struct {
 type ClickHouseInfraStatus struct {
 	WBInfraStatus `json:",inline"`
 	Connection    ClickHouseConnection `json:"connection,omitempty"`
+	Replicated    bool                 `json:"replicated,omitempty"`
+	ClusterName   string               `json:"clusterName,omitempty"`
 }
 
 type TelemetryInfraStatus struct {

config/crd/bases/apps.wandb.com_weightsandbiases.yaml

@@ -4413,6 +4413,8 @@ spec:
               clickhouseStatus:
                 additionalProperties:
                   properties:
+                    clusterName:
+                      type: string
                     conditions:
                       items:
                         properties:
@@ -4545,6 +4547,8 @@ spec:
                       type: object
                     ready:
                       type: boolean
+                    replicated:
+                      type: boolean
                     state:
                       type: string
                   required:

internal/controller/infra/managed/clickhouse/altinity/naming.go

@@ -75,6 +75,7 @@ func (n *NsNameBuilder) ConnectionNsName() types.NamespacedName {
 func createNsNameBuilder(baseNsName types.NamespacedName) *NsNameBuilder {
 	return CreateNsNameBuilder(baseNsName)
 }
+func CHIClusterName() string { return chiClusterName }
 
 const (
 	// chiClusterName is the single cluster the CHI defines.

internal/controller/infra/managed/clickhouse/altinity/naming_test.go

@@ -1,15 +1,39 @@
 package altinity
 
 import (
+	"context"
 	"strings"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	apiv2 "github.com/wandb/operator/api/v2"
+	"github.com/wandb/operator/pkg/wandb/manifest"
 	"k8s.io/apimachinery/pkg/util/validation"
 )
 
 var _ = Describe("managed ClickHouse naming", func() {
+	Describe("CHIClusterName", func() {
+		// Applications run ReplicatedMergeTree DDL as `ON CLUSTER <name>`, so this
+		// must be the cluster the CHI actually declares — not ClusterName(), which
+		// is the truncated spec name used to build the Service name.
+		It("matches the cluster the CHI declares", func() {
+			wandb := clickHouseWandb()
+			spec := wandb.Spec.ClickHouse[apiv2.DefaultInstanceName].ManagedClickHouse
+
+			chi, err := ToClickHouseVendorSpec(
+				context.Background(), wandb, spec, clickHouseScheme(),
+				testObjectStorageConn(), testObjectStorageEndpoint, true, manifest.Manifest{},
+			)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(chi.Spec.Configuration.Clusters).To(HaveLen(1))
+			Expect(chi.Spec.Configuration.Clusters[0].Name).To(Equal(CHIClusterName()))
+		})
+
+		It("is not the Service-name derivation", func() {
+			Expect(CHIClusterName()).NotTo(Equal(ClusterName("wandb-clickhouse-chi")))
+		})
+	})
+
 	Describe("KeeperNsName", func() {
 		It("pairs the Keeper with the installation via the shared base name", func() {
 			spec := &apiv2.ManagedClickHouseSpec{Name: "wandb-legacy-overrides-v1-chi", Namespace: "wandb"}

internal/controller/reconciler/clickhouse.go

@@ -290,6 +290,9 @@ func managedClickHouseInferStatus(
 	for _, e := range events {
 		recorder.Event(wandb, e.Type, e.Reason, e.Message)
 	}
+	managed := wandb.Spec.ClickHouse[key].ManagedClickHouse
+	updatedStatus.Replicated = managed.Replicas > 1
+	updatedStatus.ClusterName = altinity.CHIClusterName()
 	wandb.Status.ClickHouseStatus[key] = updatedStatus
 	err := updateWandbStatusIfChanged(ctx, client, wandb, statusBefore)
 

internal/controller/reconciler/clickhouse_replication_test.go

@@ -0,0 +1,134 @@
+package reconciler
+
+import (
+	"context"
+	"testing"
+
+	apiv2 "github.com/wandb/operator/api/v2"
+	"github.com/wandb/operator/internal/controller/infra/managed/clickhouse/altinity"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/tools/record"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+)
+
+func replicationTestCR(replicas int32) *apiv2.WeightsAndBiases {
+	return &apiv2.WeightsAndBiases{
+		TypeMeta:   metav1.TypeMeta{APIVersion: apiv2.GroupVersion.String(), Kind: "WeightsAndBiases"},
+		ObjectMeta: metav1.ObjectMeta{Name: "wandb", Namespace: "wandb"},
+		Spec: apiv2.WeightsAndBiasesSpec{
+			ClickHouse: map[string]apiv2.ClickHouseSpec{
+				apiv2.DefaultInstanceName: {
+					ManagedClickHouse: &apiv2.ManagedClickHouseSpec{
+						Name:      "wandb-chi",
+						Namespace: "wandb",
+						Replicas:  replicas,
+					},
+				},
+			},
+		},
+	}
+}
+
+// inferManagedClickHouseStatus runs the managed status path and returns the
+// published ClickHouse status for the default instance.
+func inferManagedClickHouseStatus(t *testing.T, replicas int32) apiv2.ClickHouseInfraStatus {
+	t.Helper()
+
+	scheme := runtime.NewScheme()
+	if err := apiv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("add apiv2 to scheme: %v", err)
+	}
+
+	wandb := replicationTestCR(replicas)
+	client := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithObjects(wandb).
+		WithStatusSubresource(wandb).
+		Build()
+
+	wandb.Status.ClickHouseStatus = map[string]apiv2.ClickHouseInfraStatus{}
+	if _, err := managedClickHouseInferStatus(
+		context.Background(), client, record.NewFakeRecorder(10),
+		wandb, apiv2.DefaultInstanceName, nil, &apiv2.ClickHouseConnection{},
+	); err != nil {
+		t.Fatalf("managedClickHouseInferStatus: %v", err)
+	}
+	return wandb.Status.ClickHouseStatus[apiv2.DefaultInstanceName]
+}
+
+// Weave creates ReplicatedMergeTree tables only when told the cluster is
+// replicated; without this the operator provisions replicas that never receive
+// writes.
+func TestManagedClickHouseStatusPublishesReplication(t *testing.T) {
+	for _, tc := range []struct {
+		name       string
+		replicas   int32
+		replicated bool
+	}{
+		{"single replica is not replicated", 1, false},
+		{"two replicas are replicated", 2, true},
+		{"three replicas are replicated", 3, true},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			status := inferManagedClickHouseStatus(t, tc.replicas)
+			if status.Replicated != tc.replicated {
+				t.Fatalf("expected Replicated=%t for %d replicas, got %t",
+					tc.replicated, tc.replicas, status.Replicated)
+			}
+		})
+	}
+}
+
+// The published name is used verbatim as `ON CLUSTER <name>`, so it has to be
+// the cluster the CHI declares — not the Service-name derivation.
+func TestManagedClickHouseStatusPublishesCHIClusterName(t *testing.T) {
+	status := inferManagedClickHouseStatus(t, 2)
+
+	if status.ClusterName != altinity.CHIClusterName() {
+		t.Fatalf("expected ClusterName=%q, got %q", altinity.CHIClusterName(), status.ClusterName)
+	}
+	if status.ClusterName == altinity.ClusterName("wandb-chi") {
+		t.Fatal("published the Service-name derivation instead of the CHI cluster name")
+	}
+}
+
+// External ClickHouse topology is unknown to the operator: the fields must stay
+// zero so the server manifest's defaultValue applies.
+func TestExternalClickHouseStatusLeavesReplicationUnset(t *testing.T) {
+	scheme := runtime.NewScheme()
+	if err := apiv2.AddToScheme(scheme); err != nil {
+		t.Fatalf("add apiv2 to scheme: %v", err)
+	}
+
+	wandb := &apiv2.WeightsAndBiases{
+		TypeMeta:   metav1.TypeMeta{APIVersion: apiv2.GroupVersion.String(), Kind: "WeightsAndBiases"},
+		ObjectMeta: metav1.ObjectMeta{Name: "wandb", Namespace: "wandb"},
+		Spec: apiv2.WeightsAndBiasesSpec{
+			ClickHouse: map[string]apiv2.ClickHouseSpec{
+				apiv2.DefaultInstanceName: {ExternalClickHouse: &apiv2.ClickHouseConnection{}},
+			},
+		},
+	}
+	client := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithObjects(wandb).
+		WithStatusSubresource(wandb).
+		Build()
+
+	wandb.Status.ClickHouseStatus = map[string]apiv2.ClickHouseInfraStatus{}
+	if _, err := externalClickHouseInferStatus(
+		context.Background(), client, wandb, apiv2.DefaultInstanceName,
+		nil, &apiv2.ClickHouseConnection{},
+	); err != nil {
+		t.Fatalf("externalClickHouseInferStatus: %v", err)
+	}
+
+	status := wandb.Status.ClickHouseStatus[apiv2.DefaultInstanceName]
+	if status.Replicated {
+		t.Error("external ClickHouse must not be reported as replicated")
+	}
+	if status.ClusterName != "" {
+		t.Errorf("expected an empty ClusterName for external ClickHouse, got %q", status.ClusterName)
+	}
+}

internal/crdinstaller/crds/operator/apps.wandb.com_weightsandbiases.yaml

@@ -4413,6 +4413,8 @@ spec:
               clickhouseStatus:
                 additionalProperties:
                   properties:
+                    clusterName:
+                      type: string
                     conditions:
                       items:
                         properties:
@@ -4545,6 +4547,8 @@ spec:
                       type: object
                     ready:
                       type: boolean
+                    replicated:
+                      type: boolean
                     state:
                       type: string
                   required: