From 240f517272cd835ed4b20023b70113c993faf84e Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Mon, 23 Dec 2024 10:30:59 -0500 Subject: [PATCH 1/2] targetplatform: update dependencies --- targetplatform/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml index e462491769..9a6e150aa1 100644 --- a/targetplatform/pom.xml +++ b/targetplatform/pom.xml @@ -67,9 +67,9 @@ 4.5.11 2.9.3 0.5.4 - 2.17.0 + 2.18.2 1.0.39 - 2.17.0 + 2.18.2 1.2.0 1.3.2 1 @@ -120,8 +120,8 @@ 1.13.0 2.3.2 0.9.0.M2 - 2.0.11 - 2.2 + 2.0.16 + 2.3 2.8.0 1.0.2 2.0.1 From 1238a6ee907bcea11625de12615e380109b274b2 Mon Sep 17 00:00:00 2001 From: Ivan Bodrov Date: Mon, 23 Dec 2024 10:31:28 -0500 Subject: [PATCH 2/2] agent-operator: update kubernetes-client to 7.x --- agent-operator/pom.xml | 4 -- .../concord/agentoperator/PodUtils.java | 72 ------------------- .../agentoperator/crd/AgentPoolList.java | 4 +- .../planner/DeleteConfigMapChange.java | 3 +- targetplatform/pom.xml | 7 +- 5 files changed, 5 insertions(+), 85 deletions(-) diff --git a/agent-operator/pom.xml b/agent-operator/pom.xml index 069efa5f4d..8104a8781d 100644 --- a/agent-operator/pom.xml +++ b/agent-operator/pom.xml @@ -33,10 +33,6 @@ io.fabric8 kubernetes-client - - io.fabric8 - kubernetes-model - io.fabric8 kubernetes-model-apiextensions diff --git a/agent-operator/src/main/java/com/walmartlabs/concord/agentoperator/PodUtils.java b/agent-operator/src/main/java/com/walmartlabs/concord/agentoperator/PodUtils.java index 97aa095846..183e2e40c2 100644 --- a/agent-operator/src/main/java/com/walmartlabs/concord/agentoperator/PodUtils.java +++ b/agent-operator/src/main/java/com/walmartlabs/concord/agentoperator/PodUtils.java @@ -23,41 +23,15 @@ import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; -import io.fabric8.kubernetes.client.dsl.ExecListener; -import io.fabric8.kubernetes.client.dsl.ExecWatch; -import okhttp3.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.ByteArrayOutputStream; import java.util.Map; -import java.util.concurrent.CountDownLatch; public final class PodUtils { private static final Logger log = LoggerFactory.getLogger(PodUtils.class); - public static Output exec(KubernetesClient client, String podName, String containerName, String... cmd) { - ByteArrayOutputStream stdout = new ByteArrayOutputStream(); - ByteArrayOutputStream stderr = new ByteArrayOutputStream(); - - Listener l = new Listener(); - try (ExecWatch w = client.pods().withName(podName) - .inContainer(containerName) - .writingOutput(stdout) - .writingError(stderr) - .usingListener(l) - .exec(cmd)) { - - l.await(); - } catch (Exception e) { - log.error("exec ['{}', '{}'] -> error while executing '{}': {}", podName, containerName, cmd, e.getMessage()); - throw e; - } - - return new Output(stdout.toString(), stderr.toString()); - } - public static void applyTag(KubernetesClient client, String podName, String tagName, String tagValue) { Pod pod = client.pods().withName(podName).get(); if (pod == null) { @@ -81,52 +55,6 @@ public static void applyTag(KubernetesClient client, String podName, String tagN } } - public static class Output { - - private final String stdout; - private final String stderr; - - private Output(String stdout, String stderr) { - this.stdout = stdout; - this.stderr = stderr; - } - - public String getStdout() { - return stdout; - } - - public String getStderr() { - return stderr; - } - } - - private static class Listener implements ExecListener { - - private final CountDownLatch latch = new CountDownLatch(1); - - @Override - public void onOpen(Response response) { - } - - @Override - public void onFailure(Throwable t, Response response) { - latch.countDown(); - } - - @Override - public void onClose(int code, String reason) { - latch.countDown(); - } - - public void await() { - try { - latch.await(); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - } - } - private PodUtils() { } } diff --git a/agent-operator/src/main/java/com/walmartlabs/concord/agentoperator/crd/AgentPoolList.java b/agent-operator/src/main/java/com/walmartlabs/concord/agentoperator/crd/AgentPoolList.java index cf5e7e152e..fc7b413ea0 100644 --- a/agent-operator/src/main/java/com/walmartlabs/concord/agentoperator/crd/AgentPoolList.java +++ b/agent-operator/src/main/java/com/walmartlabs/concord/agentoperator/crd/AgentPoolList.java @@ -20,8 +20,8 @@ * ===== */ -import io.fabric8.kubernetes.client.CustomResourceList; +import io.fabric8.kubernetes.api.model.DefaultKubernetesResourceList; -public class AgentPoolList extends CustomResourceList { +public class AgentPoolList extends DefaultKubernetesResourceList { } diff --git a/agent-operator/src/main/java/com/walmartlabs/concord/agentoperator/planner/DeleteConfigMapChange.java b/agent-operator/src/main/java/com/walmartlabs/concord/agentoperator/planner/DeleteConfigMapChange.java index 2c956608ba..02231d1805 100644 --- a/agent-operator/src/main/java/com/walmartlabs/concord/agentoperator/planner/DeleteConfigMapChange.java +++ b/agent-operator/src/main/java/com/walmartlabs/concord/agentoperator/planner/DeleteConfigMapChange.java @@ -36,7 +36,8 @@ public DeleteConfigMapChange(String configMapName) { @Override public void apply(KubernetesClient client) { - if (client.configMaps().withName(configMapName).delete()) { + var result = client.configMaps().withName(configMapName).delete(); + if (!result.isEmpty()) { // wait till it's actually removed while (client.configMaps().withName(configMapName).get() != null) { try { diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml index 9a6e150aa1..ad12100542 100644 --- a/targetplatform/pom.xml +++ b/targetplatform/pom.xml @@ -91,7 +91,7 @@ 5.9.1 2.4.0 2.0.1 - 5.7.0 + 7.0.1 0.128 4.29.2 1.4.14 @@ -1101,11 +1101,6 @@ commons-collections ${commons.collections.version} - - io.fabric8 - kubernetes-model - ${kubernetes.client.version} - io.fabric8 kubernetes-model-common