Fix configmap name.

k8ssandra · Jan 27, 2023 · e910a8a · e910a8a
1 parent ea102ac
commit e910a8a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/controllers/k8ssandra/cassandra_metrics_agent_test.go b/controllers/k8ssandra/cassandra_metrics_agent_test.go
@@ -88,13 +88,13 @@ func createSingleDcClusterWithMetricsAgent(t *testing.T, ctx context.Context, f
 	}
 
 	// check that we have the right ConfigMap
-	agentCmKey := types.NamespacedName{Name: "test" + "metrics-agent-config", Namespace: namespace}
+	agentCmKey := types.NamespacedName{Name: "test" + "-metrics-agent-config", Namespace: namespace}
 	agentCm := corev1.ConfigMap{}
 	if err := f.Client.Get(ctx, agentCmKey, &agentCm); err != nil {
 		assert.Fail(t, "could not find expected metrics-agent-config configmap")
 	}
 
-	// Test cluster deletion
+	// Test cluster deletion, ensuring configmap deleted too.
 	t.Log("deleting K8ssandraCluster")
 	err = f.DeleteK8ssandraCluster(ctx, client.ObjectKey{Namespace: namespace, Name: kc.Name}, timeout, interval)
 	require.NoError(err, "failed to delete K8ssandraCluster")

diff --git a/pkg/telemetry/cassandra_agent/cassandra_agent_config.go b/pkg/telemetry/cassandra_agent/cassandra_agent_config.go
@@ -40,7 +40,7 @@ func (c Configurator) GetTelemetryAgentConfigMap() (*corev1.ConfigMap, error) {
 	cm := corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: c.Kluster.Namespace,
-			Name:      c.Kluster.Name + "metrics-agent-config",
+			Name:      c.Kluster.Name + "-metrics-agent-config",
 		},
 		Data: map[string]string{filepath.Base(agentConfigLocation): string(yamlData)},
 	}
@@ -53,7 +53,7 @@ func (c Configurator) ReconcileTelemetryAgentConfig(dc *cassdcapi.CassandraDatac
 	if err != nil {
 		return result.Error(err)
 	}
-	cmObjectKey := types.NamespacedName{Name: c.Kluster.Name + "metrics-agent-config",
+	cmObjectKey := types.NamespacedName{Name: c.Kluster.Name + "-metrics-agent-config",
 		Namespace: c.Kluster.Namespace}
 	annotations.AddHashAnnotation(desiredCm)
 	labels.SetManagedBy(desiredCm, cmObjectKey)

diff --git a/pkg/telemetry/cassandra_agent/cassandra_agent_config_test.go b/pkg/telemetry/cassandra_agent/cassandra_agent_config_test.go
@@ -44,7 +44,7 @@ func getExpectedConfigMap() corev1.ConfigMap {
 	expectedCm := corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: Cfg.Kluster.Namespace,
-			Name:      Cfg.Kluster.Name + "metrics-agent-config",
+			Name:      Cfg.Kluster.Name + "-metrics-agent-config",
 		},
 		Data: map[string]string{filepath.Base(agentConfigLocation): expectedYaml},
 	}
@@ -115,7 +115,7 @@ func Test_ReconcileTelemetryAgentConfig_CMCreateSuccess(t *testing.T) {
 	recRes := Cfg.ReconcileTelemetryAgentConfig(&dc)
 	assert.True(t, recRes.IsRequeue())
 	actualCm := &corev1.ConfigMap{}
-	err := Cfg.RemoteClient.Get(Cfg.Ctx, types.NamespacedName{Name: Cfg.Kluster.Name + "metrics-agent-config", Namespace: Cfg.Kluster.Namespace}, actualCm)
+	err := Cfg.RemoteClient.Get(Cfg.Ctx, types.NamespacedName{Name: Cfg.Kluster.Name + "-metrics-agent-config", Namespace: Cfg.Kluster.Namespace}, actualCm)
 	assert.NoError(t, err)
 }
 func Test_ReconcileTelemetryAgentConfig_CMCreateFailed(t *testing.T) {
@@ -146,7 +146,7 @@ func Test_ReconcileTelemetryAgentConfig_CMUpdateSuccess(t *testing.T) {
 	// After the update we should see the expected ConfigMap
 	afterUpdateCM := &corev1.ConfigMap{}
 	err = Cfg.RemoteClient.Get(Cfg.Ctx,
-		types.NamespacedName{Name: Cfg.Kluster.Name + "metrics-agent-config", Namespace: Cfg.Kluster.Namespace},
+		types.NamespacedName{Name: Cfg.Kluster.Name + "-metrics-agent-config", Namespace: Cfg.Kluster.Namespace},
 		afterUpdateCM)
 	assert.NoError(t, err)
 
@@ -166,7 +166,7 @@ func Test_ReconcileTelemetryAgentConfig_CMUpdateDone(t *testing.T) {
 	// After the update we should see the expected ConfigMap
 	afterUpdateCM := &corev1.ConfigMap{}
 	err := Cfg.RemoteClient.Get(Cfg.Ctx,
-		types.NamespacedName{Name: Cfg.Kluster.Name + "metrics-agent-config", Namespace: Cfg.Kluster.Namespace},
+		types.NamespacedName{Name: Cfg.Kluster.Name + "-metrics-agent-config", Namespace: Cfg.Kluster.Namespace},
 		afterUpdateCM)
 	assert.NoError(t, err)
 	// If we reconcile again, we should move into the Done state.