Merge pull request #158 from marklogic/release/1.0.2

Merge release/1.0.2 to develop

Author: pengzhouml

README.md

@@ -72,7 +72,7 @@ persistence:
 ```
 5. Install the MarkLogic Helm Chart with the above custom settings. The rest of the settings will default to the values as listed below in the [Parameters](#parameters) section.
 ```
-helm install my-release marklogic/marklogic --version=1.0.0 --values values.yaml --namespace=marklogic
+helm install my-release marklogic/marklogic --values values.yaml --namespace=marklogic
 ```
 Once the installation is complete and the pod is in a running state, the MarkLogic admin UI can be accessed using the port-forwarding command as below:
 ```
@@ -128,6 +128,7 @@ Following table lists all the parameters supported by the latest MarkLogic Helm
 | `license.key`                                       | Set MarkLogic license key installed                                                                                                                                                    | `""`                       |
 | `license.licensee`                                  | Set MarkLogic licensee information                                                                                                                                                     | `""`                       |
 | `affinity`                                          | Affinity for MarkLogic pods assignment                                                                                                                                                 | `{}`                       |
+| `topologySpreadConstraints`                         | POD Topology Spread Constraints to spread Pods across cluster                                                                                                                                                    | `[]`                       |
 | `nodeSelector`                                      | Node labels for MarkLogic pods assignment                                                                                                                                              | `{}`                       |
 | `persistence.enabled`                               | Parameter to enable MarkLogic data persistence using Persistence Volume Claim (PVC). If set to false, EmptyDir will be used.                                                           | `true`                     |
 | `persistence.storageClass`                          | Storage class for MarkLogic data volume, leave empty to use the default storage class                                                                                                  | `""`                       |

charts/Chart.yaml

@@ -17,4 +17,4 @@ keywords:
 sources:
   - https://github.com/marklogic/marklogic-kubernetes
   - https://www.marklogic.com/
-version: 1.0.0
+version: 1.0.1

charts/templates/statefulset.yaml

@@ -25,6 +25,9 @@ spec:
       {{- with .Values.affinity }}
       affinity: {{- toYaml . | nindent 8}}
       {{- end }}
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints: {{- toYaml . | nindent 6}}
+      {{- end }}
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }}
       {{- if ne .Values.bootstrapHostName "" }}
       initContainers: 

charts/values.yaml

@@ -93,6 +93,16 @@ affinity:
             - marklogic
         topologyKey: kubernetes.io/hostname
 
+## Configure POD Topology Spread Constraints to spread Pods across cluster
+## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/
+topologySpreadConstraints: []
+  # - maxSkew: 1
+  #   topologyKey: topology.kubernetes.io/zone
+  #   whenUnsatisfiable: ScheduleAnyway
+  #   labelSelector:
+  #     matchLabels:
+  #       app.kubernetes.io/name: marklogic
+
 ## 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: {}