UNCLASSIFIED

Commit f078cc10 authored by Micah Nagel's avatar Micah Nagel 💰
Browse files

Merge branch 'mm-inst-5.32.1' into 'main'

Resolve "Update Mattermost Instance to 5.32.1"

Closes #3

See merge request !12
parents 8b86d865 3fbd58f5
Pipeline #196302 passed with stages
in 3 minutes and 7 seconds
...@@ -4,6 +4,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ...@@ -4,6 +4,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
--- ---
## [0.1.1-bb.0] - 2021-03-15
### Changed
- Bumped Mattermost image to 5.32.1
- Added a ENV to set S3 connection to insecure when using the built-in minio (due to an operator change)
## [0.1.0-bb.2] - 2021-02-26 ## [0.1.0-bb.2] - 2021-02-26
### Fixed ### Fixed
- Bumped Minio image version to the newest IB image to fix an issue - Bumped Minio image version to the newest IB image to fix an issue
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
apiVersion: v2 apiVersion: v2
name: mattermost name: mattermost
type: application type: application
version: "0.1.0-bb.2" version: "0.1.1-bb.0"
appVersion: "5.31.0" appVersion: "5.32.1"
description: "Deployment of mattermost" description: "Deployment of mattermost"
keywords: keywords:
- Mattermost - Mattermost
......
...@@ -24,7 +24,7 @@ spec: ...@@ -24,7 +24,7 @@ spec:
licenseSecret: "mattermost-license" licenseSecret: "mattermost-license"
{{- end }} {{- end }}
{{- if or .Values.mattermostEnvs .Values.sso.enabled }} {{- if or .Values.mattermostEnvs .Values.sso.enabled .Values.minio.install }}
mattermostEnv: mattermostEnv:
{{- range $k, $v := .Values.mattermostEnvs }} {{- range $k, $v := .Values.mattermostEnvs }}
- name: {{ $k }} - name: {{ $k }}
...@@ -44,6 +44,10 @@ spec: ...@@ -44,6 +44,10 @@ spec:
- name: MM_GITLABSETTINGS_USERAPIENDPOINT - name: MM_GITLABSETTINGS_USERAPIENDPOINT
value: "{{ .Values.sso.user_api_endpoint }}" value: "{{ .Values.sso.user_api_endpoint }}"
{{- end }} {{- end }}
{{- if .Values.minio.install }}
- name: MM_FILESETTINGS_AMAZONS3SSL
value: "false"
{{- end }}
{{- end }} {{- end }}
# Give MM enough time to keel over if needed # Give MM enough time to keel over if needed
......
...@@ -29,7 +29,7 @@ sso: ...@@ -29,7 +29,7 @@ sso:
# Repo and image tag # Repo and image tag
image: image:
name: registry.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost/mattermost name: registry.dso.mil/platform-one/big-bang/apps/collaboration-tools/mattermost/mattermost
tag: 5.31.0 tag: 5.32.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
global: global:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment