From 130b5ec2441e3bbf6c7ee8f3ba3525940a33fbc8 Mon Sep 17 00:00:00 2001 From: Ryan Savino Date: Tue, 29 Aug 2023 15:27:31 -0500 Subject: [PATCH 1/2] 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: #5760 Signed-Off-By: Ryan Savino --- integration/kubernetes/confidential/sev.bats | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integration/kubernetes/confidential/sev.bats b/integration/kubernetes/confidential/sev.bats index 6d1f8e638..9f515a8bb 100644 --- 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 } From b4d365d35bbd97deb22ffa7cf817cfdc96fad1f7 Mon Sep 17 00:00:00 2001 From: Ryan Savino Date: Wed, 30 Aug 2023 00:18:46 -0500 Subject: [PATCH 2/2] simple-kbs: update git tag for checkout to 'v0.1.3' The updated simple-kbs uses a openssl v3 supported rust docker image. Fixes: #5760 Signed-Off-By: Ryan Savino --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index ddeb72a78..82051d07d 100644 --- a/versions.yaml +++ b/versions.yaml @@ -72,7 +72,7 @@ externals: simple-kbs: description: "Simple KBS that hosts key storage with release policies" url: "https://github.com/confidential-containers/simple-kbs.git" - tag: "0.1.1" + tag: "v0.1.3" sonobuoy: description: "Tool to run kubernetes e2e conformance tests"