Merge remote-tracking branch 'origin/develop' into feature/CLD-706

Author: Barkha Choithani

README.md

@@ -158,7 +158,7 @@ helm repo update
 Use this command to install MarkLogic Chart to the current namespace with default settings:
 
 ```
-helm install my-release marklogic/marklogic --version=1.0.0-ea1
+helm install my-release marklogic/marklogic --version=1.0.0-ea2
 ```
 
 After you install MarkLogic Chart, the output will look like this:
@@ -171,12 +171,12 @@ STATUS: deployed
 REVISION: 1
 ```
 
-**Note:** --version=1.0.0-ea1 must be provided as part of the name. You can choose a distinctive release name to replace "my-release".
+**Note:** --version=1.0.0-ea2 must be provided as part of the name. You can choose a distinctive release name to replace "my-release".
 
 We strongly recommend that you deploy MarkLogic Chart in an exclusive namespace. Use the `--create-namespace` flag if the namespace has not already been created:
 
 ```
-helm install my-release marklogic/marklogic --version=1.0.0-ea1 --namespace=marklogic --create-namespace
+helm install my-release marklogic/marklogic --version=1.0.0-ea2 --namespace=marklogic --create-namespace
 ```
 
 Use this command to verify the deployment:
@@ -198,7 +198,7 @@ The `--values` flag points to a YAML file. The values in the file will override
 Use this command to view the default configurable values:
 
 ```
-helm show values marklogic/marklogic --version=1.0.0-ea1
+helm show values marklogic/marklogic --version=1.0.0-ea2
 ```
 
 To configure a different value for your installation, create a `values.yaml` file.
@@ -215,15 +215,15 @@ imagePullSecret:
 Use the following command to install MarkLogic with the `values.yaml` file you just created.
 
 ```
-helm install my-release marklogic/marklogic --version=1.0.0-ea1 --values values.yaml
+helm install my-release marklogic/marklogic --version=1.0.0-ea2 --values values.yaml
 ```
 
 ### --set
 
 Use the `--set` flag to make one or more configuration changes directly:
 
 ```
-helm install my-release marklogic/marklogic --version=1.0.0-ea1 \
+helm install my-release marklogic/marklogic --version=1.0.0-ea2 \
 --set imagePullSecret.registry="https://index.docker.io/v1/" \
 --set imagePullSecret.username=YOUR_USERNAME \
 --set imagePullSecret.password=YOUR_PASSWORD

charts/templates/configmap.yaml

@@ -9,7 +9,7 @@ data:
 {{- if ne .Values.bootstrapHostName "" }}
   MARKLOGIC_BOOTSTRAP_HOST: {{ .Values.bootstrapHostName }}
 {{- else }}
-  MARKLOGIC_BOOTSTRAP_HOST: {{ include "marklogic.fullname" . }}-0
+  MARKLOGIC_BOOTSTRAP_HOST: {{ include "marklogic.fqdn" . }}
 {{- end }}
   MARKLOGIC_FQDN_SUFFIX: {{ include "marklogic.headlessURL" . }}
   MARKLOGIC_INIT: "true"

charts/templates/statefulset.yaml

@@ -272,9 +272,6 @@ spec:
       {{- with .Values.nodeSelector }}
       nodeSelector: {{- toYaml . | nindent 8}}
       {{- end }}
-      dnsConfig:
-        searches:
-          - {{ include "marklogic.headlessURL" . }}
       {{- if .Values.imagePullSecret }}
       imagePullSecrets:
         - name: {{ include "marklogic.fullname" . }}-registry

charts/values.yaml

@@ -25,7 +25,7 @@ bootstrapHostName: ""
 # Marklogic image parameters
 image:
   repository: marklogicdb/marklogic-db
-  tag: latest
+  tag: 10.0-9.5-centos-1.0.0
   pullPolicy: IfNotPresent
 
 # Init container image parameters
@@ -61,7 +61,19 @@ auth:
 
 # Configure Affinity property for scheduling pods to nodes
 # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
