Skip to content

Commit f22842f

Browse files
authored
Merge pull request #116 from sei-bstein/gb-settings-yaml-rollback
GB UI - default settingsYaml to null
2 parents 1046cb9 + fd2c3ec commit f22842f

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

charts/gameboard/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.5.7
18+
version: 0.5.8

charts/gameboard/charts/gameboard-ui/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.5.7
18+
version: 0.5.8
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

charts/gameboard/charts/gameboard-ui/values.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,10 @@ basehref: ""
8989
settings: "{}"
9090

9191
## assets/settings.json content in yaml form. Takes precedence over settings: value when populated.
92-
settingsYaml:
93-
appname: Gameboard
92+
## NOTE: If specified here, will override the generated settings.json for installations that are using
93+
## the `settings` key. Change with caution.
94+
settingsYaml: {}
95+
# appname: Gameboard
9496
# apphost: http://localhost:5002
9597
# basehref: "gb"
9698
# imghost: 'http://localhost:5002/img'
@@ -99,15 +101,15 @@ settingsYaml:
99101
# tocfile: ''
100102
# countdownStartSecondsAtMinute: 5
101103
# custom_background: 'custom-bg-dark-gray'
102-
consoleForgeConfig:
104+
# consoleForgeConfig:
103105
# canvasRecording:
104106
# autoDownloadCompletedRecordings: true
105107
# chunkLength: 1000
106108
# frameRate: 25
107109
# maxDuration: 10000
108110
# mimeType: 'video/webm'
109111
# consoleBackgroundStyle: 'rgb(40, 40, 40)'
110-
defaultConsoleType: vmware # or "proxmox"
112+
# defaultConsoleType: vmware # or "proxmox"
111113
# disabledFeatures:
112114
# clipboard: false
113115
# consoleScreenRecord: false

charts/gameboard/values.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,10 @@ gameboard-ui:
289289
settings: "{}"
290290

291291
## assets/settings.json content in yaml form. Takes precedence over settings: value when populated.
292-
settingsYaml:
293-
appname: Gameboard
292+
## NOTE: If specified here, will override the generated settings.json for installations that are using
293+
## the `settings` key. Change with caution.
294+
settingsYaml: {}
295+
# appname: Gameboard
294296
# apphost: http://localhost:5002
295297
# basehref: "gb"
296298
# imghost: 'http://localhost:5002/img'
@@ -299,15 +301,15 @@ gameboard-ui:
299301
# tocfile: ''
300302
# countdownStartSecondsAtMinute: 5
301303
# custom_background: 'custom-bg-dark-gray'
302-
consoleForgeConfig:
304+
# consoleForgeConfig:
303305
# canvasRecording:
304306
# autoDownloadCompletedRecordings: true
305307
# chunkLength: 1000
306308
# frameRate: 25
307309
# maxDuration: 10000
308310
# mimeType: 'video/webm'
309311
# consoleBackgroundStyle: 'rgb(40, 40, 40)'
310-
defaultConsoleType: vmware # or "proxmox"
312+
# defaultConsoleType: vmware # or "proxmox"
311313
# disabledFeatures:
312314
# clipboard: false
313315
# consoleScreenRecord: false

0 commit comments

Comments
 (0)