Skip to content

[ZEPPELIN-5403] Update kubernetes client to 5.4.1 and fix unit tests #4133

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

Merged
merged 1 commit into from
Jun 15, 2023
Merged

[ZEPPELIN-5403] Update kubernetes client to 5.4.1 and fix unit tests #4133

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion zeppelin-plugins/launcher/k8s-standard/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<properties>
<plugin.name>Launcher/K8sStandardInterpreterLauncher</plugin.name>
<kubernetes.client.version>5.3.2</kubernetes.client.version>
<kubernetes.client.version>5.4.1</kubernetes.client.version>
<jinjava.version>2.5.4</jinjava.version>
</properties>

Expand Down
27 changes: 13 additions & 14 deletions ...-standard/src/test/java/org/apache/zeppelin/interpreter/launcher/PodPhaseWatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.util.concurrent.TimeUnit;

import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import io.fabric8.kubernetes.api.model.Pod;
Expand All @@ -44,7 +43,6 @@ class PodPhaseWatcherTest {
KubernetesClient client;

@Test
@Disabled("Reamer - ZEPPELIN-5403")
void testPhase() throws InterruptedException {
// CREATE
client.pods().inNamespace("ns1")
Expand All @@ -57,24 +55,25 @@ void testPhase() throws InterruptedException {
// WATCH
PodPhaseWatcher podWatcher = new PodPhaseWatcher(
phase -> StringUtils.equalsAnyIgnoreCase(phase, "Succeeded", "Failed", "Running"));
Watch watch = client.pods().inNamespace("ns1").withName("pod1").watch(podWatcher);
try (Watch watch = client.pods().inNamespace("ns1").withName("pod1").watch(podWatcher)) {

// Update Pod to "pending" phase
pod.setStatus(new PodStatus(null, null, null, null, null, null, null, "Pending", null, null,
null, null, null));
client.pods().inNamespace("ns1").updateStatus(pod);
// Update Pod to "pending" phase
pod.setStatus(new PodStatus(null, null, null, null, null, null, null, "Pending", null, null,
null, null, null));
pod = client.pods().inNamespace("ns1").updateStatus(pod);

// Update Pod to "Running" phase
pod.setStatus(new PodStatusBuilder(new PodStatus(null, null, null, null, null, null, null,
"Running", null, null, null, null, null)).build());
client.pods().inNamespace("ns1").updateStatus(pod);
// Wait a little bit, till update is applied
Thread.sleep(1000);
// Update Pod to "Running" phase
pod.setStatus(new PodStatusBuilder(new PodStatus(null, null, null, null, null, null, null,
"Running", null, null, null, null, null)).build());
client.pods().inNamespace("ns1").updateStatus(pod);

assertTrue(podWatcher.getCountDownLatch().await(1, TimeUnit.SECONDS));
watch.close();
assertTrue(podWatcher.getCountDownLatch().await(1, TimeUnit.SECONDS));
}
}

@Test
@Disabled("Reamer - ZEPPELIN-5403")
void testPhaseWithError() throws InterruptedException {
// CREATE
client.pods().inNamespace("ns1")
Expand Down