-affinity: {}
+# Preferred anti affinity rule to schedule one marklogic pod per worker node
+affinity: 
+  podAntiAffinity:
+    preferredDuringSchedulingIgnoredDuringExecution:
+    - weight: 100
+      podAffinityTerm:
+        labelSelector:
+          matchExpressions:
+          - key: app.kubernetes.io/name
+            operator: In
+            values:
+            - marklogic
+        topologyKey: kubernetes.io/hostname
 
 # Configure NodeSelector property for scheduling pods to nodes
 # ref: https://kubernetes.io/docs/tasks/configure-pod-container/assign-pods-nodes/#create-a-pod-that-gets-scheduled-to-your-chosen-node

index.yaml

@@ -5,10 +5,10 @@ entries:
       category: Database
     apiVersion: v2
     appVersion: 10.0-9.5
-    created: "2022-12-05T12:37:45.098819-08:00"
+    created: "2022-12-12T13:30:47.74871-08:00"
     description: MarkLogic Server is a multi-model database that has both NoSQL and
       trusted enterprise data management capabilities.
-    digest: 431d46bbed02be9b6224ec7b7a39fdcc9e1abffbb3656126cbc73a460240e122
+    digest: 9a2c957bbe8032a7e6a2967fc83d23c243a5552312f33a9bb4d9f0580c4614e3
     keywords:
     - marklogic
     - database
@@ -25,7 +25,7 @@ entries:
       category: Database
     apiVersion: v2
     appVersion: 10.0-9.1
-    created: "2022-12-05T12:37:45.09751-08:00"
+    created: "2022-12-12T13:30:47.747045-08:00"
     description: MarkLogic Server is a multi-model database that has both NoSQL and
       trusted enterprise data management capabilities.
     digest: 2d9588d42beaaef3267d1375b50ab5d972863c259ebb4d843c4b24c480467321
@@ -41,4 +41,4 @@ entries:
     urls:
     - marklogic-1.0.0-ea1.tgz
     version: 1.0.0-ea1
-generated: "2022-12-05T12:37:45.094373-08:00"
+generated: "2022-12-12T13:30:47.742091-08:00"

marklogic-1.0.0-ea2.tgz

@@ -0,0 +1,60 @@
+package template_test
+
+import (
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	appsv1 "k8s.io/api/apps/v1"
+
+	"github.com/gruntwork-io/terratest/modules/helm"
+	"github.com/gruntwork-io/terratest/modules/k8s"
+	"github.com/gruntwork-io/terratest/modules/random"
+)
+
+func TestChartTemplatePodAntiAffinityClass(t *testing.T) {
+	t.Parallel()
+
+	// Path to the helm chart we will test
+	helmChartPath, err := filepath.Abs("../../charts")
+	releaseName := "marklogic-pod-antiaffinity-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",
+		},
+		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
+	}
+
+	// render the tempate
+	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/statefulset.yaml"})
+
+	var statefulset appsv1.StatefulSet
+	helm.UnmarshalK8SYaml(t, output, &statefulset)
+
+	// Verify the name and namespace matches
+	require.Equal(t, namespaceName, statefulset.Namespace)
+
+	// Verify the pod anti affinity rule is set
+	expectedLabelSelectorKey := "app.kubernetes.io/name"
+	expectedLabelSelectorValue := "marklogic"
+	expectedTopologyKey := "kubernetes.io/hostname"
+	statefulSetAffinityRule := statefulset.Spec.Template.Spec.Affinity.PodAntiAffinity
+	affinityPreferredRule := statefulSetAffinityRule.PreferredDuringSchedulingIgnoredDuringExecution
+	actualLabelSelectorKey := affinityPreferredRule[0].PodAffinityTerm.LabelSelector.MatchExpressions[0].Key
+	actualLabelSelectorValue := affinityPreferredRule[0].PodAffinityTerm.LabelSelector.MatchExpressions[0].Values[0]
+	actualTopologyKey := affinityPreferredRule[0].PodAffinityTerm.TopologyKey
+	require.Equal(t, actualLabelSelectorKey, expectedLabelSelectorKey)
+	require.Equal(t, actualLabelSelectorValue, expectedLabelSelectorValue)
+	require.Equal(t, actualTopologyKey, expectedTopologyKey)
+}