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

Use coalesce for simplicity

Browse Source
This commit is contained in:
Tim Campbell 2025-04-08 16:03:14 +02:00
parent f04bcb559f
commit 6f178d6c03
9 changed files with 18 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
templates/cronjob-media-remove.yaml
View File

@ -107,11 +107,8 @@ spec:
- name: system - name: system
mountPath: /opt/mastodon/public/system mountPath: /opt/mastodon/public/system
{{- end }} {{- end }}
{{- if .Values.mastodon.cron.removeMedia.nodeSelector }} {{- with coalesce .Values.mastodon.cron.removeMedia.nodeSelector .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- .Values.mastodon.cron.removeMedia.nodeSelector | toYaml | nindent 12 }} {{- . | toYaml | nindent 12 }}
{{- else if .Values.nodeSelector }}
nodeSelector:
{{- .Values.nodeSelector | toYaml | nindent 12 }}
{{- end }} {{- end }}
{{- end }} {{- end }}

10
templates/deployment-sidekiq.yaml
View File

@ -258,15 +258,9 @@ spec:
resources: resources:
{{- toYaml (default (default $context.Values.resources $context.Values.mastodon.sidekiq.resources) .resources) | nindent 12 }} {{- toYaml (default (default $context.Values.resources $context.Values.mastodon.sidekiq.resources) .resources) | nindent 12 }}
{{- include "mastodon.statsdExporterContainer" $ | indent 8 }} {{- include "mastodon.statsdExporterContainer" $ | indent 8 }}
{{- if .nodeSelector }} {{- with coalesce .nodeSelector $context.Values.mastodon.sidekiq.nodeSelector $context.Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- .nodeSelector | toYaml | nindent 8 }} {{- . | toYaml | nindent 8 }}
{{- else if $context.Values.mastodon.sidekiq.nodeSelector }}
nodeSelector:
{{- $context.Values.mastodon.sidekiq.nodeSelector | toYaml | nindent 8 }}
{{- else if $context.Values.nodeSelector }}
nodeSelector:
{{- $context.Values.nodeSelector | toYaml | nindent 8 }}
{{- end }} {{- end }}
{{- with $context.Values.tolerations }} {{- with $context.Values.tolerations }}
tolerations: tolerations:

7
templates/deployment-streaming.yaml
View File

@ -164,12 +164,9 @@ spec:
resources: resources:
{{- toYaml . | nindent 12 }} {{- toYaml . | nindent 12 }}
{{- end }} {{- end }}
{{- if .Values.mastodon.streaming.nodeSelector }} {{- with coalesce .Values.mastodon.streaming.nodeSelector .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- .Values.mastodon.streaming.nodeSelector | toYaml | nindent 8 }} {{- . | toYaml | nindent 8 }}
{{- else if .Values.nodeSelector }}
nodeSelector:
{{- .Values.nodeSelector | toYaml | nindent 8 }}
{{- end }} {{- end }}
{{- with (default .Values.affinity .Values.mastodon.streaming.affinity) }} {{- with (default .Values.affinity .Values.mastodon.streaming.affinity) }}
affinity: affinity:

7
templates/deployment-web.yaml
View File

@ -272,12 +272,9 @@ spec:
containerPort: {{ .Values.mastodon.metrics.prometheus.port }} containerPort: {{ .Values.mastodon.metrics.prometheus.port }}
{{- end }} {{- end }}
{{- include "mastodon.statsdExporterContainer" $ | indent 8 }} {{- include "mastodon.statsdExporterContainer" $ | indent 8 }}
{{- if .Values.mastodon.web.nodeSelector }} {{- with coalesce .Values.mastodon.web.nodeSelector .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- .Values.mastodon.web.nodeSelector | toYaml | nindent 8 }} {{- . | toYaml | nindent 8 }}
{{- else if .Values.nodeSelector }}
nodeSelector:
{{- .Values.nodeSelector | toYaml | nindent 8 }}
{{- end }} {{- end }}
{{- with (default .Values.affinity .Values.mastodon.web.affinity) }} {{- with (default .Values.affinity .Values.mastodon.web.affinity) }}
affinity: affinity:

7
templates/job-assets-copy.yaml
View File

