Fix SingleStore SatafulSet Name

Signed-off-by: ashraful <[email protected]>
kubedb · Feb 8, 2024 · 7037cb1 · 7037cb1
1 parent aa33c6e
commit 7037cb1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/apis/kubedb/v1alpha2/constants.go b/apis/kubedb/v1alpha2/constants.go
@@ -331,7 +331,7 @@ const (
 	DatabasePodMaster                 = "Master"
 	DatabasePodAggregator             = "Aggregator"
 	DatabasePodLeaf                   = "Leaf"
-	StatefulSetTypeMasterAggregator   = "master-aggregator"
+	StatefulSetTypeAggregator         = "aggregator"
 	StatefulSetTypeLeaf               = "leaf"
 	SinglestoreDatabaseHealth         = "singlestore_health"
 	SinglestoreTableHealth            = "singlestore_health_table"

diff --git a/apis/kubedb/v1alpha2/singlestore_helpers.go b/apis/kubedb/v1alpha2/singlestore_helpers.go
@@ -151,11 +151,19 @@ func (s *Singlestore) PVCName(alias string) string {
 }
 
 func (s *Singlestore) AggregatorStatefulSet() string {
-	return metautil.NameWithSuffix(s.OffshootName(), StatefulSetTypeMasterAggregator)
+	sts := s.OffshootName()
+	if s.Spec.Topology.Aggregator.Suffix != "" {
+		sts = metautil.NameWithSuffix(sts, s.Spec.Topology.Aggregator.Suffix)
+	}
+	return metautil.NameWithSuffix(sts, StatefulSetTypeAggregator)
 }
 
 func (s *Singlestore) LeafStatefulSet() string {
-	return metautil.NameWithSuffix(s.OffshootName(), StatefulSetTypeLeaf)
+	sts := s.OffshootName()
+	if s.Spec.Topology.Leaf.Suffix != "" {
+		sts = metautil.NameWithSuffix(sts, s.Spec.Topology.Leaf.Suffix)
+	}
+	return metautil.NameWithSuffix(sts, StatefulSetTypeLeaf)
 }
 
 func (s *Singlestore) PodLabels(extraLabels ...map[string]string) map[string]string {