Merge pull request #132 from TommyLike/bug/fix_log_issue

Fix log tailed issue
volcano-sh · May 7, 2019 · d59fc36 · d59fc36
2 parents fdc8886 + 5efe4be
commit d59fc36
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/hack/run-e2e-kind.sh b/hack/run-e2e-kind.sh
@@ -7,12 +7,12 @@ export SHOW_VOLCANO_LOGS=${SHOW_VOLCANO_LOGS:-1}
 export CLEANUP_CLUSTER=${CLEANUP_CLUSTER:-1}
 export MPI_EXAMPLE_IMAGE=${MPI_EXAMPLE_IMAGE:-"volcanosh/example-mpi:0.0.1"}
 
-if [[ "${CLUSTER_NAME}xxx" != "xxx" ]];then
-  export CLUSTER_CONTEXT="--name ${CLUSTER_NAME}"
-else
-  export CLUSTER_CONTEXT="--name integration"
+if [[ "${CLUSTER_NAME}xxx" == "xxx" ]];then
+    CLUSTER_NAME="integration"
 fi
 
+export CLUSTER_CONTEXT="--name ${CLUSTER_NAME}"
+
 export KIND_OPT=${KIND_OPT:=" --config ${VK_ROOT}/hack/e2e-kind-config.yaml"}
 
 # check if kind installed
@@ -76,9 +76,9 @@ function uninstall-volcano {
 
 function generate-log {
     echo "Generating volcano log files"
-    kubectl logs -lapp=volcano-admission -n kube-system > volcano-admission.log
-    kubectl logs -lapp=volcano-controller -n kube-system > volcano-controller.log
-    kubectl logs -lapp=volcano-scheduler -n kube-system > volcano-scheduler.log
+    kubectl logs deployment/${CLUSTER_NAME}-admission -n kube-system > volcano-admission.log
+    kubectl logs deployment/${CLUSTER_NAME}-controllers -n kube-system > volcano-controller.log
+    kubectl logs deployment/${CLUSTER_NAME}-scheduler -n kube-system > volcano-scheduler.log
 }
 
 # clean up