From 58f88070a4db2422270615e0fdd3575db4e326b7 Mon Sep 17 00:00:00 2001 From: shanwb Date: Fri, 12 Jan 2024 10:17:35 +0800 Subject: [PATCH] fix: k8s plugin #773 (#774) * fix mvc request method (#749) * fix: license pom #773 --- .../docean-plugin/docean-plugin-k8s/pom.xml | 11 ++-- .../run/mone/docean/plugin/k8s/K8sPlugin.java | 52 ++++++++----------- .../mone/docean/plugin/k8s/test/K8sTest.java | 6 +-- 3 files changed, 30 insertions(+), 39 deletions(-) diff --git a/jcommon/docean-plugin/docean-plugin-k8s/pom.xml b/jcommon/docean-plugin/docean-plugin-k8s/pom.xml index ad1a7eb66..5870c00be 100644 --- a/jcommon/docean-plugin/docean-plugin-k8s/pom.xml +++ b/jcommon/docean-plugin/docean-plugin-k8s/pom.xml @@ -10,6 +10,7 @@ 4.0.0 docean-plugin-k8s + 1.4.0-v1-SNAPSHOT 8 @@ -29,11 +30,11 @@ kubernetes-client ${version.fabric8.client} - - io.kubernetes - client-java - 15.0.1 - + + + + + diff --git a/jcommon/docean-plugin/docean-plugin-k8s/src/main/java/run/mone/docean/plugin/k8s/K8sPlugin.java b/jcommon/docean-plugin/docean-plugin-k8s/src/main/java/run/mone/docean/plugin/k8s/K8sPlugin.java index 22f27a0ec..7e5979022 100644 --- a/jcommon/docean-plugin/docean-plugin-k8s/src/main/java/run/mone/docean/plugin/k8s/K8sPlugin.java +++ b/jcommon/docean-plugin/docean-plugin-k8s/src/main/java/run/mone/docean/plugin/k8s/K8sPlugin.java @@ -33,14 +33,12 @@ import io.fabric8.kubernetes.api.model.batch.v1.JobList; import io.fabric8.kubernetes.client.DefaultKubernetesClient; import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.kubernetes.client.dsl.ExecWatch; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.informers.ResourceEventHandler; import io.fabric8.kubernetes.client.informers.SharedIndexInformer; import io.fabric8.kubernetes.client.informers.SharedInformerFactory; -import io.kubernetes.client.Exec; -import io.kubernetes.client.openapi.ApiClient; import io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler; -import io.kubernetes.client.util.Streams; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -60,14 +58,10 @@ public class K8sPlugin implements IPlugin { private KubernetesClient client; - private static final ApiClient cli; + private static final KubernetesClient DEFAULT_CLIENT; static { - try { - cli = io.kubernetes.client.util.Config.defaultClient(); - } catch (IOException e) { - throw new RuntimeException(e); - } + DEFAULT_CLIENT = new DefaultKubernetesClient(); } /** @@ -162,27 +156,23 @@ public boolean start(Ioc ioc) { } @SneakyThrows - private static Pair execContainer(String ns, String name, String container, String[] command) { - final Process proc = new Exec(cli).exec(ns, name, command, container, false, false); - ByteArrayOutputStream sb = new ByteArrayOutputStream(); - Thread out = - new Thread( - () -> { - try { - Streams.copy(proc.getInputStream(), sb); - } catch (IOException ex) { - ex.printStackTrace(); - } - }); - out.start(); - - proc.waitFor(); - - // wait for any last output; no need to wait for input thread - out.join(); - - proc.destroy(); - return Pair.of(proc.exitValue(), sb.toString()); + private static Pair execContainer(KubernetesClient client, String ns, String name, String container, String[] command) { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + ByteArrayOutputStream error = new ByteArrayOutputStream(); + try (ExecWatch execWatch = client.pods().inNamespace(ns).withName(name) + .inContainer(container) + .writingOutput(out) + .writingError(error) + .exec(command)) { + // 等待命令执行完成 + execWatch.close(); + } + // 返回执行结果 + String result = out.toString(); + System.out.println("result:" + result); + // 这里没有直接的退出值，你可能需要根据输出结果来判断命令是否成功执行 + return Pair.of(0, result); + } @SneakyThrows @@ -190,7 +180,7 @@ public static Pair KillContainer(String ns, String name, String String[] shs = new String[]{"bash", "ash", "sh"}; Pair end = null; for (String sh : shs) { - end = execContainer(ns, name, container, new String[]{sh, "-c", "trap \"exit\" SIGINT SIGTERM ; kill -s SIGINT 1"}); + end = execContainer(DEFAULT_CLIENT, ns, name, container, new String[]{sh, "-c", "trap \"exit\" SIGINT SIGTERM ; kill -s SIGINT 1"}); if (end.getKey().equals(0)) { break; } diff --git a/jcommon/docean-plugin/docean-plugin-k8s/src/test/java/run/mone/docean/plugin/k8s/test/K8sTest.java b/jcommon/docean-plugin/docean-plugin-k8s/src/test/java/run/mone/docean/plugin/k8s/test/K8sTest.java index 4ac21a805..36197f14e 100644 --- a/jcommon/docean-plugin/docean-plugin-k8s/src/test/java/run/mone/docean/plugin/k8s/test/K8sTest.java +++ b/jcommon/docean-plugin/docean-plugin-k8s/src/test/java/run/mone/docean/plugin/k8s/test/K8sTest.java @@ -36,8 +36,8 @@ public void testCrd() { @SneakyThrows @Test public void testKill() { - String podName = "wangzhidong1-nacostestclient-930391-f44c9db7d-zxnb2"; - String namespace = "wangzhidong1"; - K8sPlugin.KillContainer(namespace,podName,"toolbox"); + String podName = "kibana-7f5fb9c49b-4gzck"; + String namespace = "xxx"; + K8sPlugin.KillContainer(namespace, podName,"kibana"); } }