This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new b472326fe89 [CAMEL-21386] camel k8s run --dev does not work on
openshift (#16091)
b472326fe89 is described below
commit b472326fe898cef26b0c704f968ee43707738ea3
Author: Thomas Diesler <[email protected]>
AuthorDate: Mon Oct 28 09:27:51 2024 +0100
[CAMEL-21386] camel k8s run --dev does not work on openshift (#16091)
---
.../core/commands/action/CamelThreadDump.java | 2 +-
.../camel/dsl/jbang/core/common/PluginHelper.java | 2 +-
.../core/commands/kubernetes/KubernetesDelete.java | 7 +-
.../core/commands/kubernetes/KubernetesExport.java | 1 -
.../core/commands/kubernetes/KubernetesHelper.java | 37 +++----
.../core/commands/kubernetes/KubernetesRun.java | 121 +++++++++++++--------
.../jbang/core/commands/kubernetes/PodLogs.java | 94 ++++++++++++----
.../core/commands/kubernetes/PodLogsTest.java | 4 +-
8 files changed, 171 insertions(+), 97 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java
index d5666ded944..5bd19d7b36e 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java
@@ -148,7 +148,7 @@ public class CamelThreadDump extends ActionWatchCommand {
if (!rows.isEmpty()) {
int total = jo.getInteger("threadCount");
int peak = jo.getInteger("peakThreadCount");
- printer().printf("PID: %s\tThreads: %d\tPeak: %d\t\tDisplay:
%d/%d\n", pid, total, peak, rows.size(), total);
+ printer().printf("PID: %s\tThreads: %d\tPeak: %d\t\tDisplay:
%d/%d%n", pid, total, peak, rows.size(), total);
if (depth == 1) {
singleTable(rows);
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
index fbe0af60b29..fe9e504aa15 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/PluginHelper.java
@@ -157,7 +157,7 @@ public final class PluginHelper {
instance =
Optional.of(Plugin.class.cast(ObjectHelper.newInstance(pluginClass)));
} else {
String gav = String.join(":", group, "camel-jbang-plugin-" +
command, version);
- main.getOut().printf(String.format("ERROR: Failed to read file
%s in dependency %s.\n", path, gav));
+ main.getOut().printf(String.format("ERROR: Failed to read file
%s in dependency %s%n", path, gav));
}
} catch (IOException e) {
throw new RuntimeCamelException(String.format("Failed to read the
file %s.", path), e);
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesDelete.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesDelete.java
index a5c44169177..226f050adb1 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesDelete.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesDelete.java
@@ -44,6 +44,10 @@ public class KubernetesDelete extends KubernetesBaseCommand {
description = "The working directory where to find
exported project sources.")
String workingDir;
+ @CommandLine.Option(names = { "--cluster-type" },
+ description = "The target cluster type. Special
configurations may be applied to different cluster types such as Kind or
Minikube or Openshift.")
+ protected String clusterType;
+
public KubernetesDelete(CamelJBangMain main) {
super(main);
}
@@ -71,7 +75,8 @@ public class KubernetesDelete extends KubernetesBaseCommand {
return 1;
}
- File manifest = KubernetesHelper.resolveKubernetesManifest(new
File(resolvedWorkingDir, "target/kubernetes"));
+ File resolvedManifestDir = new File(resolvedWorkingDir,
"target/kubernetes");
+ File manifest =
KubernetesHelper.resolveKubernetesManifest(clusterType, resolvedManifestDir);
try (FileInputStream fis = new FileInputStream(manifest)) {
List<StatusDetails> status;
if (!ObjectHelper.isEmpty(namespace)) {
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
index 2592180d42d..5833f6787b6 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
@@ -121,7 +121,6 @@ public class KubernetesExport extends Export {
public KubernetesExport(CamelJBangMain main, String[] files) {
super(main);
-
this.files = Arrays.asList(files);
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesHelper.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesHelper.java
index cded9c86802..976de6a4ae3 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesHelper.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesHelper.java
@@ -76,7 +76,7 @@ public final class KubernetesHelper {
public static KubernetesClient getKubernetesClient() {
if (kubernetesClient == null) {
kubernetesClient = new KubernetesClientBuilder().build();
- printVersionInfo(kubernetesClient);
+ printClientInfo(kubernetesClient);
}
return kubernetesClient;
@@ -91,11 +91,11 @@ public final class KubernetesHelper {
}
var client = new KubernetesClientBuilder().withConfig(config).build();
- printVersionInfo(client);
+ printClientInfo(client);
return clients.put(config, client);
}
- private static void printVersionInfo(KubernetesClient client) {
+ private static void printClientInfo(KubernetesClient client) {
var printer = CommandHelper.GetPrinter();
if (printer != null) {
var serverUrl = client.getConfiguration().getMasterUrl();
@@ -160,29 +160,23 @@ public final class KubernetesHelper {
return json().convertValue(model, Map.class);
}
- public static File resolveKubernetesManifest(String workingDir) throws
FileNotFoundException {
- return resolveKubernetesManifest(new File(workingDir));
+ public static File resolveKubernetesManifest(String clusterType, String
workingDir) throws FileNotFoundException {
+ return resolveKubernetesManifest(clusterType, new File(workingDir));
}
- public static File resolveKubernetesManifest(String workingDir, String
extension) throws FileNotFoundException {
- return resolveKubernetesManifest(new File(workingDir), extension);
+ public static File resolveKubernetesManifest(String clusterType, String
workingDir, String extension)
+ throws FileNotFoundException {
+ return resolveKubernetesManifest(clusterType, new File(workingDir),
extension);
}
- public static File resolveKubernetesManifest(File workingDir) throws
FileNotFoundException {
- return resolveKubernetesManifest(workingDir, "yml");
+ public static File resolveKubernetesManifest(String clusterType, File
workingDir) throws FileNotFoundException {
+ return resolveKubernetesManifest(clusterType, workingDir, "yml");
}
- public static File resolveKubernetesManifest(File workingDir, String
extension) throws FileNotFoundException {
+ public static File resolveKubernetesManifest(String clusterType, File
workingDir, String extension)
+ throws FileNotFoundException {
- // Try explicit Kubernetes manifest first
- String clusterType = ClusterType.KUBERNETES.name();
- File manifest = getKubernetesManifest(clusterType, workingDir,
extension);
- if (manifest.exists()) {
- return manifest;
- }
-
- // Try arbitrary Kubernetes manifest first
- manifest = getKubernetesManifest(clusterType, workingDir);
+ var manifest = getKubernetesManifest(clusterType, workingDir);
if (manifest.exists()) {
return manifest;
}
@@ -192,8 +186,8 @@ public final class KubernetesHelper {
.formatted(extension, workingDir.toPath().toString()));
}
- public static String getPodPhase(Pod it) {
- return it != null ? it.getStatus().getPhase() : "Unknown";
+ public static String getPodPhase(Pod pod) {
+ return Optional.ofNullable(pod).map(p ->
p.getStatus().getPhase()).orElse("Unknown");
}
public static File getKubernetesManifest(String clusterType, String
workingDir) {
@@ -211,7 +205,6 @@ public final class KubernetesHelper {
} else {
manifestFile =
Optional.ofNullable(clusterType).map(String::toLowerCase).orElse("kubernetes");
}
-
return new File(workingDir, "%s.%s".formatted(manifestFile,
extension));
}
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
index 4e9606b8556..5dbe9ca87f6 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
@@ -238,8 +238,12 @@ public class KubernetesRun extends KubernetesBaseCommand {
description = "Maven/Gradle build properties, ex.
--build-property=prop1=foo")
List<String> buildProperties = new ArrayList<>();
- CamelContext reloadContext;
- int reloadCount;
+ // DevMode/Reload state
+ private CamelContext devModeContext;
+ private Thread devModeShutdownTask;
+ private int devModeReloadCount;
+
+ private PodLogs reusablePodLogs;
public KubernetesRun(CamelJBangMain main) {
super(main);
@@ -272,9 +276,10 @@ public class KubernetesRun extends KubernetesBaseCommand {
File manifest;
switch (output) {
case "yaml" ->
- manifest =
KubernetesHelper.resolveKubernetesManifest(workingDir + "/target/kubernetes");
+ manifest =
KubernetesHelper.resolveKubernetesManifest(clusterType, workingDir +
"/target/kubernetes");
case "json" ->
- manifest =
KubernetesHelper.resolveKubernetesManifest(workingDir + "/target/kubernetes",
"json");
+ manifest =
KubernetesHelper.resolveKubernetesManifest(clusterType, workingDir +
"/target/kubernetes",
+ "json");
default -> {
printer().printf("Unsupported output format '%s'
(supported: yaml, json)%n", output);
return 1;
@@ -304,7 +309,6 @@ public class KubernetesRun extends KubernetesBaseCommand {
if (dev || logs) {
startPodLogging(projectName);
- printer().println("Stopped pod logging!");
}
return 0;
@@ -312,8 +316,8 @@ public class KubernetesRun extends KubernetesBaseCommand {
private String getIndexedWorkingDir(String projectName) {
var workingDir = RUN_PLATFORM_DIR + "/" + projectName;
- if (reloadCount > 0) {
- workingDir += "-%03d".formatted(reloadCount);
+ if (devModeReloadCount > 0) {
+ workingDir += "-%03d".formatted(devModeReloadCount);
}
return workingDir;
}
@@ -393,50 +397,79 @@ public class KubernetesRun extends KubernetesBaseCommand {
FileWatcherResourceReloadStrategy reloadStrategy = new
FileWatcherResourceReloadStrategy(watchDir);
reloadStrategy.setResourceReload((name, resource) -> {
- reloadCount += 1;
- reloadContext.close();
- printer().printf("Reloading project due to file change: %s%n",
FileUtil.stripPath(name));
- String reloadWorkingDir = getIndexedWorkingDir(projectName);
- KubernetesExport export = configureExport(reloadWorkingDir);
- int exit = export.export();
- if (exit != 0) {
- printer().printf("Project reexport failed for: %s%n",
reloadWorkingDir);
- return;
- }
- exit = deployProject(reloadWorkingDir, true);
- if (exit != 0) {
- printer().printf("Project redeploy failed for: %s%n",
reloadWorkingDir);
- return;
- }
- if (dev || wait || logs) {
- waitForRunningPod(projectName);
- }
- if (dev) {
+ synchronized (this) {
+
+ printer().printf("Reloading project due to file change: %s%n",
FileUtil.stripPath(name));
+
+ String currentWorkingDir = getIndexedWorkingDir(projectName);
+ devModeReloadCount += 1;
+
+ String reloadWorkingDir = getIndexedWorkingDir(projectName);
+ devModeContext.close();
+
+ // Re-export updated project
+ //
+ KubernetesExport export = configureExport(reloadWorkingDir);
+ int exit = export.export();
+ if (exit != 0) {
+ printer().printf("Project reexport failed for: %s%n",
reloadWorkingDir);
+ return;
+ }
+
+ reusablePodLogs.retryForReload = true;
+ try {
+
+ // Undeploy/Delete current project
+ //
+ KubernetesDelete deleteCommand = new
KubernetesDelete(getMain());
+ deleteCommand.workingDir = currentWorkingDir;
+ deleteCommand.clusterType = clusterType;
+ deleteCommand.name = projectName;
+ deleteCommand.doCall();
+
+ // Re-deploy updated project
+ //
+ exit = deployProject(reloadWorkingDir, true);
+ if (exit != 0) {
+ printer().printf("Project redeploy failed for: %s%n",
reloadWorkingDir);
+ return;
+ }
+
+ waitForRunningPod(projectName);
+
+ } finally {
+ reusablePodLogs.retryForReload = false;
+ }
+
+ // Recursively setup --dev mode for updated project
+ //
+ Runtime.getRuntime().removeShutdownHook(devModeShutdownTask);
setupDevMode(projectName, reloadWorkingDir);
+
+ printer().printf("Project reloaded: %s%n", reloadWorkingDir);
}
- printer().printf("Project reloaded: %s%n", reloadWorkingDir);
});
if (filter != null) {
reloadStrategy.setFileFilter(filter);
}
- reloadContext = new DefaultCamelContext(false);
- reloadContext.addService(reloadStrategy);
- reloadContext.start();
+ devModeContext = new DefaultCamelContext(false);
+ devModeContext.addService(reloadStrategy);
+ devModeContext.start();
if (cleanup) {
- installShutdownInterceptor(projectName, workingDir);
+ installShutdownHook(projectName, workingDir);
}
}
private void startPodLogging(String projectName) throws Exception {
try {
- var podLogs = new PodLogs(getMain());
+ reusablePodLogs = new PodLogs(getMain());
if (!ObjectHelper.isEmpty(namespace)) {
- podLogs.namespace = namespace;
+ reusablePodLogs.namespace = namespace;
}
- podLogs.name = projectName;
- podLogs.doCall();
+ reusablePodLogs.name = projectName;
+ reusablePodLogs.doCall();
} catch (Exception e) {
printer().println("Failed to read pod logs - " + e);
throw e;
@@ -459,20 +492,21 @@ public class KubernetesRun extends KubernetesBaseCommand {
}
}
- private void installShutdownInterceptor(String projectName, String
workingDir) {
+ private void installShutdownHook(String projectName, String workingDir) {
KubernetesDelete deleteCommand = new KubernetesDelete(getMain());
- deleteCommand.name = projectName;
+ deleteCommand.clusterType = clusterType;
deleteCommand.workingDir = workingDir;
+ deleteCommand.name = projectName;
- Thread task = new Thread(() -> {
+ devModeShutdownTask = new Thread(() -> {
try {
deleteCommand.doCall();
} catch (Exception e) {
throw new RuntimeException(e);
}
});
- task.setName(ThreadHelper.resolveThreadName(null,
"CamelShutdownInterceptor"));
- Runtime.getRuntime().addShutdownHook(task);
+ devModeShutdownTask.setName(ThreadHelper.resolveThreadName(null,
"CamelShutdownInterceptor"));
+ Runtime.getRuntime().addShutdownHook(devModeShutdownTask);
}
private Integer buildProject(String workingDir) throws IOException,
InterruptedException {
@@ -576,11 +610,8 @@ public class KubernetesRun extends KubernetesBaseCommand {
args.add("-Djkube.namespace=%s".formatted(namespace));
}
- var pluginPrefix = isOpenshift ? "oc" : "k8s";
- if (reload) {
- args.add(pluginPrefix + ":undeploy");
- }
- args.add(pluginPrefix + ":deploy");
+ var prefix = isOpenshift ? "oc" : "k8s";
+ args.add(prefix + ":deploy");
}
if (!quiet) {
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/PodLogs.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/PodLogs.java
index 4f7756f5675..42baee9cea7 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/PodLogs.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/PodLogs.java
@@ -19,6 +19,7 @@ package org.apache.camel.dsl.jbang.core.commands.kubernetes;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.util.Optional;
import io.fabric8.kubernetes.client.dsl.LogWatch;
import io.fabric8.kubernetes.client.dsl.PodResource;
@@ -30,6 +31,8 @@ import org.apache.camel.util.ObjectHelper;
import picocli.CommandLine;
import picocli.CommandLine.Command;
+import static
org.apache.camel.dsl.jbang.core.commands.kubernetes.KubernetesHelper.getPodPhase;
+
@Command(name = "logs", description = "Print the logs of a Kubernetes pod",
sortOptions = false)
public class PodLogs extends KubernetesBaseCommand {
@@ -54,10 +57,13 @@ public class PodLogs extends KubernetesBaseCommand {
description = "The number of lines from the end of the
logs to show. Defaults to -1 to show all the lines.")
int tail = -1;
- int maxWaitAttempts = 30; // total timeout of 60 seconds
+ // total timeout of 60s
+ int maxRetryAttempts = 30;
+ boolean retryForReload;
+ private int retryCount;
// used for testing
- int maxLogMessages = -1;
+ long maxMessageCount = -1;
long messageCount = 0;
public PodLogs(CamelJBangMain main) {
@@ -86,36 +92,76 @@ public class PodLogs extends KubernetesBaseCommand {
printer().println("--label selector must be in syntax: key=value");
}
- PodResource podRes =
pods().withLabel(label).resources().findFirst().orElse(null);
+ var retry = watchLogs();
+ while ((retry || retryForReload) && ++retryCount < maxRetryAttempts) {
+ sleepWell();
+ printer().printf("Retry %d/%d Pod log for label %s%n", retryCount,
maxRetryAttempts, label);
+ retry = watchLogs();
+ }
+
+ printer().println("Stopped pod logging!");
+ return 0;
+ }
+
+ // Returns true if a retry should be attempted
+ private boolean watchLogs() {
+
+ PodResource podRes = pods().withLabel(label)
+ .resources()
+ .findFirst()
+ .orElse(null);
if (podRes == null) {
- printer().printf("Pod for label %s not
available".formatted(label));
- return 0;
+ printer().printf("Pod for label %s not available%n", label);
+ return true;
}
- LogWatch logs;
- if (tail < 0) {
- if (!ObjectHelper.isEmpty(container)) {
- logs = podRes.inContainer(container).watchLog();
- } else {
- logs = podRes.watchLog();
- }
- } else {
- if (!ObjectHelper.isEmpty(container)) {
- logs =
podRes.inContainer(container).tailingLines(tail).watchLog();
+ var terminated = isPodTerminated(podRes);
+ if (!terminated) {
+
+ LogWatch logs;
+ if (tail < 0) {
+ if (!ObjectHelper.isEmpty(container)) {
+ logs = podRes.inContainer(container).watchLog();
+ } else {
+ logs = podRes.watchLog();
+ }
} else {
- logs = podRes.tailingLines(tail).watchLog();
+ if (!ObjectHelper.isEmpty(container)) {
+ logs =
podRes.inContainer(container).tailingLines(tail).watchLog();
+ } else {
+ logs = podRes.tailingLines(tail).watchLog();
+ }
}
- }
- try (logs; BufferedReader reader = new BufferedReader(new
InputStreamReader(logs.getOutput()))) {
- String line;
- while ((line = reader.readLine()) != null) {
- printer().println(line);
+ try (logs; BufferedReader reader = new BufferedReader(new
InputStreamReader(logs.getOutput()))) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ printer().println(line);
+ if (maxMessageCount > 0 && ++messageCount >
maxMessageCount) {
+ return false;
+ }
+ retryCount = 0;
+ }
+ } catch (IOException e) {
+ printer().println("Failed to read pod logs - " +
e.getMessage());
}
- } catch (IOException e) {
- printer().println("Failed to read pod logs - " + e.getMessage());
+
+ terminated = isPodTerminated(podRes);
}
- return 0;
+ return !terminated;
+ }
+
+ private boolean isPodTerminated(PodResource podRes) {
+ var phase = Optional.ofNullable(podRes).map(pr ->
getPodPhase(pr.get())).orElse("Unknown");
+ return "Terminated".equals(phase);
+ }
+
+ private void sleepWell() {
+ try {
+ Thread.sleep(2000L);
+ } catch (InterruptedException e) {
+ printer().printf("Interrupted while waiting for pod - %s%n",
e.getMessage());
+ }
}
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/PodLogsTest.java
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/PodLogsTest.java
index d02bfa74452..ffb83fe20bc 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/PodLogsTest.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/PodLogsTest.java
@@ -32,7 +32,7 @@ class PodLogsTest extends KubernetesBaseTest {
public void shouldHandlePodNotFound() throws Exception {
PodLogs command = createCommand();
command.name = "mickey-mouse";
- command.maxWaitAttempts = 2; // total timeout of 4 seconds
+ command.maxRetryAttempts = 2; // total timeout of 4 seconds
int exit = command.doCall();
Assertions.assertEquals(0, exit);
@@ -55,7 +55,7 @@ class PodLogsTest extends KubernetesBaseTest {
kubernetesClient.pods().resource(pod).create();
var podLog = createCommand();
- podLog.maxLogMessages = 10;
+ podLog.maxMessageCount = 10;
podLog.name = "routes";
int exit = podLog.doCall();
Assertions.assertEquals(0, exit);