fix: handle subdomain shared between packages (#10)

* fix: handle subdomain shared between packages * chat
defenseunicorns · Jan 31, 2024 · 31da0b4 · 31da0b4
1 parent 5415a0a
commit 31da0b4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/chart/templates/uds-package.yaml b/chart/templates/uds-package.yaml
@@ -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

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -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"
diff --git a/tasks/test.yaml b/tasks/test.yaml
@@ -14,5 +14,5 @@ tasks:
         wait:
           network:
             protocol: https
-            address: mattermost.uds.dev
+            address: chat.uds.dev
             code: 200
diff --git a/values/config-values.yaml b/values/config-values.yaml
@@ -4,3 +4,5 @@ objectStorage:
 
 postgres:
   password: "###ZARF_VAR_DB_PASSWORD###"
+
+subdomain: "###ZARF_VAR_SUBDOMAIN###"
diff --git a/values/values.yaml b/values/values.yaml
@@ -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: ""
 

diff --git a/zarf.yaml b/zarf.yaml
@@ -9,6 +9,9 @@ metadata:
   architecture: amd64
 
 variables:
+  - name: SUBDOMAIN
+    description: "Subdomain for Mattermost"
+    default: "chat"
   - name: DOMAIN
     default: "uds.dev"
   - name: ACCESS_KEY
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###"