@@ -720,11 +720,15 @@ run_mongo() {
720
720
local suffix=${4:- .svc.cluster.local}
721
721
local client_container=$( kubectl_bin get pods --selector=name=psmdb-client -o ' jsonpath={.items[].metadata.name}' )
722
722
local mongo_flag=" $5 "
723
- local replica_set=$( echo " $uri " | sed -r ' s/.*\-(rs[0-9]|cfg)(\.|-).*/\1/' )
724
-
725
- kubectl_bin exec ${client_container} -- \
726
- bash -c " printf '$command \n' | mongo $driver ://$uri$suffix /admin?ssl=false\&replicaSet=$replica_set $mongo_flag "
723
+ local replica_set=$( echo " $uri " | grep -oE ' \-(rs[0-9]|cfg)(\.|-)' | sed ' s/^.//;s/.$//' | head -n1)
727
724
725
+ if [[ ${FUNCNAME[1]} == " collect_k8s_logs" ]]; then
726
+ kubectl exec ${client_container} -- \
727
+ bash -c " printf '$command \n' | mongo $driver ://$uri$suffix /admin?ssl=false\&replicaSet=$replica_set $mongo_flag "
728
+ else
729
+ kubectl_bin exec ${client_container} -- \
730
+ bash -c " printf '$command \n' | mongo $driver ://$uri$suffix /admin?ssl=false\&replicaSet=$replica_set $mongo_flag "
731
+ fi
728
732
}
729
733
730
734
run_mongo_tls () {
@@ -734,11 +738,15 @@ run_mongo_tls() {
734
738
local suffix=${4:- .svc.cluster.local}
735
739
local client_container=$( kubectl_bin get pods --selector=name=psmdb-client -o ' jsonpath={.items[].metadata.name}' )
736
740
local mongo_flag=" $5 "
737
- local replica_set=$( echo " $uri " | sed -r ' s/.*\-(rs[0-9]|cfg)(\.|-).*/\1/' )
738
-
739
- kubectl_bin exec ${client_container} -- \
740
- bash -c " printf '$command \n' | mongo $driver ://$uri$suffix /admin?replicaSet=$replica_set --tls --tlsCAFile /etc/mongodb-ssl/ca.crt --tlsCertificateKeyFile /tmp/tls.pem --tlsAllowInvalidHostnames $mongo_flag "
741
+ local replica_set=$( echo " $uri " | grep -oE ' \-(rs[0-9]|cfg)(\.|-)' | sed ' s/^.//;s/.$//' | head -n1)
741
742
743
+ if [[ ${FUNCNAME[1]} == " collect_k8s_logs" ]]; then
744
+ kubectl exec ${client_container} -- \
745
+ bash -c " printf '$command \n' | mongo $driver ://$uri$suffix /admin?replicaSet=$replica_set --tls --tlsCAFile /etc/mongodb-ssl/ca.crt --tlsCertificateKeyFile /tmp/tls.pem --tlsAllowInvalidHostnames $mongo_flag "
746
+ else
747
+ kubectl_bin exec ${client_container} -- \
748
+ bash -c " printf '$command \n' | mongo $driver ://$uri$suffix /admin?replicaSet=$replica_set --tls --tlsCAFile /etc/mongodb-ssl/ca.crt --tlsCertificateKeyFile /tmp/tls.pem --tlsAllowInvalidHostnames $mongo_flag "
749
+ fi
742
750
}
743
751
744
752
run_mongos () {
@@ -1372,7 +1380,7 @@ collect_k8s_logs() {
1372
1380
for com in " ${command[@]} " ; do
1373
1381
echo " ##### START: ${com} #####" >> ${logs_path} /mongodb_${psmdb_name} _${psmdb_replset} .mongo
1374
1382
run_mongo " ${com} " " ${psmdb_user} :${psmdb_pass} @${psmdb_name} -${psmdb_replset} .${namespace} " >> ${logs_path} /mongodb_${psmdb_name} _${psmdb_replset} .mongo
1375
- echo -e " ##### END: ${com} #####\n" >> ${logs_path} /mongodb_${psmdb_name} _${psmdb_replset} .mongo
1383
+ echo -e " ##### END: ${com} #####\n" >> ${logs_path} /mongodb_${psmdb_name} _${psmdb_replset} .mongo
1376
1384
done
1377
1385
done
1378
1386
done
0 commit comments