Merge remote-tracking branch 'ml/develop' into feature/CLD-554

Author: ilanRosenbaum

README.md

@@ -20,6 +20,7 @@ spec:
       {{- with .Values.affinity }}
       affinity: {{- toYaml . | nindent 8}}
       {{- end }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }}
       containers:
         - name: marklogic-server
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -60,6 +61,53 @@ spec:
             {{- if .Values.extraContainerPorts }}
               {{- toYaml .Values.extraContainerPorts | nindent 12 }}
             {{- end }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - bash
+                  - '-c'
+                  - |
+                    log () {
+                      local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
+                      echo "${TIMESTAMP} $@" > /proc/$pid/fd/1
+                    }
+
+                    pid=$(ps aux | grep -i '/bin/bas[h] /usr' | awk {'print $2'})
+                    log "Info: [prestop] Prestop Hook Execution"
+
+                    my_host=$(hostname -f)
+
+                    log "Info: [prestop] MarkLogic Pod Hostname: "$my_host
+
+                    for ((i = 0; i < 5; i = i + 1)); do
+                        res_code=$(curl --anyauth --user $MARKLOGIC_ADMIN_USERNAME:$MARKLOGIC_ADMIN_PASSWORD \
+                            -o /dev/null -m 10 -s -w %{http_code} \
+                            -i -X POST --data "state=shutdown&failover=true" \
+                            -H "Content-type: application/x-www-form-urlencoded" \
+                            http://localhost:8002/manage/v2/hosts/$my_host?format=json)
+
+                        if [[ ${res_code} -eq 202 ]]; then
+                            log "Info: [prestop] Host shut down response code: "$res_code
+
+                            while (true)
+                            do
+                               ml_status=$(service MarkLogic status)
+                               log "Info: [prestop] MarkLogic Status: "$ml_status
+                               if [[ "$ml_status" =~ "running" ]]; then
+                                  sleep 5s
+                                  continue
+                               else
+                                  break
+                               fi
+                            done
+                            break
+                        else
+                            log "ERROR: [prestop] Retry Attempt: "$i
+                            log "ERROR: [prestop] Host shut down expected response code 202, got "$res_code
+                            sleep 10s
+                        fi
+                    done
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
@@ -114,6 +162,9 @@ spec:
                 fieldRef:
                   fieldPath: metadata.name
         {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector: {{- toYaml . | nindent 8}}
+      {{- end }}
       dnsConfig:
         searches:
           - {{ include "marklogic.headlessURL" . }}

charts/templates/statefulset.yaml

@@ -3,6 +3,9 @@
 # Number of Marklogic nodes
 replicaCount: 1
 
+# Termination Grace Period
+terminationGracePeriod: 120
+
 # Marklogic image parameters
 image:
   repository: marklogic-centos/marklogic-server-centos
@@ -38,6 +41,10 @@ auth:
 # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
 affinity: {}
 
+# 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
+nodeSelector: {}
+
 # Configure persistence using persistent Volume Claim
 # ref: https://kubernetes.io/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims
 # The "" storageClass will use the default storage class for your cluster. (gp2 for EKS, standard for Minikube)

charts/values.yaml

@@ -1,6 +1,5 @@
 # Local Development Tutorial: Getting Started with MarkLogic in Kubernetes
 
-# Table of contents
 * [Introduction](#Introduction)
 * [Prerequisites](##Prerequisites)
 * [Procedure](#Procedure)
@@ -21,13 +20,12 @@ This tutorial describes how to set up local Kubernetes development environment w
 
 
 ## Prerequisites
-The following steps assume you are running this tutorial from a desktop environment. Mobile environments will likely experience problems and may not work.
-- [Docker](https://docs.docker.com/engine/install/): Subscribe to Docker Hub and pulldown the latest image from: https://hub.docker.com/_/marklogic
+The following steps assume you are running this tutorial from a desktop environment.
+- [Docker](https://docs.docker.com/engine/install/): Pull the latest MarkLogic Server image from: https://hub.docker.com/r/marklogicdb/marklogic-db
   ```sh
-  # Something similar to this, with the latest version tag, which can be found on the dockerhub link above
-  docker pull store/marklogicdb/marklogic-server:10.0-9-centos-1.0.0-ea4 
+  docker pull marklogicdb/marklogic-db:latest
   ```
-- [KubeCTL](https://kubernetes.io/docs/tasks/tools/):  Download and install this tool to assist with debugging in a Kubernetes environment. 
+- [Kubectl](https://kubernetes.io/docs/tasks/tools/):  Download and install this tool to assist with debugging in a Kubernetes environment.
 - [Helm](https://helm.sh/docs/intro/install/):  Clone or download the chart repository: https://github.com/marklogic/marklogic-kubernetes
 - [Minikube](https://k8s-docs.netlify.app/en/docs/tasks/tools/install-minikube/): Download the Minikube Kubernetes environment, which will host the MarkLogic Server applications.
 - Browser: The latest version of a supported web browser. See the list here: [Web Browser](https://developer.marklogic.com/products/support-matrix/) 
@@ -53,17 +51,14 @@ NAME       STATUS   ROLES                  AGE   VERSION
 minikube   Ready    control-plane,master   1d    v1.23.3
 ```
 
- To enable addons run the follow Minikube command for ingress:     
- `minikube addons enable ingress`  
 ##  Installing a Single MarkLogic Host to Minikube
-- Push the image used for MarkLogic Server to the VM:   
-`minikube image load store/marklogicdb/marklogic-server:10.0-9-centos-1.0.0-ea4`  
-  The image ID used in the example is `store/marklogicdb/marklogic-server:10.0-9-centos-1.0.0-ea4`, which may not be the latest image. To find the latest ID go to https://hub.docker.com/_/marklogic  
-- Add the helm repository
+- Push the image used for MarkLogic Server to the Minikube:
+`minikube image load marklogicdb/marklogic-db:latest`
+- Add the Helm repository
   `helm repo add marklogic https://marklogic.github.io/marklogic-kubernetes/`  
   Additionally create a `values.yaml` file for your installation, like the one found in the repository under `/charts`: https://marklogic.github.io/marklogic-kubernetes/. The `values.yaml` file controls configuration for MarkLogic Server running in kubernetes. 
-  Run `helm install RELEASE_NAME marklogic/marklogic --version=1.0.0-ea1 -f values.yaml` where the `RELEASE_NAME` can be any name you want to use to identify this deployment.    
-  For example: `helm install marklogic-local-dev-env marklogic/marklogic --version=1.0.0-ea1 -f values.yaml`
+  Run `helm install RELEASE_NAME marklogic/marklogic --version=1.0.0-ea1 --values values.yaml` where the `RELEASE_NAME` can be any name you want to use to identify this deployment.
+  For example: `helm install marklogic-local-dev-env marklogic/marklogic --version=1.0.0-ea1 --values values.yaml`
 ## Installing Multiple MarkLogic Hosts to Minikube
 To create a MarkLogic cluster in Minikube, change the `replicaCount` in the `values.yaml` file to 3, or any other odd number to avoid the [split brain problem](https://help.marklogic.com/Knowledgebase/Article/View/119/0/start-up-quorum-and-forest-level-failover). Then follow the procedure outlined in the [Installing a Single MarkLogic Host to Minikube](##Installing-a-Single-MarkLogic-Host-to-Minikube) section. 
 
@@ -112,7 +107,7 @@ Events:
   Type     Reason     Age   From               Message
   ----     ------     ----  ----               -------
   Normal   Scheduled  13m   default-scheduler  Successfully assigned default/marklogic-0 to minikube
-  Normal   Pulled     13m   kubelet            Container image "store/marklogicdb/marklogic-server:10.0-8.3-centos-1.0.0-ea3" already present on machine
+  Normal   Pulled     13m   kubelet            Container image "marklogicdb/marklogic-db:latest" already present on machine
   Normal   Created    13m   kubelet            Created container marklogic
   Normal   Started    13m   kubelet            Started container marklogic
   Warning  Unhealthy  13m   kubelet            Startup probe failed: ls: cannot access /var/opt/MarkLogic/ready: No such file or directory

docs/Local_Development_Tutorial.md

@@ -5,10 +5,10 @@ entries:
       category: Database
     apiVersion: v2
     appVersion: 10.0-9.1
-    created: "2022-05-17T09:57:32.858679-07:00"
+    created: "2022-07-27T11:08:21.005111-07:00"
     description: MarkLogic Server is a multi-model database that has both NoSQL and
       trusted enterprise data management capabilities.
-    digest: 9aa4ac1a4d76a12b2417095057922dac60634ef11d73745d2c393636614f5377
+    digest: 2d9588d42beaaef3267d1375b50ab5d972863c259ebb4d843c4b24c480467321
     keywords:
     - marklogic
     - database
@@ -21,4 +21,4 @@ entries:
     urls:
     - marklogic-1.0.0-ea1.tgz
     version: 1.0.0-ea1
-generated: "2022-05-17T09:57:32.855369-07:00"
+generated: "2022-07-27T11:08:21.002809-07:00"

index.yaml

@@ -4,7 +4,7 @@ echo "=====Installing minikube cluster"
 minikube start --driver=docker -n=1
 
 echo "=====Loading marklogc images to minikube cluster"
-minikube image load marklogic-centos/marklogic-server-centos:10-internal
+minikube image load marklogicdb/marklogic-db:latest
 
 echo "=====Running tests"
 go test -v -count=1 ./test/e2e/...

marklogic-1.0.0-ea1.tgz

@@ -15,9 +15,9 @@ import (
 )
 
 func TestHelmInstall(t *testing.T) {
-	// Path to the helm chart we will test 
+	// Path to the helm chart we will test
 	helmChartPath, e := filepath.Abs("../../charts")
-	if (e != nil) {
+	if e != nil {
 		t.Fatalf(e.Error())
 	}
 	namespaceName := "marklogic-" + strings.ToLower(random.UniqueId())
@@ -34,7 +34,7 @@ func TestHelmInstall(t *testing.T) {
 
 	t.Logf("====Creating namespace: " + namespaceName)
 	k8s.CreateNamespace(t, kubectlOptions, namespaceName)
-	
+
 	defer t.Logf("====Deleting namespace: " + namespaceName)
 	defer k8s.DeleteNamespace(t, kubectlOptions, namespaceName)