Update tests to work with new changes and add new template test to validate the addition of a second container in each pod.

Author: ilanRosenbaum

test/e2e/clustering_test.go

@@ -37,6 +37,7 @@ func TestClusterJoin(t *testing.T) {
 			"image.tag":           "10-internal",
 			"auth.adminUsername":  username,
 			"auth.adminPassword":  password,
+			"logging.enabled":    "false",
 		},
 	}
 

test/e2e/install_test.go

@@ -29,6 +29,7 @@ func TestHelmInstall(t *testing.T) {
 			"replicaCount":        "1",
 			"image.repository":    "marklogic-centos/marklogic-server-centos",
 			"image.tag":           "10-internal",
+			"logging.enabled":    "false",
 		},
 	}
 

test/e2e/upgrade_test.go

@@ -29,6 +29,7 @@ func TestHelmUpgrade(t *testing.T) {
 			"replicaCount":        "1",
 			"image.repository":    "marklogic-centos/marklogic-server-centos",
 			"image.tag":           "10-internal",
+			"logging.enabled":    "false",
 		},
 	}
 
@@ -48,6 +49,7 @@ func TestHelmUpgrade(t *testing.T) {
 			"replicaCount":        "2",
 			"image.repository":    "marklogic-centos/marklogic-server-centos",
 			"image.tag":           "10-internal",
+			"logging.enabled":    "false",
 		},
 	}
 

test/template/template_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/gruntwork-io/terratest/modules/random"
 )
 
-func TestChartTemplate(t *testing.T) {
+func TestChartTemplateNoLogging(t *testing.T) {
 	t.Parallel()
 
 	// Path to the helm chart we will test
@@ -29,9 +29,10 @@ func TestChartTemplate(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":    "store/marklogicdb/marklogic-server",
-			"image.tag":           "tag: 10.0-8.3-centos-1.0.0-ea3-test",
+			"image.repository":    "marklogicdb/marklogic-db",
+			"image.tag":           "latest",
 			"persistence.enabled": "false",
+			"logging.enabled":    "false",
 		},
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
@@ -47,8 +48,52 @@ func TestChartTemplate(t *testing.T) {
 	require.Equal(t, namespaceName, statefulset.Namespace)
 
 	// Verify the image matches
-	expectedImage := "store/marklogicdb/marklogic-server:tag: 10.0-8.3-centos-1.0.0-ea3-test"
+	expectedImage := "marklogicdb/marklogic-db:latest"
 	statefulSetContainers := statefulset.Spec.Template.Spec.Containers
 	require.Equal(t, len(statefulSetContainers), 1)
 	require.Equal(t, statefulSetContainers[0].Image, expectedImage)
 }
+
+func TestChartTemplateLogging(t *testing.T) {
+	t.Parallel()
+
+	// Path to the helm chart we will test
+	helmChartPath, err := filepath.Abs("../../charts")
+	releaseName := "marklogic-test"
+	t.Log(helmChartPath, releaseName)
+	require.NoError(t, err)
+
+	// Set up the namespace; confirm that the template renders the expected value for the namespace.
+	namespaceName := "marklogic-" + strings.ToLower(random.UniqueId())
+	t.Logf("Namespace: %s\n", namespaceName)
+
+	// Setup the args for helm install
+	options := &helm.Options{
+		SetValues: map[string]string{
+			"image.repository":    "marklogicdb/marklogic-db",
+			"image.tag":           "latest",
+			"persistence.enabled": "false",
+			"logging.enabled":    "true",
+		},
+		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
+	}
+
+	// render the tempate
+	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/statefulset.yaml"})
+
+	var statefulset appsv1.Deployment
+	helm.UnmarshalK8SYaml(t, output, &statefulset)
+	// t.Log(statefulset)
+
+	// Verify the name and namespace matches
+	require.Equal(t, namespaceName, statefulset.Namespace)
+
+	// Verify the image matches
+	expectedImage1 := "marklogicdb/marklogic-db:latest"
+	expectedImage2 := "fluent/fluent-bit:1.9.7"
+
+	statefulSetContainers := statefulset.Spec.Template.Spec.Containers
+	require.Equal(t, len(statefulSetContainers), 2)
+	require.Equal(t, statefulSetContainers[0].Image, expectedImage1)
+	require.Equal(t, statefulSetContainers[1].Image, expectedImage2)
+}