From 1dd044e17b27073cf1c124cf22be49fed7c6e7e7 Mon Sep 17 00:00:00 2001
From: Aakcht <aakcht@gmail.com>
Date: Tue, 17 Mar 2026 18:44:29 +0500
Subject: [PATCH] Chart: fix default args/command for databaseCleanup

---
 chart/values.schema.json                              |  5 ++---
 chart/values.yaml                                     |  4 ++--
 .../helm_tests/airflow_aux/test_database_cleanup.py   | 11 +++++------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/chart/values.schema.json b/chart/values.schema.json
index 31e6333e88538..8c41120c9a672 100644
--- a/chart/values.schema.json
+++ b/chart/values.schema.json
@@ -10195,9 +10195,7 @@
                     "items": {
                         "type": "string"
                     },
-                    "default": [
-                        "bash"
-                    ]
+                    "default": null
                 },
                 "args": {
                     "description": "Args to use when running the database cleanup cronjob (templated).",
@@ -10209,6 +10207,7 @@
                         "type": "string"
                     },
                     "default": [
+                        "bash",
                         "-c",
                         "CLEAN_TS=$(date -d \"-{{ .Values.databaseCleanup.retentionDays }} days\" +\"%Y-%m-%dT%H:%M:%S\"); echo \"Cleaning up metadata DB entries older than ${CLEAN_TS}\"; exec airflow db clean --clean-before-timestamp \"${CLEAN_TS}\" --yes {{- if .Values.databaseCleanup.skipArchive }} --skip-archive{{ end }} {{- if .Values.databaseCleanup.verbose }} --verbose{{ end }} {{- with .Values.databaseCleanup.batchSize }} --batch-size {{ . }}{{ end }} {{- with .Values.databaseCleanup.tables }} --tables {{ . | join \",\" }}{{ end }}"
                     ]
diff --git a/chart/values.yaml b/chart/values.yaml
index a5159c84faa52..a8116baec9047 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -3379,10 +3379,10 @@ databaseCleanup:
   # Run every week on Sunday at midnight (templated).
   schedule: "0 0 * * 0"
   # Command to use when running the database cleanup cronjob (templated).
-  command:
-    - "bash"
+  command: ~
   # Args to use when running the database cleanup cronjob (templated).
   args:
+    - "bash"
     - "-c"
     - >-
       CLEAN_TS=$(date -d "-{{ .Values.databaseCleanup.retentionDays }} days" +"%Y-%m-%dT%H:%M:%S");
diff --git a/helm-tests/tests/helm_tests/airflow_aux/test_database_cleanup.py b/helm-tests/tests/helm_tests/airflow_aux/test_database_cleanup.py
index 14f86cff77a18..4ad2e990d6b95 100644
--- a/helm-tests/tests/helm_tests/airflow_aux/test_database_cleanup.py
+++ b/helm-tests/tests/helm_tests/airflow_aux/test_database_cleanup.py
@@ -188,6 +188,7 @@ def test_retention_days_changed(self):
         )
 
         assert jmespath.search("spec.jobTemplate.spec.template.spec.containers[0].args", docs[0]) == [
+            "bash",
             "-c",
             'CLEAN_TS=$(date -d "-10 days" +"%Y-%m-%dT%H:%M:%S"); echo "Cleaning up metadata DB entries older than ${CLEAN_TS}"; exec airflow db clean --clean-before-timestamp "${CLEAN_TS}" --yes --verbose',
         ]
@@ -198,10 +199,9 @@ def test_default_command_and_args(self):
             show_only=["templates/database-cleanup/database-cleanup-cronjob.yaml"],
         )
 
-        assert jmespath.search("spec.jobTemplate.spec.template.spec.containers[0].command", docs[0]) == [
-            "bash"
-        ]
+        assert jmespath.search("spec.jobTemplate.spec.template.spec.containers[0].command", docs[0]) is None
         assert jmespath.search("spec.jobTemplate.spec.template.spec.containers[0].args", docs[0]) == [
+            "bash",
             "-c",
             'CLEAN_TS=$(date -d "-90 days" +"%Y-%m-%dT%H:%M:%S"); echo "Cleaning up metadata DB entries older than ${CLEAN_TS}"; exec airflow db clean --clean-before-timestamp "${CLEAN_TS}" --yes --verbose',
         ]
@@ -241,10 +241,9 @@ def test_cleanup_command_options(
             show_only=["templates/database-cleanup/database-cleanup-cronjob.yaml"],
         )
 
-        assert jmespath.search("spec.jobTemplate.spec.template.spec.containers[0].command", docs[0]) == [
-            "bash"
-        ]
+        assert jmespath.search("spec.jobTemplate.spec.template.spec.containers[0].command", docs[0]) is None
         assert jmespath.search("spec.jobTemplate.spec.template.spec.containers[0].args", docs[0]) == [
+            "bash",
             "-c",
             f'CLEAN_TS=$(date -d "-{retention} days" +"%Y-%m-%dT%H:%M:%S"); echo "Cleaning up metadata DB entries older than ${{CLEAN_TS}}"; exec airflow db clean --clean-before-timestamp "${{CLEAN_TS}}" --yes{command_args}',
         ]