From 49129b5f48d07e0a0177b871c2b7dbff0710d442 Mon Sep 17 00:00:00 2001 From: "andreas.dinauer" Date: Sat, 1 Nov 2025 21:08:40 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20Fix=20kubeconfig=20flag?= =?UTF-8?q?=20for=20logs=20and=20env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/dev/dinauer/LogResource.java | 2 +- src/main/java/dev/dinauer/PodResource.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/dev/dinauer/LogResource.java b/src/main/java/dev/dinauer/LogResource.java index 380daa9..ce82bd0 100644 --- a/src/main/java/dev/dinauer/LogResource.java +++ b/src/main/java/dev/dinauer/LogResource.java @@ -51,7 +51,7 @@ public class LogResource public List getLogs(Pod pod, LocalDateTime from) { - String command = String.format("kubectl logs %s -n %s --timestamps", pod.getMetadata().getName(), pod.getMetadata().getNamespace()); + String command = String.format("kubectl --kubeconfig=%s logs %s -n %s --timestamps", clientProvider.pathToKubeconfig(), pod.getMetadata().getName(), pod.getMetadata().getNamespace()); List result = new ArrayList<>(); List logs = processRunner.runToLines(command); for (String log : logs) diff --git a/src/main/java/dev/dinauer/PodResource.java b/src/main/java/dev/dinauer/PodResource.java index 0226eaa..fa733d5 100644 --- a/src/main/java/dev/dinauer/PodResource.java +++ b/src/main/java/dev/dinauer/PodResource.java @@ -28,6 +28,9 @@ public class PodResource @Inject ProcessRunner processRunner; + @Inject + ClientProvider clientProvider; + @GET @Produces(MediaType.APPLICATION_JSON) @Consumes @@ -41,7 +44,7 @@ public class PodResource private List getVars(Pod pod) { List result = new ArrayList<>(); - List lines = processRunner.runToLines(String.format("kubectl exec -it %s -n %s -- env", pod.getMetadata().getName(), pod.getMetadata().getNamespace())); + List lines = processRunner.runToLines(String.format("kubectl --kubeconfig=%s exec -it %s -n %s -- env", clientProvider.pathToKubeconfig(), pod.getMetadata().getName(), pod.getMetadata().getNamespace())); for (String line : lines) { int indexOfFirstEquals = line.indexOf("=");