From 1a33987bbed1f79b7f947df2143807b2bdda71cd Mon Sep 17 00:00:00 2001 From: zhuwenxing Date: Tue, 2 Nov 2021 20:51:48 +0800 Subject: [PATCH] [skip ci]Fix helm reinstall in github action (#11075) Signed-off-by: zhuwenxing --- .github/workflows/pod-kill-chaos-test.yaml | 1 + tests/python_client/chaos/chaos_test.sh | 8 ++++++-- tests/python_client/chaos/scripts/install_milvus.sh | 6 +++--- tests/python_client/chaos/scripts/uninstall_milvus.sh | 7 ++++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pod-kill-chaos-test.yaml b/.github/workflows/pod-kill-chaos-test.yaml index 4c73094f8d..a4d5e78336 100644 --- a/.github/workflows/pod-kill-chaos-test.yaml +++ b/.github/workflows/pod-kill-chaos-test.yaml @@ -107,6 +107,7 @@ jobs: shell: bash working-directory: tests/python_client/chaos run: | + kubectl config set-context --current --namespace=chaos-testing bash scripts/uninstall_milvus.sh helm install --wait --timeout 360s milvus-chaos milvus/milvus -f cluster-values.yaml -n=chaos-testing kubectl get pods -n chaos-testing diff --git a/tests/python_client/chaos/chaos_test.sh b/tests/python_client/chaos/chaos_test.sh index 3df68d468f..997cb27a25 100644 --- a/tests/python_client/chaos/chaos_test.sh +++ b/tests/python_client/chaos/chaos_test.sh @@ -14,6 +14,10 @@ echo "platform: $platform" # define chaos testing object release=${1:-"milvus-chaos"} +ns=${2:-"chaos-testing"} + +# switch namespace +kubectl config set-context --current --namespace=${ns} pod="proxy" chaos_type="pod_failure" release="milvus-chaos" @@ -22,9 +26,9 @@ ns="chaos-testing" # install milvus cluster for chaos testing pushd ./scripts echo "uninstall milvus if exist" -bash uninstall_milvus.sh ${release}|| true +bash uninstall_milvus.sh ${release} ${ns}|| true echo "install milvus" -bash install_milvus.sh ${release} +bash install_milvus.sh ${release} ${ns} # if chaos_type is pod_failure, update replicas if [ "$chaos_type" == "pod_failure" ]; diff --git a/tests/python_client/chaos/scripts/install_milvus.sh b/tests/python_client/chaos/scripts/install_milvus.sh index bed4bae83f..584ff3e899 100644 --- a/tests/python_client/chaos/scripts/install_milvus.sh +++ b/tests/python_client/chaos/scripts/install_milvus.sh @@ -1,8 +1,8 @@ release=${1:-"milvs-chaos"} - -bash uninstall_milvus.sh ${release} || true +ns=${2:-"chaos-testing"} +bash uninstall_milvus.sh ${release} ${ns}|| true helm repo add milvus https://milvus-io.github.io/milvus-helm/ helm repo update -helm install --wait --timeout 360s ${release} milvus/milvus --set service.type=NodePort -f ../cluster-values.yaml -n=chaos-testing +helm install --wait --timeout 360s ${release} milvus/milvus --set service.type=NodePort -f ../cluster-values.yaml -n=${ns} diff --git a/tests/python_client/chaos/scripts/uninstall_milvus.sh b/tests/python_client/chaos/scripts/uninstall_milvus.sh index 22daa8995d..82e65c518f 100644 --- a/tests/python_client/chaos/scripts/uninstall_milvus.sh +++ b/tests/python_client/chaos/scripts/uninstall_milvus.sh @@ -1,6 +1,7 @@ set -e release=${1:-"milvus-chaos"} -helm uninstall ${release} -kubectl delete pvc -l release=${release} -kubectl delete pvc -l app.kubernetes.io/instance=${release} +ns=${2:-"chaos-testing"} +helm uninstall ${release} -n=${ns} +kubectl delete pvc -l release=${release} -n=${ns} +kubectl delete pvc -l app.kubernetes.io/instance=${release} -n=${ns}