Skip to content

Commit adbde38

Browse files
sumanthravipatiSumanth Ravipati
andauthored
CLD 545: EA1 Documentation fixes (#16)
* CLD-545: EA1 document changes commit * CLD-545: EA1 document changes commit * CLD-545: Spell Check Correction Co-authored-by: Sumanth Ravipati <[email protected]>
1 parent 355aa1c commit adbde38

File tree

2 files changed

+22
-23
lines changed

2 files changed

+22
-23
lines changed

README.md

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# MarkLogic Kubernetes Helm Chart
22

3-
- [MarkLogic Kubernetes Helm Chart](#marklogic-kubernetes-helm-chart)
43
- [Introduction](#introduction)
54
- [Prerequisites](#prerequisites)
65
- [Set up the required tools](#set-up-the-required-tools)
@@ -12,8 +11,8 @@
1211
- [Install eksctl](#install-eksctl)
1312
- [Using eksctl to provision Kubernetes cluster on EKS](#using-eksctl-to-provision-kubernetes-cluster-on-eks)
1413
- [Suggestions for Naming](#suggestions-for-naming)
15-
- [Install Marklogic Helm Chart](#install-marklogic-helm-chart)
16-
- [Add Marklogic Repo](#add-marklogic-repo)
14+
- [Install MarkLogic Helm Chart](#install-marklogic-helm-chart)
15+
- [Add MarkLogic Repo](#add-marklogic-repo)
1716
- [Installing the Chart](#installing-the-chart)
1817
- [Configuration Options](#configuration-options)
1918
- [--values](#--values)
@@ -31,9 +30,13 @@
3130

3231
# Introduction
3332

34-
MarkLogic Server is a multi-model database that has both NoSQL and trusted enterprise data management capabilities. It is the most secure multi-model database.
35-
36-
This custom Helm Chart deploys MarkLogic Server on Kubernetes using Helm.
33+
This tutorial describes how to set up Kubernetes development environment with AWS EKS and MarkLogic Server. It covers these tasks:
34+
- Set up the prerequisites necessary for setting up MarkLogic Server in Kubernetes
35+
- How to setup Kubernetes cluster and install MarkLogic Server on Minikube
36+
- How to setup Kubernetes cluster and install MarkLogic Server on AWS EKS using eksctl
37+
- Access the MarkLogic Server cluster
38+
- How to clean up your environment
39+
- List of parameters used for configuration
3740

3841
# Prerequisites
3942

@@ -106,11 +109,11 @@ eksctl create cluster \
106109
* KUBERNETES_VERSION: For now, we only support the latest version of Kubernetes in EKS, which is 1.21.
107110
* NODEGROUP_NAME: Choose a distinctive node group name.
108111
* NODE_TYPE: The recommendation from our performance team is to use the r5.large node type for development purposes.
109-
* NUMBER_OF_NODES: Total number of nodes running not only Marklogic database, but also nodes running other applications.
112+
* NUMBER_OF_NODES: Total number of nodes running not only MarkLogic database, but also nodes running other applications.
110113

111-
# Install Marklogic Helm Chart
114+
# Install MarkLogic Helm Chart
112115

113-
## Add Marklogic Repo
116+
## Add MarkLogic Repo
114117

115118
If you haven’t already, add the MarkLogic official repo to Helm using this command:
116119

@@ -297,7 +300,7 @@ To use transactional functionality with MarkLogic, you have to set up Ingress an
297300
Use this Helm command to uninstall the chart:
298301

299302
```
300-
helm delete my-release
303+
helm uninstall my-release
301304
```
302305

303306
The output will look like this:
@@ -329,6 +332,7 @@ This table describes the list of available parameters for Helm Chart.
329332
| `resources.limits` | The resource limits for MarkLogic container | `{}` |
330333
| `resources.requests` | The resource requests for MarkLogic container | `{}` |
331334
| `nameOverride` | String to override the app name | `""` |
335+
| `fullnameOverride` | String to completely replace the generated name | `""` |
332336
| `auth.adminUsername` | Username for default MarkLogic Administrator | `admin` |
333337
| `auth.adminPassword` | Password for default MarkLogic Administrator | `admin` |
334338
| `affinity` | Affinity property for pod assignment | `{}` |

docs/Local_Development_Tutorial.md

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Local Development Tutorial: Getting Started with MarkLogic in Kubernetes
22

3-
# Table of contents
43
* [Introduction](#Introduction)
54
* [Prerequisites](##Prerequisites)
65
* [Procedure](#Procedure)
@@ -21,13 +20,12 @@ This tutorial describes how to set up local Kubernetes development environment w
2120

2221

2322
## Prerequisites
24-
The following steps assume you are running this tutorial from a desktop environment. Mobile environments will likely experience problems and may not work.
25-
- [Docker](https://docs.docker.com/engine/install/): Subscribe to Docker Hub and pulldown the latest image from: https://hub.docker.com/_/marklogic
23+
The following steps assume you are running this tutorial from a desktop environment.
24+
- [Docker](https://docs.docker.com/engine/install/): Pull the latest MarkLogic Server image from: https://hub.docker.com/r/marklogicdb/marklogic-db
2625
```sh
27-
# Something similar to this, with the latest version tag, which can be found on the dockerhub link above
28-
docker pull store/marklogicdb/marklogic-server:10.0-9-centos-1.0.0-ea4
26+
docker pull marklogicdb/marklogic-db:latest
2927
```
30-
- [KubeCTL](https://kubernetes.io/docs/tasks/tools/): Download and install this tool to assist with debugging in a Kubernetes environment.
28+
- [Kubectl](https://kubernetes.io/docs/tasks/tools/): Download and install this tool to assist with debugging in a Kubernetes environment.
3129
- [Helm](https://helm.sh/docs/intro/install/): Clone or download the chart repository: https://github.com/marklogic/marklogic-kubernetes
3230
- [Minikube](https://k8s-docs.netlify.app/en/docs/tasks/tools/install-minikube/): Download the Minikube Kubernetes environment, which will host the MarkLogic Server applications.
3331
- 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
5351
minikube Ready control-plane,master 1d v1.23.3
5452
```
5553

56-
To enable addons run the follow Minikube command for ingress:
57-
`minikube addons enable ingress`
5854
## Installing a Single MarkLogic Host to Minikube
59-
- Push the image used for MarkLogic Server to the VM:
60-
`minikube image load store/marklogicdb/marklogic-server:10.0-9-centos-1.0.0-ea4`
61-
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
55+
- Push the image used for MarkLogic Server to the Minikube:
56+
`minikube image load marklogicdb/marklogic-db:latest`
6257
- Add the helm repository
6358
`helm repo add marklogic https://marklogic.github.io/marklogic-kubernetes/`
6459
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.
65-
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.
66-
For example: `helm install marklogic-local-dev-env marklogic/marklogic --version=1.0.0-ea1 -f values.yaml`
60+
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.
61+
For example: `helm install marklogic-local-dev-env marklogic/marklogic --version=1.0.0-ea1 --values values.yaml`
6762
## Installing Multiple MarkLogic Hosts to Minikube
6863
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.
6964

0 commit comments

Comments
 (0)