Merge branch 'develop' into feature/CLD-568

Author: pengzhouml

README.md

@@ -294,6 +294,23 @@ kubectl logs pod/terminated-host-pod-name
 ```
 
 If you are permanently removing the host from the MarkLogic cluster, once the pod is terminated, follow standard MarkLogic administrative procedures using the administrative UI or APIs to remove the MarkLogic host from the cluster. Also, because Kubernetes keeps the Persistent Volume Claims and Persistent Volumes around until they are explicitly deleted, you must manually delete them using the Kubernetes APIs before attempting to scale the hosts in the StatefulSet back up again.
+
+## Deploying a MarkLogic Cluster with Multiple Groups
+
+To deploy a MarkLogic cluster with multiple groups (separate E and D nodes for example) the `bootstrapHostName` and `group.name` must be configured in values.yaml or set the values provided for these configurations using the `--set` flag while installing helm charts.
+For example, if you want to create a MarkLogic cluster with three nodes in a "dnode" group and two nodes in an "enode" group, start with the following helm command:
+
+```
+helm install dnode-group ./charts/ --set group.name=dnode --set replicaCount=3
+```
+Once this deployment is complete, a MarkLogic cluster with three hosts should be running.
+To add the "enode" group and nodes to the cluster, the `bootstrapHostName` must be set to join the existing MarkLogic cluster. The first host in the other group can be used. For this example, set `bootstrapHostName` to `dnode-group-marklogic-0.dnode-group-marklogic-headless.default.svc.cluster.local` with the following command:
+
+```
+helm install enode-group ./charts/ --set group.name=enode --set replicaCount=2 --set bootstrapHostName=dnode-group-marklogic-0.dnode-group-marklogic-headless.default.svc.cluster.local
+```
+Once this deployment is complete, there will be a new "enode" group with two hosts in the MarkLogic cluster.
+
 # Access the MarkLogic Server
 
 ## Service

charts/values.yaml

@@ -136,7 +136,7 @@ startupProbe:
 # Log collection will collect all logs for each file type enabled, parse them, 
 # And export them to a logging backend specified in the outputs section below
 logCollection:
-  enabled: true
+  enabled: false
   image: fluent/fluent-bit:1.9.7
   resources:
     requests:

test/e2e/install_test.go

@@ -3,6 +3,8 @@ package e2e
 import (
 	"crypto/tls"
 	"fmt"
+	"io/ioutil"
+	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
@@ -14,6 +16,7 @@ import (
 	"github.com/gruntwork-io/terratest/modules/k8s"
 	"github.com/gruntwork-io/terratest/modules/random"
 	"github.com/stretchr/testify/assert"
+	"github.com/tidwall/gjson"
 	digestAuth "github.com/xinsnake/go-http-digest-auth-client"
 )
 
@@ -25,6 +28,11 @@ func TestHelmInstall(t *testing.T) {
 	}
 	imageRepo, repoPres := os.LookupEnv("dockerRepository")
 	imageTag, tagPres := os.LookupEnv("dockerVersion")
+	username := "admin"
+	password := "admin"
+	var resp *http.Response
+	var body []byte
+	var err error
 
 	if !repoPres {
 		imageRepo = "marklogic-centos/marklogic-server-centos"
@@ -42,9 +50,11 @@ func TestHelmInstall(t *testing.T) {
 		KubectlOptions: kubectlOptions,
 		SetValues: map[string]string{
 			"persistence.enabled":   "false",
-			"replicaCount":          "1",
+			"replicaCount":          "2",
 			"image.repository":      imageRepo,
 			"image.tag":             imageTag,
+			"auth.adminUsername":    username,
+			"auth.adminPassword":    password,
 			"logCollection.enabled": "false",
 		},
 	}
@@ -103,4 +113,21 @@ func TestHelmInstall(t *testing.T) {
 	// the generated password should be able to access the manage endpoint
 	assert.Equal(t, 200, response.StatusCode)
 
+	// Verify no groups beyond enode were created/modified
+	groupStatusEndpoint := fmt.Sprintf("http://%s/manage/v2/groups?format=json", tunnel8002.Endpoint())
+	groupStatus := digestAuth.NewRequest(username, password, "GET", groupStatusEndpoint, "")
+	t.Logf(`groupStatusEndpoint: %s`, groupStatusEndpoint)
+	if resp, err = groupStatus.Execute(); err != nil {
+		t.Fatalf(err.Error())
+	}
+	if body, err = ioutil.ReadAll(resp.Body); err != nil {
+		t.Fatalf(err.Error())
+	}
+	groupQuantityJSON := gjson.Get(string(body), "group-default-list.list-items.list-count.value")
+
+	if groupQuantityJSON.Num != 1 {
+		t.Errorf("Only one group should exist, instead %v groups exist", groupQuantityJSON.Num)
+	}
+
+	t.Logf("Groups status response:\n" + string(body))
 }