Rearrange nodeSelector fields to fit with the rest of the values; removed values for old/deleted jobs

values.yaml

@@ -32,9 +32,13 @@ mastodon:
     # and `pre-upgrade`.
     dbPrepare:
       enabled: true
+      # Node(s) on which we will deploy this job
+      nodeSelector: {}
     # Whether to perform DB migrations on `helm upgrade`.
     dbMigrate:
       enabled: true
+      # Node(s) on which we will deploy this job
+      nodeSelector: {}
     # Upload website assets to S3 before deploying using rclone.
     # Whenever there is an update to Mastodon, sometimes there are assets files
     # that are renamed. As the pods are getting redeployed, and old/new pods are
@@ -57,6 +61,8 @@ mastodon:
       rclone:
         # Any additional environment variables to pass to rclone.
         env: {}
+      # Node(s) on which we will deploy this job
+      nodeSelector: {}
   # Custom labels to add to kubernetes resources
   #labels:
 
@@ -68,9 +74,7 @@ mastodon:
       # @ignored
       schedule: "0 0 * * 0"
 
-      # Node(s) on which we will deploy this resource
-      nodeSelector: {}
-      # -- available locales: https://github.com/mastodon/mastodon/blob/main/config/application.rb#L71
+  # -- available locales: https://github.com/mastodon/mastodon/blob/main/config/application.rb#L71
   locale: en
   local_domain: mastodon.local
   # -- Use of WEB_DOMAIN requires careful consideration: https://docs.joinmastodon.org/admin/config/#federation
@@ -174,6 +178,9 @@ mastodon:
     resources: {}
     # -- Affinity for all Sidekiq Deployments unless overwritten, overwrites .Values.affinity
     affinity: {}
+    # Node(s) on which we will deploy sidekiq in general
+    # Any worker-specific configuration will override this setting.
+    nodeSelector: {}
     # -- Annotations to apply to the deployment object(s) for sidekiq.
     # -- These are applied in addition to deploymentAnnotations.
     annotations: {}
@@ -220,9 +227,6 @@ mastodon:
       namePrefix:
       nameSeparator:
 
-    # Node(s) on which we will deploy this resource
-    nodeSelector: {}
-
     workers:
       - name: all-queues
         # -- Number of threads / parallel sidekiq jobs that are executed per Pod
@@ -233,10 +237,10 @@ mastodon:
         resources: {}
         # -- Affinity for this specific deployment, overwrites .Values.affinity and .Values.mastodon.sidekiq.affinity
         affinity: {}
+        # -- Node(s) on which we will deploy this sidekiq worker
+        nodeSelector: {}
         # -- Topology spread constraints for this specific deployment, overwrites .Values.topologySpreadConstraints and .Values.mastodon.sidekiq.topologySpreadConstraints
         topologySpreadConstraints: {}
-        # -- Node(s) on which we will deploy this resource
-        nodeSelector: {}
 
         # -- Sidekiq queues for Mastodon that are handled by this worker. See https://docs.joinmastodon.org/admin/scaling/#concurrency
         # See https://github.com/mperham/sidekiq/wiki/Advanced-Options#queues for how to weight queues as argument
@@ -309,6 +313,8 @@ mastodon:
     replicas: 1
     # -- Affinity for Streaming Pods, overwrites .Values.affinity
     affinity: {}
+    # -- Node(s) on which we will deploy the streaming pods
+    nodeSelector: {}
     # -- Annotations to apply to the deployment object for streaming.
     # -- These are applied in addition to deploymentAnnotations.
     annotations: {}
@@ -361,15 +367,14 @@ mastodon:
     # Specify extra environment variables to be added to streaming pods.
     extraEnvVars: {}
 
-
-    # -- Node(s) on which we will deploy this resource
-    nodeSelector: {}
   web:
     port: 3000
     # -- Number of Web Pods running
     replicas: 1
     # -- Affinity for Web Pods, overwrites .Values.affinity
     affinity: {}
+    # -- Node(s) on which we will deploy the web pods
+    nodeSelector: {}
     # -- Annotations to apply to the deployment object for web.
     # -- These are applied in addition to deploymentAnnotations.
     annotations: {}
@@ -409,9 +414,6 @@ mastodon:
     # minAvailable: 1
     # maxUnavailable: 1
 
-    # -- Node(s) on which we will deploy this resource
-    nodeSelector: {}
-
     # -- Puma-specific options. Below values are based on default behavior in
     # config/puma.rb when no custom values are provided.
 
@@ -448,18 +450,6 @@ mastodon:
     authToken:
       existingSecret:
 
-  assetsPrecompile:
-    # Node(s) on which we will deploy this resource
-    nodeSelector: {}
-
-  chewyUpgrade:
-    # Node(s) on which we will deploy this resource
-    nodeSelector: {}
-
-  dbMigrate:
-    # Node(s) on which we will deploy this resource
-    nodeSelector: {}
-
   metrics:
     statsd:
       # -- Enable statsd publishing via STATSD_ADDR environment variable
@@ -577,7 +567,7 @@ elasticsearch:
   # Name of an existing secret with a password key
   # existingSecret:
 
-  # -- Node(s) on which we will deploy this resource
+  # -- Node(s) on which we will deploy the various elasticsearch pods
   master:
     nodeSelector: {}
   data:
@@ -637,7 +627,7 @@ postgresql:
       password:
       existingSecret:
 
-  # -- Node(s) on which we will deploy this resource
+  # -- Node(s) on which we will deploy the various database pods
   primary:
     nodeSelector: {}
   readReplicas:
@@ -692,7 +682,7 @@ redis:
       # with a key of redis-password set to the password you want
       existingSecret: ""
 
-  # -- Node(s) on which we will deploy this resource
+  # -- Node(s) on which we will deploy the various redis pods
   master:
     nodeSelector: {}
   replica:
@@ -860,6 +850,11 @@ tolerations: []
 # -- Affinity for all pods unless overwritten
 affinity: {}
 
+# 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: UTC