From ca2cd6ff8a205cba5989a3146a817c70dd99f9e5 Mon Sep 17 00:00:00 2001 From: Tim Campbell Date: Thu, 6 Mar 2025 16:20:51 +0100 Subject: [PATCH] Adjust nodeselector to default to global value, then rewrite with local values --- templates/cronjob-media-remove.yaml | 3 +++ templates/deployment-sidekiq.yaml | 8 +++++++- templates/deployment-streaming.yaml | 3 +++ templates/deployment-web.yaml | 3 +++ templates/job-assets-copy.yaml | 8 ++++++++ templates/job-create-admin.yaml | 3 +++ templates/job-db-migrate.yaml | 7 +++++++ templates/job-db-pre-migrate.yaml | 7 +++++++ templates/job-db-prepare.yaml | 7 +++++++ 9 files changed, 48 insertions(+), 1 deletion(-) diff --git a/templates/cronjob-media-remove.yaml b/templates/cronjob-media-remove.yaml index 4320d54..13a520f 100644 --- a/templates/cronjob-media-remove.yaml +++ b/templates/cronjob-media-remove.yaml @@ -110,5 +110,8 @@ spec: {{- if .Values.mastodon.cron.removeMedia.nodeSelector }} nodeSelector: {{ .Values.mastodon.cron.removeMedia.nodeSelector | toYaml | nindent 12 }} + {{- else if .Values.nodeSelector }} + nodeSelector: + {{ .Values.nodeSelector | toYaml | nindent 12 }} {{- end }} {{- end }} diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml index fc9fc7a..af5aa23 100644 --- a/templates/deployment-sidekiq.yaml +++ b/templates/deployment-sidekiq.yaml @@ -255,9 +255,15 @@ spec: resources: {{- toYaml (default (default $context.Values.resources $context.Values.mastodon.sidekiq.resources) .resources) | nindent 12 }} {{- include "mastodon.statsdExporterContainer" $ | indent 8 }} - {{- if $context.Values.mastodon.sidekiq.nodeSelector }} + {{- if .nodeSelector }} + nodeSelector: + {{- .nodeSelector | 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 }} {{- with $context.Values.tolerations }} tolerations: diff --git a/templates/deployment-streaming.yaml b/templates/deployment-streaming.yaml index bafadd4..aa8a69b 100644 --- a/templates/deployment-streaming.yaml +++ b/templates/deployment-streaming.yaml @@ -164,6 +164,9 @@ spec: {{- if .Values.mastodon.streaming.nodeSelector }} nodeSelector: {{ .Values.mastodon.streaming.nodeSelector | toYaml | nindent 8 }} + {{- else if .Values.nodeSelector }} + nodeSelector: + {{ .Values.nodeSelector | toYaml | nindent 8 }} {{- end }} {{- with (default .Values.affinity .Values.mastodon.streaming.affinity) }} affinity: diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml index dcf8179..7a9b9da 100644 --- a/templates/deployment-web.yaml +++ b/templates/deployment-web.yaml @@ -272,6 +272,9 @@ spec: {{- if .Values.mastodon.web.nodeSelector }} nodeSelector: {{ .Values.mastodon.web.nodeSelector | toYaml | nindent 8 }} + {{- else if .Values.nodeSelector }} + nodeSelector: + {{ .Values.nodeSelector | toYaml | nindent 8 }} {{- end }} {{- with (default .Values.affinity .Values.mastodon.web.affinity) }} affinity: diff --git a/templates/job-assets-copy.yaml b/templates/job-assets-copy.yaml index 2ac51fa..01c62dd 100644 --- a/templates/job-assets-copy.yaml +++ b/templates/job-assets-copy.yaml @@ -89,4 +89,12 @@ spec: volumes: - name: assets emptyDir: {} + {{- if .Values.mastodon.hooks.s3Upload.nodeSelector }} + nodeSelector: + {{ .Values.mastodon.hooks.s3Upload.nodeSelector | toYaml | nindent 8 }} + {{- else if .Values.nodeSelector }} + nodeSelector: + {{ .Values.nodeSelector | toYaml | nindent 8 }} + {{- end }} + {{- end -}} diff --git a/templates/job-create-admin.yaml b/templates/job-create-admin.yaml index af88a73..bea556f 100644 --- a/templates/job-create-admin.yaml +++ b/templates/job-create-admin.yaml @@ -98,5 +98,8 @@ spec: {{- if .Values.mastodon.createAdmin.nodeSelector }} nodeSelector: {{ .Values.mastodon.createAdmin.nodeSelector | toYaml | nindent 8 }} + {{- else if .Values.nodeSelector }} + nodeSelector: + {{ .Values.nodeSelector | toYaml | nindent 8 }} {{- end }} {{- end }} diff --git a/templates/job-db-migrate.yaml b/templates/job-db-migrate.yaml index 748420c..5b25a4c 100644 --- a/templates/job-db-migrate.yaml +++ b/templates/job-db-migrate.yaml @@ -1,3 +1,10 @@ {{- if .Values.mastodon.hooks.dbMigrate.enabled }} {{- include "mastodon.dbMigrateJob" (merge (dict "preDeploy" false ) .) }} + {{- if .Values.mastodon.hooks.dbMigrate.nodeSelector }} + nodeSelector: + {{ .Values.mastodon.hooks.dbMigrate.nodeSelector | toYaml | nindent 8 }} + {{- else if .Values.nodeSelector }} + nodeSelector: + {{ .Values.nodeSelector | toYaml | nindent 8 }} + {{- end }} {{- end }} diff --git a/templates/job-db-pre-migrate.yaml b/templates/job-db-pre-migrate.yaml index bae1717..29fcb82 100644 --- a/templates/job-db-pre-migrate.yaml +++ b/templates/job-db-pre-migrate.yaml @@ -1,3 +1,10 @@ {{- if .Values.mastodon.hooks.dbMigrate.enabled }} {{- include "mastodon.dbMigrateJob" (merge (dict "preDeploy" true ) .) }} + {{- if .Values.mastodon.hooks.dbMigrate.nodeSelector }} + nodeSelector: + {{ .Values.mastodon.hooks.dbMigrate.nodeSelector | toYaml | nindent 8 }} + {{- else if .Values.nodeSelector }} + nodeSelector: + {{ .Values.nodeSelector | toYaml | nindent 8 }} + {{- end }} {{- end }} diff --git a/templates/job-db-prepare.yaml b/templates/job-db-prepare.yaml index 0b6d8ba..54bbb55 100644 --- a/templates/job-db-prepare.yaml +++ b/templates/job-db-prepare.yaml @@ -1,3 +1,10 @@ {{- if and .Values.mastodon.hooks.dbPrepare.enabled (not .Values.postgresql.enabled) }} {{- include "mastodon.dbMigrateJob" (merge (dict "prepare" true ) .) }} + {{- if .Values.mastodon.hooks.dbPrepare.nodeSelector }} + nodeSelector: + {{ .Values.mastodon.hooks.dbPrepare.nodeSelector | toYaml | nindent 8 }} + {{- else if .Values.nodeSelector }} + nodeSelector: + {{ .Values.nodeSelector | toYaml | nindent 8 }} + {{- end }} {{- end }}