diff --git a/mcnp_performance_test.sh b/mcnp_performance_test.sh index e4463831193..278ee45e5ce 100644 --- a/mcnp_performance_test.sh +++ b/mcnp_performance_test.sh @@ -2,9 +2,6 @@ YAML_DIR="./mcnp_performance_test_yaml" - -MCNP_SELECTOR_PLACEHOLDER="" - NS_NAME_PREFIX="test-ns-" NS_LABEL_KEY="test-ns-label" POD_NAME_PREFIX="test-pod-" @@ -121,9 +118,9 @@ function setup_res { generate_server_pod_yaml generate_mcnp_yaml - kubectl apply -f ${YAML_DIR}/ns.yml --context $CLIENT_CLUSTER > /dev/null - kubectl apply -f ${YAML_DIR}/clientPod.yml --context $CLIENT_CLUSTER > /dev/null - kubectl apply -f ${YAML_DIR}/serverPod.yml --context $SERVER_CLUSTER > /dev/null + kubectl apply -f ${YAML_DIR}/ns.yml --context $CLIENT_CLUSTER + kubectl apply -f ${YAML_DIR}/clientPod.yml --context $CLIENT_CLUSTER + kubectl apply -f ${YAML_DIR}/serverPod.yml --context $SERVER_CLUSTER } function get_agent_names { @@ -142,11 +139,11 @@ function get_agent_names { function get_mc_controller_name { cluster_name=$1 - mc_controller_stdout=$(kubectl get po -l component=antrea-mc-controller -n kube-system --context "$cluster_name") + mc_controller_stdout=$(kubectl get po -l component=antrea-mc-controller -A --context "$cluster_name") readarray -t mc_controller_array <<< "$mc_controller_stdout" mc_controller_name_line=${mc_controller_array[1]} stringarray=(${mc_controller_name_line}) - echo "${stringarray[0]}" + echo "${stringarray[1]}" } function check_flows_installed { @@ -212,7 +209,6 @@ function get_label_res_exp_timestamps { target_log=$(kubectl logs -n kube-system "${client_mc_controller_name}" --context "${CLIENT_CLUSTER}" --timestamps --since_time "${time_since}" | grep "Create LabelIdentityResourceExport DONE!!!" | tail -1) end_timestamps=$(get_timestamps_from_log "$target_log") - echo "$end_timestamps" } @@ -336,6 +332,9 @@ function check_performance { leader_mc_controller_name=$(get_mc_controller_name "$LEADER_CLUSTER") client_mc_controller_name=$(get_mc_controller_name "$CLIENT_CLUSTER") server_mc_controller_name=$(get_mc_controller_name "$SERVER_CLUSTER") + echo "leader_mcctl name $leader_mc_controller_name" + echo "client_mcctl name $client_mc_controller_name" + echo "server_mcctl name $server_mc_controller_name" echo "====== START NO LABEL-IDENTITY SYNC CASE ======" no_label_sync_test echo "====== START WITH LABEL-IDENTITY SYNC CASE ======"