Merge branch 'mm-elastic' into 'master'

Add MM Elastic Integration

See merge request platform-one/big-bang/bigbang!446

chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml

@@ -66,4 +66,9 @@ spec:
       namespace: {{ $.Release.Namespace }}
     {{- end }}
     {{- end }}
+
+    {{- if and .Values.addons.mattermost.elasticsearch.enabled .Values.logging.enabled }}
+    - name: ek
+      namespace: {{ $.Release.Namespace }}
+    {{- end }}
 {{- end }}

chart/templates/mattermost/mattermost/values.yaml

@@ -60,4 +60,9 @@ minio:
     - name: private-registry
 {{- end }}
 {{- end }}
+
+{{- if .Values.addons.mattermost.elasticsearch.enabled }}
+elasticsearch:
+  enabled: true
+{{- end }}
 {{- end -}}

chart/values.yaml

@@ -668,7 +668,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost.git
       path: "./chart"
-      tag: "0.1.3-bb.2"
+      tag: "0.1.4-bb.0"
 
     # -- Mattermost Enterprise functionality.
     enterprise:
@@ -740,6 +740,13 @@ addons:
       # -- Bucket name to use for Mattermost - will be auto-created.
       bucket: ""
 
+    # -- Mattermost Elasticsearch integration - requires enterprise E20 license - https://docs.mattermost.com/deployment/elasticsearch.html
+    # Connection info defaults to the BB deployed Elastic, all values can be overridden via the "values" passthrough for other connections.
+    # See values spec in MM chart "elasticsearch" yaml block - https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost/-/blob/main/chart/values.yaml
+    elasticsearch:
+      # -- Toggle interaction with Elastic for optimized search indexing
+      enabled: false
+
     # -- Values to passthrough to the Mattermost chart: https://repo1.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost/-/blob/main/chart/values.yaml
     values: {}
 

tests/ci/k3d/values.yaml

@@ -340,6 +340,8 @@ addons:
 
   mattermost:
     enabled: false
+    elasticsearch:
+      enabled: true
     values:
       replicaCount: 1
       resources: