Merge pull request #18 from dnugmanov/fix-cluster-name

Propagate cluster_name to cassandra.yaml
k8ssandra · Nov 7, 2023 · 782e23f · 782e23f
2 parents bf8695a + 5ce5a7a
commit 782e23f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/pkg/config/builder.go b/pkg/config/builder.go
@@ -471,6 +471,7 @@ func k8ssandraOverrides(merged map[string]interface{}, configInput *ConfigInput,
 	delete(merged, "broadcast_address") // Sets it to the same as listen_address
 	merged["broadcast_rpc_address"] = nodeInfo.BroadcastIP
 	merged["endpoint_snitch"] = "GossipingPropertyFileSnitch"
+	merged["cluster_name"] = configInput.ClusterInfo.Name
 
 	return merged
 }

diff --git a/pkg/config/builder_test.go b/pkg/config/builder_test.go
@@ -210,6 +210,9 @@ func TestCassandraYamlWriting(t *testing.T) {
 	}
 
 	// Verify our k8ssandra overrides are set
+	clusterName := configInput.ClusterInfo.Name
+	require.Equal(clusterName, cassandraYaml["cluster_name"])
+
 	seedProviders := cassandraYaml["seed_provider"].([]interface{})
 	seedProvider := seedProviders[0].(map[string]interface{})
 	require.Equal("org.apache.cassandra.locator.K8SeedProvider", seedProvider["class_name"])