From 5ff0a6cd912acadfdba83b2d45f0ed03ed7ed5fe Mon Sep 17 00:00:00 2001 From: Jenny Li Date: Fri, 31 Dec 2021 08:45:21 +0800 Subject: [PATCH] Add - in case one release name include another releasename (#14646) Signed-off-by: Jenny Li --- tests/scripts/install_milvus.sh | 4 ++-- tests/scripts/uninstall_milvus.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/scripts/install_milvus.sh b/tests/scripts/install_milvus.sh index 063dab4154..c7dbfd568c 100755 --- a/tests/scripts/install_milvus.sh +++ b/tests/scripts/install_milvus.sh @@ -90,6 +90,6 @@ fi exitcode=$? # List pod list & pvc list before exit after helm install -kubectl get pods -n ${MILVUS_HELM_NAMESPACE} -o wide | grep ${MILVUS_HELM_RELEASE_NAME} -kubectl get pvc -n ${MILVUS_HELM_NAMESPACE} | grep ${MILVUS_HELM_RELEASE_NAME} | awk '{$3=null;print $0}' +kubectl get pods -n ${MILVUS_HELM_NAMESPACE} -o wide | grep "${MILVUS_HELM_RELEASE_NAME}-" +kubectl get pvc -n ${MILVUS_HELM_NAMESPACE} | grep "${MILVUS_HELM_RELEASE_NAME}-" | awk '{$3=null;print $0}' exit ${exitcode} diff --git a/tests/scripts/uninstall_milvus.sh b/tests/scripts/uninstall_milvus.sh index 3251f2e16d..2e30e18cd9 100755 --- a/tests/scripts/uninstall_milvus.sh +++ b/tests/scripts/uninstall_milvus.sh @@ -56,7 +56,7 @@ MILVUS_HELM_NAMESPACE="${MILVUS_HELM_NAMESPACE:-default}" if [[ -n "${RELEASE_NAME:-}" ]]; then MILVUS_HELM_RELEASE_NAME="${RELEASE_NAME}" # List pod list before uninstall - kubectl get pods -n ${MILVUS_HELM_NAMESPACE} -o wide | grep ${MILVUS_HELM_RELEASE_NAME} + kubectl get pods -n ${MILVUS_HELM_NAMESPACE} -o wide | grep "${MILVUS_HELM_RELEASE_NAME}-" fi