From f6c43304aec140b9f92a0bbcb7869f107359e183 Mon Sep 17 00:00:00 2001 From: Olivier Michallat Date: Tue, 19 Mar 2024 12:09:40 -0700 Subject: [PATCH] Fix Stargate code that should use override --- pkg/stargate/config.go | 2 +- pkg/stargate/deployments.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/stargate/config.go b/pkg/stargate/config.go index 60fed798f..226f32fde 100644 --- a/pkg/stargate/config.go +++ b/pkg/stargate/config.go @@ -42,7 +42,7 @@ func FilterConfig(config map[string]interface{}, retainedSettings []string) map[ func CreateStargateConfigMap(namespace, cassandraYaml, stargateCqlYaml string, dc cassdcapi.CassandraDatacenter) *corev1.ConfigMap { return &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Name: GeneratedConfigMapName(dc.Spec.ClusterName, dc.Name), + Name: GeneratedConfigMapName(dc.Spec.ClusterName, dc.DatacenterName()), Namespace: namespace, Labels: utils.MergeMap( map[string]string{ diff --git a/pkg/stargate/deployments.go b/pkg/stargate/deployments.go index 06a65b81d..0587ad2cc 100644 --- a/pkg/stargate/deployments.go +++ b/pkg/stargate/deployments.go @@ -351,7 +351,7 @@ func computeVolumes(template *api.StargateTemplate, dc *cassdcapi.CassandraDatac VolumeSource: corev1.VolumeSource{ ConfigMap: &corev1.ConfigMapVolumeSource{ LocalObjectReference: corev1.LocalObjectReference{ - Name: GeneratedConfigMapName(dc.Spec.ClusterName, dc.Name), + Name: GeneratedConfigMapName(dc.Spec.ClusterName, dc.DatacenterName()), }, }, },