From 6c51e825314fadd952291a512b66487d4968f2ba Mon Sep 17 00:00:00 2001
From: "j.mercier" <j.mercier@samsung.com>
Date: Wed, 26 Apr 2023 21:31:08 -0400
Subject: [PATCH] Revert "Do not declare a volume for sshKeySecret if dag
 persistence is enabled (#22913)"

This reverts commit 3fc895b9
---
 .../scheduler/scheduler-deployment.yaml       |  4 ++--
 .../triggerer/triggerer-deployment.yaml       |  4 ++--
 tests/charts/other/test_git_sync_scheduler.py | 18 ------------------
 tests/charts/other/test_git_sync_webserver.py | 18 ------------------
 tests/charts/other/test_git_sync_worker.py    | 19 -------------------
 5 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/chart/templates/scheduler/scheduler-deployment.yaml b/chart/templates/scheduler/scheduler-deployment.yaml
index d10e13414324f..19813e74cdb94 100644
--- a/chart/templates/scheduler/scheduler-deployment.yaml
+++ b/chart/templates/scheduler/scheduler-deployment.yaml
@@ -271,9 +271,9 @@ spec:
         {{- else if .Values.dags.gitSync.enabled }}
         - name: dags
           emptyDir: {}
-        {{- if .Values.dags.gitSync.sshKeySecret }}
-          {{- include "git_sync_ssh_key_volume" . | indent 8 }}
         {{- end }}
+        {{- if and  .Values.dags.gitSync.enabled  .Values.dags.gitSync.sshKeySecret }}
+          {{- include "git_sync_ssh_key_volume" . | indent 8 }}
         {{- end }}
         {{- end }}
         {{- if .Values.volumes }}
diff --git a/chart/templates/triggerer/triggerer-deployment.yaml b/chart/templates/triggerer/triggerer-deployment.yaml
index b690c606f1f08..8eb090546ae19 100644
--- a/chart/templates/triggerer/triggerer-deployment.yaml
+++ b/chart/templates/triggerer/triggerer-deployment.yaml
@@ -251,9 +251,9 @@ spec:
         {{- else if .Values.dags.gitSync.enabled }}
         - name: dags
           emptyDir: {}
-        {{- if .Values.dags.gitSync.sshKeySecret }}
-          {{- include "git_sync_ssh_key_volume" . | nindent 8 }}
         {{- end }}
+          {{- if and .Values.dags.gitSync.enabled .Values.dags.gitSync.sshKeySecret }}
+        {{- include "git_sync_ssh_key_volume" . | nindent 8 }}
         {{- end }}
         {{- if .Values.volumes }}
           {{- toYaml .Values.volumes | nindent 8 }}
diff --git a/tests/charts/other/test_git_sync_scheduler.py b/tests/charts/other/test_git_sync_scheduler.py
index e47d00686c974..b2c1f179be63d 100644
--- a/tests/charts/other/test_git_sync_scheduler.py
+++ b/tests/charts/other/test_git_sync_scheduler.py
@@ -130,24 +130,6 @@ def test_validate_if_ssh_params_are_added(self):
             "secret": {"secretName": "ssh-secret", "defaultMode": 288},
         } in jmespath.search("spec.template.spec.volumes", docs[0])
 
-    def test_validate_sshkeysecret_not_added_when_persistence_is_enabled(self):
-        docs = render_chart(
-            values={
-                "dags": {
-                    "gitSync": {
-                        "enabled": True,
-                        "containerName": "git-sync-test",
-                        "sshKeySecret": "ssh-secret",
-                        "knownHosts": None,
-                        "branch": "test-branch",
-                    },
-                    "persistence": {"enabled": True},
-                }
-            },
-            show_only=["templates/scheduler/scheduler-deployment.yaml"],
-        )
-        assert "git-sync-ssh-key" not in jmespath.search("spec.template.spec.volumes[].name", docs[0])
-
     def test_should_set_username_and_pass_env_variables(self):
         docs = render_chart(
             values={
diff --git a/tests/charts/other/test_git_sync_webserver.py b/tests/charts/other/test_git_sync_webserver.py
index ea264673d7af7..7663455b4e9e6 100644
--- a/tests/charts/other/test_git_sync_webserver.py
+++ b/tests/charts/other/test_git_sync_webserver.py
@@ -155,21 +155,3 @@ def test_resources_are_configurable(self):
             "spec.template.spec.containers[1].resources.requests.memory", docs[0]
         )
         assert "300m" == jmespath.search("spec.template.spec.containers[1].resources.requests.cpu", docs[0])
-
-    def test_validate_sshkeysecret_not_added_when_persistence_is_enabled(self):
-        docs = render_chart(
-            values={
-                "dags": {
-                    "gitSync": {
-                        "enabled": True,
-                        "containerName": "git-sync-test",
-                        "sshKeySecret": "ssh-secret",
-                        "knownHosts": None,
-                        "branch": "test-branch",
-                    },
-                    "persistence": {"enabled": True},
-                }
-            },
-            show_only=["templates/webserver/webserver-deployment.yaml"],
-        )
-        assert "git-sync-ssh-key" not in jmespath.search("spec.template.spec.volumes[].name", docs[0])
diff --git a/tests/charts/other/test_git_sync_worker.py b/tests/charts/other/test_git_sync_worker.py
index 177fc8fed76fe..4f0556ad69ece 100644
--- a/tests/charts/other/test_git_sync_worker.py
+++ b/tests/charts/other/test_git_sync_worker.py
@@ -111,22 +111,3 @@ def test_resources_are_configurable(self):
             "spec.template.spec.containers[1].resources.requests.memory", docs[0]
         )
         assert "300m" == jmespath.search("spec.template.spec.containers[1].resources.requests.cpu", docs[0])
-
-    def test_validate_sshkeysecret_not_added_when_persistence_is_enabled(self):
-        docs = render_chart(
-            values={
-                "dags": {
-                    "gitSync": {
-                        "enabled": True,
-                        "containerName": "git-sync-test",
-                        "sshKeySecret": "ssh-secret",
-                        "knownHosts": None,
-                        "branch": "test-branch",
-                    },
-                    "persistence": {"enabled": True},
-                }
-            },
-            show_only=["templates/workers/worker-deployment.yaml"],
-        )
-
-        assert "git-sync-ssh-key" not in jmespath.search("spec.template.spec.volumes[].name", docs[0])