[Chart] Fix rendering condition of "git_sync_ssh_key_volume" (#59418)

* fix: fix rendering condition of "git_sync_ssh_key_volume"

* test: add test case

* test: split the case

Author: zezaeoh

chart/files/pod-template-file.kubernetes-helm-yaml

@@ -252,7 +252,7 @@ spec:
   - emptyDir: {{- toYaml (default (dict) .Values.logs.emptyDirConfig) | nindent 6 }}
     name: logs
   {{- end }}
-  {{- if and  .Values.dags.gitSync.enabled  .Values.dags.gitSync.sshKeySecret }}
+  {{- if and  .Values.dags.gitSync.enabled (or .Values.dags.gitSync.sshKeySecret .Values.dags.gitSync.sshKey) }}
     {{- include "git_sync_ssh_key_volume" . | nindent 2 }}
   {{- end }}
   - configMap:

helm-tests/tests/helm_tests/airflow_aux/test_configmap.py

@@ -302,6 +302,52 @@ def test_execution_api_server_url(
                 "execution_api_server_url should not be set for Airflow 2.x versions"
             )
 
+    @pytest.mark.parametrize(
+        ("git_sync_enabled", "ssh_key_secret", "expected_volume"),
+        [
+            (True, "my-secret", True),
+            (True, None, False),
+            (False, "my-secret", False),
+        ],
+    )
+    def test_pod_template_git_sync_ssh_key_volume_with_ssh_key_secret_name(
+        self, git_sync_enabled, ssh_key_secret, expected_volume
+    ):
+        dag_values = {"gitSync": {"enabled": git_sync_enabled, "sshKeySecret": ssh_key_secret}}
+        docs = render_chart(
+            values={
+                "executor": "KubernetesExecutor",
+                "dags": dag_values,
+            },
+            show_only=["templates/configmaps/configmap.yaml"],
+        )
+
+        pod_template_file = jmespath.search('data."pod_template_file.yaml"', docs[0])
+        assert ("git-sync-ssh-key" in pod_template_file) == expected_volume
+
+    @pytest.mark.parametrize(
+        ("git_sync_enabled", "ssh_key", "expected_volume"),
+        [
+            (True, "my-key", True),
+            (True, None, False),
+            (False, "my-key", False),
+        ],
+    )
+    def test_pod_template_git_sync_ssh_key_volume_with_ssh_key(
+        self, git_sync_enabled, ssh_key, expected_volume
+    ):
+        dag_values = {"gitSync": {"enabled": git_sync_enabled, "sshKey": ssh_key}}
+        docs = render_chart(
+            values={
+                "executor": "KubernetesExecutor",
+                "dags": dag_values,
+            },
+            show_only=["templates/configmaps/configmap.yaml"],
+        )
+
+        pod_template_file = jmespath.search('data."pod_template_file.yaml"', docs[0])
+        assert ("git-sync-ssh-key" in pod_template_file) == expected_volume
+
     @pytest.mark.parametrize(
         ("scheduler_cpu_limit", "expected_sync_parallelism"),
         [