sev: fixed k8s service yaml delete method

bash (ls) regex in quotes was throwing errors and k8s services/pods were not getting cleaned up. Service yamls weren't being deleted due to partial name including prefix file path, now trims using 'basename'. Removed redundant TEST_DIR on the yaml file to be deleted. Fixes: kata-containers#5760 Signed-Off-By: Ryan Savino <[email protected]>
ryansavino · Aug 30, 2023 · 130b5ec · 130b5ec
1 parent 7f5a015
commit 130b5ec
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/integration/kubernetes/confidential/sev.bats b/integration/kubernetes/confidential/sev.bats
@@ -28,10 +28,10 @@ load "${TESTS_REPO_DIR}/integration/kubernetes/confidential/lib.sh"
 
 # Delete all test services
 k8s_delete_all() {
-  for file in $(ls "${TEST_DIR}/*.yaml") ; do
-    # Removing extension to get the pod name
-    local pod_name="${file%.*}"
-    kubernetes_delete_by_yaml "${pod_name}" "${TEST_DIR}/${file}"
+  for file in $(find "${TEST_DIR}" -name "*.yaml"); do
+    # Removing prefix path and file extension to get the pod partial name
+    local pod_partial_name=$(basename "${file%.*}")
+    kubernetes_delete_by_yaml "${pod_partial_name}" "${file}"
   done
 }