Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: re-enable mattermost in rke2 bundle too & update to 9.11.1 #202

Merged
merged 1 commit into from
Sep 27, 2024
Merged

fix: re-enable mattermost in rke2 bundle too & update to 9.11.1 #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/eksd/uds-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ packages:
# Mattermost
- name: mattermost
repository: ghcr.io/defenseunicorns/packages/uds/mattermost
ref: 9.7.2-uds.0-registry1
ref: 9.11.1-uds.0-registry1
overrides:
mattermost:
mattermost-enterprise-edition:
Expand Down
116 changes: 59 additions & 57 deletions bundles/rke2/uds-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,63 +637,65 @@ packages:
jvm:
maxHeap: "6g"

# # Mattermost
# - name: mattermost
# repository: ghcr.io/defenseunicorns/packages/uds/mattermost
# ref: 9.7.2-uds.0-registry1
# overrides:
# mattermost:
# mattermost-enterprise-edition:
# variables:
# - name: VOLUMES
# path: "mattermostApp.extraVolumes"
# description: "Used to mount ca certs"
# - name: VOLUME_MOUNTS
# path: "mattermostApp.extraVolumeMounts"
# description: "Used to mount ca certs"
# uds-mattermost-config:
# variables:
# - name: OBJECT_STORE_SECURE
# path: "objectStorage.secure"
# description: "Object storage ssl"
# default: "false"
# - name: OBJECT_STORE_ENDPOINT
# path: "objectStorage.endpoint"
# description: "Object storage endpoint"
# - name: OBJECT_STORE_BUCKET
# path: "objectStorage.bucket"
# description: "Object storage bucket"
# default: "mattermost-bucket"
# - name: OBJECT_STORE_REGION
# path: "objectStorage.region"
# description: "Object storage region"
# default: "us-east-1"
# - name: DB_ENDPOINT
# path: "postgres.host"
# description: "Postgres DB endpoint"
# - name: DB_USERNAME
# path: "postgres.username"
# description: "Postgres DB username"
# default: "postgres"
# - name: DB_NAME
# path: "postgres.dbName"
# description: "Postgres DB database name"
# default: "mattermostdb"
# - name: DB_OPTIONS
# path: "postgres.connectionOptions"
# description: "Postgres DB connection options"
# default: "?connect_timeout=10"
# # 1-2k users
# - name: MATTERMOST_RESOURCE_CONFIG
# path: mattermostApp.resources
# description: "Mattermost Resource Config"
# default:
# requests:
# cpu: 100m
# memory: 256Mi
# limits:
# cpu: 2
# memory: 4Gi
# Mattermost
- name: mattermost
repository: ghcr.io/defenseunicorns/packages/uds/mattermost
ref: 9.11.1-uds.0-registry1
overrides:
mattermost:
mattermost-enterprise-edition:
values:
- path: mattermostApp.extraVolumes
value: *extra-volumes
- path: mattermostApp.extraVolumeMounts
value:
- name: trust-bundle
mountPath: /etc/ssl/certs/ca.crt
subPath: "ca-bundle.crt"
readOnly: true
uds-mattermost-config:
variables:
- name: OBJECT_STORE_SECURE
path: "objectStorage.secure"
description: "Object storage ssl"
default: "false"
- name: OBJECT_STORE_ENDPOINT
path: "objectStorage.endpoint"
description: "Object storage endpoint"
- name: OBJECT_STORE_BUCKET
path: "objectStorage.bucket"
description: "Object storage bucket"
default: "mattermost-bucket"
- name: OBJECT_STORE_REGION
path: "objectStorage.region"
description: "Object storage region"
default: "us-east-1"
- name: DB_ENDPOINT
path: "postgres.host"
description: "Postgres DB endpoint"
- name: DB_USERNAME
path: "postgres.username"
description: "Postgres DB username"
default: "postgres"
- name: DB_NAME
path: "postgres.dbName"
description: "Postgres DB database name"
default: "mattermostdb"
- name: DB_OPTIONS
path: "postgres.connectionOptions"
description: "Postgres DB connection options"
default: "?connect_timeout=10"
# 1-2k users
- name: MATTERMOST_RESOURCE_CONFIG
path: mattermostApp.resources
description: "Mattermost Resource Config"
default:
requests:
cpu: 100m
memory: 256Mi
limits:
cpu: 2
memory: 4Gi

# Nexus
- name: nexus
Expand Down
2 changes: 1 addition & 1 deletion docs/packages-and-dependencies.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ The UDS Software Factory Bundle (SWF) is a collection of Zarf packages which inc
| [Sonarqube](https://github.com/defenseunicorns/uds-package-sonarqube) | 10.6.0-uds.1-registry1 | 10.6.0-community | A code inspection tool used during automated pipelines to evaluate security considerations of custom software and packaged images |
| [Jira](https://github.com/defenseunicorns/uds-package-jira) | 1.22.0-uds.0-registry1 | 10.0.1 | A collaboration tool used for team management and task organization |s
| [Confluence](https://github.com/defenseunicorns/uds-package-confluence) | 1.20.0-uds.0-registry1 | 8.9.4 | A knowledge management tool used by teams to organize information |
| [Mattermost](https://github.com/defenseunicorns/uds-package-mattermost) | 9.7.2-uds.0-registry1 | 9.7.2 | An instance of Mattermost, a self-hosted chat and collaboration platform |
| [Mattermost](https://github.com/defenseunicorns/uds-package-mattermost) | 9.11.1-uds.0-registry1 | 9.11.1 | An instance of Mattermost, a self-hosted chat and collaboration platform |
| [Nexus](https://github.com/defenseunicorns/uds-package-nexus) | 3.71.0-uds.1-registry1 | 3.71.0 | An artifact repository used for storing compiled application libraries, packages, images and other such artifacts |
| [cert-manager](https://cert-manager.io/) | 0.0.1 | 1.14.5 | Tool for automating management of in-cluster certificates |
| [trust-manager](https://cert-manager.io/docs/trust/trust-manager/) | 0.0.1 | v0.11.0 | Tool for automating creation and distribution of CA trust bundles |
Expand Down