@ -89,12 +89,9 @@ spec:
volumes: volumes:
- name: assets - name: assets
emptyDir: {} emptyDir: {}
{{- if .Values.mastodon.hooks.s3Upload.nodeSelector }} {{- with coalesce .Values.mastodon.hooks.s3Upload.nodeSelector .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- .Values.mastodon.hooks.s3Upload.nodeSelector | toYaml | nindent 8 }} {{- . | toYaml | nindent 8 }}
{{- else if .Values.nodeSelector }}
nodeSelector:
{{- .Values.nodeSelector | toYaml | nindent 8 }}
{{- end }} {{- end }}
{{- end -}} {{- end -}}

7
templates/job-create-admin.yaml
View File

@ -95,11 +95,8 @@ spec:
- name: system - name: system
mountPath: /opt/mastodon/public/system mountPath: /opt/mastodon/public/system
{{- end }} {{- end }}
{{- if .Values.mastodon.createAdmin.nodeSelector }} {{- with coalesce .Values.mastodon.createAdmin.nodeSelector .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- .Values.mastodon.createAdmin.nodeSelector | toYaml | nindent 8 }} {{- . | toYaml | nindent 8 }}
{{- else if .Values.nodeSelector }}
nodeSelector:
{{- .Values.nodeSelector | toYaml | nindent 8 }}
{{- end }} {{- end }}
{{- end }} {{- end }}

7
templates/job-db-migrate.yaml
View File

@ -1,10 +1,7 @@
{{- if .Values.mastodon.hooks.dbMigrate.enabled }} {{- if .Values.mastodon.hooks.dbMigrate.enabled }}
{{- include "mastodon.dbMigrateJob" (merge (dict "preDeploy" false ) .) }} {{- include "mastodon.dbMigrateJob" (merge (dict "preDeploy" false ) .) }}
{{- if .Values.mastodon.hooks.dbMigrate.nodeSelector }} {{- with coalesce .Values.mastodon.hooks.dbMigrate.nodeSelector .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- .Values.mastodon.hooks.dbMigrate.nodeSelector | toYaml | nindent 8 }} {{- . | toYaml | nindent 8 }}
{{- else if .Values.nodeSelector }}
nodeSelector:
{{- .Values.nodeSelector | toYaml | nindent 8 }}
{{- end }} {{- end }}
{{- end }} {{- end }}

7
templates/job-db-pre-migrate.yaml
View File

@ -1,10 +1,7 @@
{{- if .Values.mastodon.hooks.dbMigrate.enabled }} {{- if .Values.mastodon.hooks.dbMigrate.enabled }}
{{- include "mastodon.dbMigrateJob" (merge (dict "preDeploy" true ) .) }} {{- include "mastodon.dbMigrateJob" (merge (dict "preDeploy" true ) .) }}
{{- if .Values.mastodon.hooks.dbMigrate.nodeSelector }} {{- with coalesce .Values.mastodon.hooks.dbMigrate.nodeSelector .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- .Values.mastodon.hooks.dbMigrate.nodeSelector | toYaml | nindent 8 }} {{- . | toYaml | nindent 8 }}
{{- else if .Values.nodeSelector }}
nodeSelector:
{{- .Values.nodeSelector | toYaml | nindent 8 }}
{{- end }} {{- end }}
{{- end }} {{- end }}

7
templates/job-db-prepare.yaml
View File

@ -1,10 +1,7 @@
{{- if and .Values.mastodon.hooks.dbPrepare.enabled (not .Values.postgresql.enabled) }} {{- if and .Values.mastodon.hooks.dbPrepare.enabled (not .Values.postgresql.enabled) }}
{{- include "mastodon.dbMigrateJob" (merge (dict "prepare" true ) .) }} {{- include "mastodon.dbMigrateJob" (merge (dict "prepare" true ) .) }}
{{- if .Values.mastodon.hooks.dbPrepare.nodeSelector }} {{- with coalesce .Values.mastodon.hooks.dbPrepare.nodeSelector .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- .Values.mastodon.hooks.dbPrepare.nodeSelector | toYaml | nindent 8 }} {{- . | toYaml | nindent 8 }}
{{- else if .Values.nodeSelector }}
nodeSelector:
{{- .Values.nodeSelector | toYaml | nindent 8 }}
{{- end }} {{- end }}
{{- end }} {{- end }}