From 5146378bb708cb6aad4632a1255ea7e15dda7730 Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 16 Apr 2024 17:07:18 +0000 Subject: [PATCH 1/5] feat: adds a multiline variable to add extra envs to mattermost --- values/common-values.yaml | 1 + zarf.yaml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/values/common-values.yaml b/values/common-values.yaml index a031459f..3607e5d5 100644 --- a/values/common-values.yaml +++ b/values/common-values.yaml @@ -92,6 +92,7 @@ mattermostApp: secretKeyRef: key: MM_PLUGINSETTINGS_ENABLEUPLOADS name: "mattermost-config" + ###ZARF_VAR_EXTRA_ENV### securityContext: runAsUser: 2000 runAsGroup: 2000 diff --git a/zarf.yaml b/zarf.yaml index e0df7c81..c44a8e93 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -19,6 +19,10 @@ variables: description: "Secret Key for S3 compatible storage" - name: DB_PASSWORD description: "Database Password for Mattermost" + - name: EXTRA_ENV + description: "Sets an extra env variable for the mattermost chart" + default: "" + autoIndent: true components: - name: mattermost From c007565f0fbe8f208f950679afc48b635a924d14 Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 16 Apr 2024 17:56:54 +0000 Subject: [PATCH 2/5] feat: add env var that will use connection_string in secret --- values/common-values.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/values/common-values.yaml b/values/common-values.yaml index 3607e5d5..13e88f0b 100644 --- a/values/common-values.yaml +++ b/values/common-values.yaml @@ -92,7 +92,12 @@ mattermostApp: secretKeyRef: key: MM_PLUGINSETTINGS_ENABLEUPLOADS name: "mattermost-config" - ###ZARF_VAR_EXTRA_ENV### + - name: MM_SQLSETTINGS_DATASOURCE + valueFrom: + secretKeyRef: + key: db_connection_string + name: "mattermost-postgres" + ###ZARF_VAR_MM_EXTRA_ENV### securityContext: runAsUser: 2000 runAsGroup: 2000 From d60fcf09ea9e1b3743821dece3e7813a848a7fb6 Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Tue, 16 Apr 2024 17:57:32 +0000 Subject: [PATCH 3/5] typo --- values/common-values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values/common-values.yaml b/values/common-values.yaml index 13e88f0b..8c4aaff6 100644 --- a/values/common-values.yaml +++ b/values/common-values.yaml @@ -97,7 +97,7 @@ mattermostApp: secretKeyRef: key: db_connection_string name: "mattermost-postgres" - ###ZARF_VAR_MM_EXTRA_ENV### + ###ZARF_VAR_EXTRA_ENV### securityContext: runAsUser: 2000 runAsGroup: 2000 From 8f95aa2bde8cc1d0f2cd327727a6672a11423779 Mon Sep 17 00:00:00 2001 From: Jordan McClintock Date: Wed, 17 Apr 2024 13:31:24 -0400 Subject: [PATCH 4/5] Update zarf.yaml Co-authored-by: Wayne Starr --- zarf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zarf.yaml b/zarf.yaml index c44a8e93..30d0c498 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -20,7 +20,7 @@ variables: - name: DB_PASSWORD description: "Database Password for Mattermost" - name: EXTRA_ENV - description: "Sets an extra env variable for the mattermost chart" + description: "Sets extra env variables for the mattermost chart" default: "" autoIndent: true From a57a8b4f06da12dcc399e8c1c39fa44ae491545a Mon Sep 17 00:00:00 2001 From: Michael-Kruggel Date: Fri, 19 Apr 2024 16:33:44 +0000 Subject: [PATCH 5/5] Removing zarf var --- values/common-values.yaml | 1 - zarf.yaml | 4 ---- 2 files changed, 5 deletions(-) diff --git a/values/common-values.yaml b/values/common-values.yaml index 8c4aaff6..5551d849 100644 --- a/values/common-values.yaml +++ b/values/common-values.yaml @@ -97,7 +97,6 @@ mattermostApp: secretKeyRef: key: db_connection_string name: "mattermost-postgres" - ###ZARF_VAR_EXTRA_ENV### securityContext: runAsUser: 2000 runAsGroup: 2000 diff --git a/zarf.yaml b/zarf.yaml index 30d0c498..e0df7c81 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -19,10 +19,6 @@ variables: description: "Secret Key for S3 compatible storage" - name: DB_PASSWORD description: "Database Password for Mattermost" - - name: EXTRA_ENV - description: "Sets extra env variables for the mattermost chart" - default: "" - autoIndent: true components: - name: mattermost