Skip to content

Fix: Kubernetes computer container logs #1711

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Kubernetes computer container logs #1711

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesComputer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public void doContainerLog(@QueryParameter String containerId, StaplerRequest2 r
if (slave != null) {
KubernetesCloud cloud = slave.getKubernetesCloud();
String namespace = StringUtils.defaultIfBlank(slave.getNamespace(), cloud.getNamespace());
PodResource resource = cloud.getPodResource(namespace, containerId);
PodResource resource = cloud.getPodResource(namespace, slave.getPodName());

// check if pod exists
Pod pod = resource.get();
Expand All @@ -158,29 +158,22 @@ public void doContainerLog(@QueryParameter String containerId, StaplerRequest2 r
return;
}

// Check if container exists and is running (maybe terminated if ephemeral)
// Check if container exists (ephemeral containers are not included)
Optional<ContainerStatus> status = PodContainerSource.lookupContainerStatus(pod, containerId);
if (status.isPresent()) {
ContainerStatus cs = status.get();
if (cs.getState().getTerminated() != null) {
outputStream.write("Container terminated".getBytes(StandardCharsets.UTF_8));
text.markAsComplete();
text.doProgressText(req, rsp);
return;
}
} else {
if (!status.isPresent()) {
outputStream.write("Container not found".getBytes(StandardCharsets.UTF_8));
text.markAsComplete();
text.doProgressText(req, rsp);
return;
}

// Get logs
try (LogWatch ignore =
resource.inContainer(containerId).tailingLines(20).watchLog(outputStream)) {
// Get logs, the state of the container should not matter
try (LogWatch ignore = resource.inContainer(containerId).watchLog(outputStream)) {
// without Thread.sleep logs are not shown
Thread.sleep(5000L);
text.doProgressText(req, rsp);
} catch (KubernetesClientException kce) {
LOGGER.log(Level.WARNING, "Failed getting container logs for " + containerId, kce);
} catch (KubernetesClientException | InterruptedException e) {
LOGGER.log(Level.WARNING, "Failed getting container logs for " + containerId, e);
}
} else {
outputStream.write("Node not available".getBytes(StandardCharsets.UTF_8));
Expand Down