From 5b6a1837be564a50d7096bf420c01becda7730d4 Mon Sep 17 00:00:00 2001
From: Micah Nagel <micah.nagel@parsons.com>
Date: Mon, 3 May 2021 16:32:19 +0000
Subject: [PATCH] Add MM Elastic Integration
---
.../mattermost/mattermost/mattermost-helmrelease.yaml | 5 +++++
chart/templates/mattermost/mattermost/values.yaml | 5 +++++
chart/values.yaml | 9 ++++++++-
tests/ci/k3d/values.yaml | 2 ++
4 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml b/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
index 0bbaa2d5f8..2153fd4d3c 100644
--- a/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
+++ b/chart/templates/mattermost/mattermost/mattermost-helmrelease.yaml
@@ -63,4 +63,9 @@ spec:
namespace: {{ $.Release.Namespace }}
{{- end }}
{{- end }}
+
+ {{- if and .Values.addons.mattermost.elasticsearch.enabled .Values.logging.enabled }}
+ - name: ek
+ namespace: {{ $.Release.Namespace }}
+ {{- end }}
{{- end }}
diff --git a/chart/templates/mattermost/mattermost/values.yaml b/chart/templates/mattermost/mattermost/values.yaml
index c4c103e140..1a7a4eb2a9 100644
--- a/chart/templates/mattermost/mattermost/values.yaml
+++ b/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 -}}
diff --git a/chart/values.yaml b/chart/values.yaml
index b40277aaf1..b3d8552a4b 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -609,7 +609,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:
@@ -681,6 +681,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: {}
diff --git a/tests/ci/k3d/values.yaml b/tests/ci/k3d/values.yaml
index 9ea515e36b..8e8f9a55f6 100644
--- a/tests/ci/k3d/values.yaml
+++ b/tests/ci/k3d/values.yaml
@@ -340,6 +340,8 @@ addons:
mattermost:
enabled: false
+ elasticsearch:
+ enabled: true
values:
replicaCount: 1
resources:
--
GitLab