Skip to content

Commit b879006

Browse files
authored
RED-65817 - Fix collecting container logs from pod in log collector for win os. (#203)
1 parent 5630bb8 commit b879006

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

log_collector/log_collector.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,12 @@ def collect_pods_logs(namespace, output_dir):
388388

389389
make_dir(logs_dir)
390390
for pod in pods:
391-
for container in get_list_of_containers_from_pod(namespace, pod):
391+
containers = get_list_of_containers_from_pod(namespace, pod)
392+
if containers is None:
393+
logger.warning("Namespace '%s' Could not get containers for pod: %s list - "
394+
"skipping pods logs collection", namespace, pod)
395+
continue
396+
for container in containers:
392397
cmd = "kubectl logs -c {} -n {} {}" \
393398
.format(container, namespace, pod)
394399
with open(os.path.join(logs_dir, "{}.log".format(f'{pod}-{container}')),
@@ -457,7 +462,7 @@ def get_list_of_containers_from_pod(namespace, pod_name):
457462
if return_code:
458463
logger.warning("Failed to get pods: %s", out)
459464
return None
460-
return out.split()
465+
return out.replace("'", "").split()
461466

462467

463468
def get_pod_names(namespace, selector=""):

0 commit comments

Comments
 (0)