Skip to content

Commit

Permalink
fix: handle subdomain shared between packages
Browse files Browse the repository at this point in the history
  • Loading branch information
mjnagel committed Jan 31, 2024
1 parent 5415a0a commit 5619caa
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion chart/templates/uds-package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
podLabels:
app.kubernetes.io/name: mattermost-enterprise-edition
gateway: tenant
host: {{ .Values.host }}
host: {{ .Values.subdomain }}
port: 8065
allow:
# Permit intra-namespace communication for job communications
Expand Down
2 changes: 1 addition & 1 deletion chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ sso:
enable_sign_in_with_username: true

# The subdomain for the mattermost server, will be prefixed to your domain (ex: mattermost.example.com)
host: "mattermost"
subdomain: "chat"
2 changes: 2 additions & 0 deletions values/config-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ objectStorage:

postgres:
password: "###ZARF_VAR_DB_PASSWORD###"

subdomain: "###ZARF_VAR_SUBDOMAIN###"
2 changes: 1 addition & 1 deletion values/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ serviceAccount:
annotations: {}

global:
siteUrl: "https://mattermost.###ZARF_VAR_DOMAIN###"
siteUrl: "https://###ZARF_VAR_SUBDOMAIN###.###ZARF_VAR_DOMAIN###"
# Default unlicensed deployment
mattermostLicense: ""

Expand Down
3 changes: 3 additions & 0 deletions zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ metadata:
architecture: amd64

variables:
- name: SUBDOMAIN
description: "Subdomain for Mattermost"
default: "chat"
- name: DOMAIN
default: "uds.dev"
- name: ACCESS_KEY
Expand Down

0 comments on commit 5619caa

Please sign in to comment.