Skip to content

Commit d34bb06

Browse files
committed
Fix namespace in collect_k8s_logs function
1 parent 7aba7ae commit d34bb06

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

e2e-tests/functions

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,8 +1325,9 @@ collect_k8s_logs() {
13251325
if [[ ${ENABLE_LOG_COLLECT} == "true" ]]; then
13261326
local check_namespaces="${namespace}${OPERATOR_NS:+ $OPERATOR_NS}"
13271327
local logs_path="${logs_dir}/${test_name}"
1328+
13281329
rm -rf ${logs_path} || :
1329-
mkdir -p $logs_path
1330+
mkdir -p ${logs_path}
13301331

13311332
for ns in ${check_namespaces}; do
13321333
local pods=$(kubectl_bin get pods -n "${ns}" -o name | awk -F "/" '{print $2}')
@@ -1340,11 +1341,11 @@ collect_k8s_logs() {
13401341
done
13411342
done
13421343
for object in psmdb psmdb-backup psmdb-restore pods deployments services events sts; do
1343-
echo "##### START: ${ns}: ${object} #####" >>${logs_path}/_overview_${ns}.txt
1344-
kubectl_bin get ${object} -n "${ns}" >>${logs_path}/_overview_${ns}.txt || :
1345-
echo -e "##### END: ${ns}: ${object} ####\n" >>${logs_path}/_overview_${ns}.txt
1346-
kubectl_bin get ${object} -n "${ns}" -oyaml >${logs_path}/${object}_${ns}.yaml || :
1347-
kubectl_bin describe ${object} -n "${ns}" >${logs_path}/${object}_${ns}.dsc || :
1344+
echo "##### START: NS: ${namespace} - OBJ: ${object} #####" >>${logs_path}/_overview_${namespace}.txt
1345+
kubectl_bin get ${object} -n "${namespace}" >>${logs_path}/_overview_${namespace}.txt || :
1346+
echo -e "##### END: NS: ${namespace} - OBJ: ${object} ####\n" >>${logs_path}/_overview_${namespace}.txt
1347+
kubectl_bin get ${object} -n "${namespace}" -oyaml >${logs_path}/${object}_${namespace}.yaml || :
1348+
kubectl_bin describe ${object} -n "${namespace}" >${logs_path}/${object}_${namespace}.dsc || :
13481349
done
13491350
fi
13501351
}

e2e-tests/monitoring-2-0/run

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ if [[ -n ${OPENSHIFT} ]]; then
151151
fi
152152

153153
if [[ $(kubectl_bin logs monitoring-rs0-0 pmm-client | grep -c 'cannot auto discover databases and collections') != 0 ]]; then
154+
collect_k8s_logs
154155
echo "error: cannot auto discover databases and collections"
155156
exit 1
156157
fi

0 commit comments

Comments
 (0)