infra/mastodon-chart-mirror
3
0
Fork 0
mirror of https://github.com/mastodon/chart synced 2025-05-18 04:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fix

Browse Source
This commit is contained in:
Tim Campbell 2025-03-27 11:15:30 +01:00
parent 91d6b6fb11
commit f04bcb559f
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
values.yaml
View File

@ -904,16 +904,12 @@ tolerations: []
# -- Affinity for all mastodon pods unless overwritten # -- Affinity for all mastodon pods unless overwritten
affinity: {} affinity: {}
<<<<<<< HEAD
# Node(s) on which we will deploy all resources. # Node(s) on which we will deploy all resources.
# Any node selectors specified for individual resources will override this # Any node selectors specified for individual resources will override this
# setting. # setting.
nodeSelector: {} nodeSelector: {}
# -- Timezone for all pods unless overwritten
=======
# -- Timezone for all mastodon pods unless overwritten # -- Timezone for all mastodon pods unless overwritten
>>>>>>> main
timezone: UTC timezone: UTC
# -- Topology Spread Constraints for all mastodon pods unless overwritten # -- Topology Spread Constraints for all mastodon pods unless overwritten