Test all env vars for Cassandra, HCD and DSE

k8ssandra · May 29, 2024 · c3ee627 · c3ee627
1 parent bf6f8b3
commit c3ee627
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 12 deletions.
diff --git a/pkg/reconciliation/construct_podtemplatespec.go b/pkg/reconciliation/construct_podtemplatespec.go
@@ -635,18 +635,22 @@ func buildContainers(dc *api.CassandraDatacenter, baseTemplate *corev1.PodTempla
 		{Name: "POD_NAME", ValueFrom: selectorFromFieldPath("metadata.name")},
 		{Name: "NODE_NAME", ValueFrom: selectorFromFieldPath("spec.nodeName")},
 		{Name: "DS_LICENSE", Value: "accept"},
-		{Name: "DSE_AUTO_CONF_OFF", Value: "all"},
-		{Name: "HCD_AUTO_CONF_OFF", Value: "all"},
 		{Name: "USE_MGMT_API", Value: "true"},
 		{Name: "MGMT_API_EXPLICIT_START", Value: "true"},
-		// TODO remove this post 1.0
-		{Name: "DSE_MGMT_EXPLICIT_START", Value: "true"},
 	}
 
-	if dc.Spec.ServerType == "dse" && dc.Spec.DseWorkloads != nil {
-		envDefaults = append(
-			envDefaults,
-			corev1.EnvVar{Name: "JVM_EXTRA_OPTS", Value: getJvmExtraOpts(dc)})
+	if dc.Spec.ServerType == "dse" {
+		envDefaults = append(envDefaults, corev1.EnvVar{Name: "DSE_AUTO_CONF_OFF", Value: "all"})
+		envDefaults = append(envDefaults, corev1.EnvVar{Name: "DSE_MGMT_EXPLICIT_START", Value: "true"})
+		if dc.Spec.DseWorkloads != nil {
+			envDefaults = append(
+				envDefaults,
+				corev1.EnvVar{Name: "JVM_EXTRA_OPTS", Value: getJvmExtraOpts(dc)})
+		}
+	}
+
+	if dc.Spec.ServerType == "hcd" {
+		envDefaults = append(envDefaults, corev1.EnvVar{Name: "HCD_AUTO_CONF_OFF", Value: "all"})
 	}
 
 	cassContainer.Env = combineEnvSlices(envDefaults, cassContainer.Env)

diff --git a/pkg/reconciliation/construct_podtemplatespec_test.go b/pkg/reconciliation/construct_podtemplatespec_test.go
@@ -428,8 +428,11 @@ func TestServerConfigInitContainerEnvVars(t *testing.T) {
 }
 
 func TestCassandraContainerEnvVars(t *testing.T) {
+	assert := assert.New(t)
 	podNameEnvVar := corev1.EnvVar{Name: "POD_NAME", ValueFrom: selectorFromFieldPath("metadata.name")}
 	nodeNameEnvVar := corev1.EnvVar{Name: "NODE_NAME", ValueFrom: selectorFromFieldPath("spec.nodeName")}
+	useMgmtApiEnvVar := corev1.EnvVar{Name: "USE_MGMT_API", Value: "true"}
+	explicitStartEnvVar := corev1.EnvVar{Name: "MGMT_API_EXPLICIT_START", Value: "true"}
 
 	templateSpec := &corev1.PodTemplateSpec{}
 	dc := &api.CassandraDatacenter{
@@ -446,13 +449,90 @@ func TestCassandraContainerEnvVars(t *testing.T) {
 
 	err := buildContainers(dc, templateSpec)
 	require.NoError(t, err)
-	assert.Equal(t, 2, len(templateSpec.Spec.Containers), "expected to find 2 containers, cassandra and server-system-logger")
+	assert.Equal(2, len(templateSpec.Spec.Containers), "expected to find 2 containers, cassandra and server-system-logger")
+
+	cassContainer := findContainer(templateSpec.Spec.Containers, CassandraContainerName)
+	assert.Equal(CassandraContainerName, cassContainer.Name)
+
+	assert.True(envVarsContains(cassContainer.Env, podNameEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, nodeNameEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, nodeNameEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, useMgmtApiEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, explicitStartEnvVar))
+}
+
+func TestHCDContainerEnvVars(t *testing.T) {
+	assert := assert.New(t)
+	podNameEnvVar := corev1.EnvVar{Name: "POD_NAME", ValueFrom: selectorFromFieldPath("metadata.name")}
+	nodeNameEnvVar := corev1.EnvVar{Name: "NODE_NAME", ValueFrom: selectorFromFieldPath("spec.nodeName")}
+	useMgmtApiEnvVar := corev1.EnvVar{Name: "USE_MGMT_API", Value: "true"}
+	explicitStartEnvVar := corev1.EnvVar{Name: "MGMT_API_EXPLICIT_START", Value: "true"}
+	hcdAutoConf := corev1.EnvVar{Name: "HCD_AUTO_CONF_OFF", Value: "all"}
+
+	templateSpec := &corev1.PodTemplateSpec{}
+	dc := &api.CassandraDatacenter{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "test",
+			Name:      "test",
+		},
+		Spec: api.CassandraDatacenterSpec{
+			ClusterName:   "test",
+			ServerType:    "hcd",
+			ServerVersion: "1.0.0",
+		},
+	}
+
+	err := buildContainers(dc, templateSpec)
+	require.NoError(t, err)
+	assert.Equal(2, len(templateSpec.Spec.Containers), "expected to find 2 containers, cassandra and server-system-logger")
 
 	cassContainer := findContainer(templateSpec.Spec.Containers, CassandraContainerName)
-	assert.Equal(t, CassandraContainerName, cassContainer.Name)
+	assert.Equal(CassandraContainerName, cassContainer.Name)
+
+	assert.True(envVarsContains(cassContainer.Env, podNameEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, nodeNameEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, nodeNameEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, useMgmtApiEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, explicitStartEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, hcdAutoConf))
+}
+
+func TestDSEContainerEnvVars(t *testing.T) {
+	assert := assert.New(t)
+	podNameEnvVar := corev1.EnvVar{Name: "POD_NAME", ValueFrom: selectorFromFieldPath("metadata.name")}
+	nodeNameEnvVar := corev1.EnvVar{Name: "NODE_NAME", ValueFrom: selectorFromFieldPath("spec.nodeName")}
+	useMgmtApiEnvVar := corev1.EnvVar{Name: "USE_MGMT_API", Value: "true"}
+	explicitStartEnvVar := corev1.EnvVar{Name: "MGMT_API_EXPLICIT_START", Value: "true"}
+	dseExplicitStartEnvVar := corev1.EnvVar{Name: "DSE_MGMT_EXPLICIT_START", Value: "true"}
+	dseAutoConf := corev1.EnvVar{Name: "DSE_AUTO_CONF_OFF", Value: "all"}
 
-	assert.True(t, envVarsContains(cassContainer.Env, podNameEnvVar))
-	assert.True(t, envVarsContains(cassContainer.Env, nodeNameEnvVar))
+	templateSpec := &corev1.PodTemplateSpec{}
+	dc := &api.CassandraDatacenter{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "test",
+			Name:      "test",
+		},
+		Spec: api.CassandraDatacenterSpec{
+			ClusterName:   "test",
+			ServerType:    "dse",
+			ServerVersion: "6.8.49",
+		},
+	}
+
+	err := buildContainers(dc, templateSpec)
+	require.NoError(t, err)
+	assert.Equal(2, len(templateSpec.Spec.Containers), "expected to find 2 containers, cassandra and server-system-logger")
+
+	cassContainer := findContainer(templateSpec.Spec.Containers, CassandraContainerName)
+	assert.Equal(CassandraContainerName, cassContainer.Name)
+
+	assert.True(envVarsContains(cassContainer.Env, podNameEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, nodeNameEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, nodeNameEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, useMgmtApiEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, explicitStartEnvVar))
+	assert.True(envVarsContains(cassContainer.Env, dseAutoConf))
+	assert.True(envVarsContains(cassContainer.Env, dseExplicitStartEnvVar))
 }
 
 func TestLoggerContainerEnvVars(t *testing.T) {