tests/e2e: update flags for 'get kubeconfig'

tests/common.sh

@@ -61,7 +61,7 @@ check_url() {
 check_clusters() {
   [ -n "$EXE" ] || abort "EXE is not defined"
   for c in "$@" ; do
-    $EXE get kubeconfig "$c" --default-kubeconfig --switch
+    $EXE get kubeconfig "$c" --merge-default-kubeconfig --switch-context
     if kubectl cluster-info ; then
       passed "cluster $c is reachable"
     else
@@ -87,7 +87,7 @@ check_cluster_count() {
 check_multi_node() {
   cluster=$1
   expectedNodeCount=$2
-  $EXE get kubeconfig "$cluster" --default-kubeconfig --switch
+  $EXE get kubeconfig "$cluster" --merge-default-kubeconfig --switch-context
   nodeCount=$(kubectl get nodes -o=custom-columns=NAME:.metadata.name --no-headers | wc -l)
   if [[ $nodeCount == $expectedNodeCount ]]; then
     passed "cluster $cluster has $expectedNodeCount nodes, as expected"