mirror of
https://github.com/mastodon/chart
synced 2025-05-17 20:43:21 +00:00
Merge fix
This commit is contained in:
parent
91d6b6fb11
commit
f04bcb559f
|
@ -904,16 +904,12 @@ tolerations: []
|
|||
# -- Affinity for all mastodon pods unless overwritten
|
||||
affinity: {}
|
||||
|
||||
<<<<<<< HEAD
|
||||
# Node(s) on which we will deploy all resources.
|
||||
# Any node selectors specified for individual resources will override this
|
||||
# setting.
|
||||
nodeSelector: {}
|
||||
|
||||
# -- Timezone for all pods unless overwritten
|
||||
=======
|
||||
# -- Timezone for all mastodon pods unless overwritten
|
||||
>>>>>>> main
|
||||
timezone: UTC
|
||||
|
||||
# -- Topology Spread Constraints for all mastodon pods unless overwritten
|
||||
|
|
Loading…
Reference in New Issue
Block a user