From 3e03c4462911604d1b2c29ec46e3c760f712cda9 Mon Sep 17 00:00:00 2001
From: Matthew Abbott <abbottmg@me.com>
Date: Sat, 1 Feb 2025 23:53:24 -0600
Subject: [PATCH] Move deploySearch stanza under hooks

---
 templates/job-deploy-search.yaml | 8 ++++----
 values.yaml                      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/job-deploy-search.yaml b/templates/job-deploy-search.yaml
index 3767010..7192edf 100644
--- a/templates/job-deploy-search.yaml
+++ b/templates/job-deploy-search.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.mastodon.deploySearch.enabled .Values.elasticsearch.enabled -}}
+{{- if and .Values.mastodon.hooks.deploySearch.enabled .Values.elasticsearch.enabled -}}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -55,14 +55,14 @@ spec:
             - bin/tootctl
             - search
             - deploy
-            {{- with .Values.mastodon.deploySearch.concurrency }}
+            {{- with .Values.mastodon.hooks.deploySearch.concurrency }}
             - '--concurrency'
             - {{ . | quote }}
             {{- end }}
-            {{- if .Values.mastodon.deploySearch.resetChewy }}
+            {{- if .Values.mastodon.hooks.deploySearch.resetChewy }}
             - '--reset-chewy'
             {{- end }}
-            {{- with .Values.mastodon.deploySearch.batchSize }}
+            {{- with .Values.mastodon.hooks.deploySearch.batchSize }}
             - '--batch-size'
             - {{ . | quote }}
             {{- end }}
diff --git a/values.yaml b/values.yaml
index 378444e..eced483 100644
--- a/values.yaml
+++ b/values.yaml
@@ -35,6 +35,10 @@ mastodon:
     # Whether to perform DB migrations on `helm upgrade`.
     dbMigrate:
       enabled: true
+    deploySearch:
+      enabled: false
+      concurrency: 5
+      resetChewy: true
     # 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
@@ -60,10 +64,6 @@ mastodon:
   # Custom labels to add to kubernetes resources
   #labels:
   # -- deploy search to elastsicsearch. Requires .elasticsearch.enabled = true
-  deploySearch:
-    enabled: false
-    concurrency: 5
-    resetChewy: true
   cron:
     # -- run `tootctl media remove` every week
     removeMedia: