Skip to content

Commit 65cea20

Browse files
committed
add pod status methods
1 parent e4391f1 commit 65cea20

File tree

2 files changed

+46
-4
lines changed

2 files changed

+46
-4
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/ITPodsRestart.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import oracle.kubernetes.operator.utils.Domain;
1515
import oracle.kubernetes.operator.utils.DomainCRD;
1616
import oracle.kubernetes.operator.utils.ExecResult;
17+
import oracle.kubernetes.operator.utils.K8sTestUtils;
1718
import oracle.kubernetes.operator.utils.Operator;
1819
import oracle.kubernetes.operator.utils.TestUtils;
1920
import org.junit.AfterClass;
@@ -345,7 +346,13 @@ public void testAdminServerRestartVersion() throws Exception {
345346
ExecResult exec = TestUtils.exec("kubectl apply -f " + path.toString());
346347
logger.info(exec.stdout());
347348
logger.info("Verifying if the admin server is restarted");
348-
domain.verifyAdminServerRestarted();
349+
K8sTestUtils testUtil = new K8sTestUtils();
350+
for (int i = 0; i < 60000; i++) {
351+
String podStatus =
352+
testUtil.getPodStatus(domain.getDomainNS(), domain.getDomainUid(), "mypod");
353+
Thread.sleep(10000);
354+
}
355+
// domain.verifyAdminServerRestarted();
349356
} finally {
350357
logger.log(
351358
Level.INFO, "Reverting back the domain to old crd\n kubectl apply -f {0}", originalYaml);
@@ -356,7 +363,7 @@ public void testAdminServerRestartVersion() throws Exception {
356363
logger.log(Level.INFO, "SUCCESS - {0}", testMethodName);
357364
}
358365

359-
@Test
366+
// @Test
360367
public void testClusterRestartVersion() throws Exception {
361368
Assume.assumeFalse(QUICKTEST);
362369
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -392,7 +399,7 @@ public void testClusterRestartVersion() throws Exception {
392399
logger.log(Level.INFO, "SUCCESS - {0}", testMethodName);
393400
}
394401

395-
@Test
402+
// @Test
396403
public void testMSRestartVersion() throws Exception {
397404
Assume.assumeFalse(QUICKTEST);
398405
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
@@ -430,7 +437,7 @@ public void testMSRestartVersion() throws Exception {
430437
logger.log(Level.INFO, "SUCCESS - {0}", testMethodName);
431438
}
432439

433-
@Test
440+
// @Test
434441
public void testDomainRestartVersion() throws Exception {
435442
Assume.assumeFalse(QUICKTEST);
436443
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();

integration-tests/src/test/java/oracle/kubernetes/operator/utils/K8sTestUtils.java

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
import io.kubernetes.client.models.V1JobList;
2525
import io.kubernetes.client.models.V1PersistentVolumeClaimList;
2626
import io.kubernetes.client.models.V1PersistentVolumeList;
27+
import io.kubernetes.client.models.V1Pod;
2728
import io.kubernetes.client.models.V1PodList;
29+
import io.kubernetes.client.models.V1PodStatus;
2830
import io.kubernetes.client.models.V1ReplicaSetList;
2931
import io.kubernetes.client.models.V1RoleBindingList;
3032
import io.kubernetes.client.models.V1RoleList;
@@ -35,6 +37,7 @@
3537
import io.kubernetes.client.models.V1beta1IngressList;
3638
import io.kubernetes.client.util.ClientBuilder;
3739
import java.io.IOException;
40+
import java.util.List;
3841

3942
public class K8sTestUtils {
4043
static {
@@ -340,4 +343,36 @@ public void verifyNoClusterRoleBindings(String labelSelectors) throws Exception
340343
Boolean.FALSE);
341344
assertEquals("Number of cluster role bindings", v1ClusterRoleBindingList.getItems().size(), 0);
342345
}
346+
347+
public V1PodList getPods(String namespace, String labelSelectors) throws ApiException {
348+
V1PodList v1PodList =
349+
coreV1Api.listNamespacedPod(
350+
namespace,
351+
Boolean.FALSE,
352+
Boolean.FALSE.toString(),
353+
null,
354+
null,
355+
labelSelectors,
356+
null,
357+
null,
358+
null,
359+
Boolean.FALSE);
360+
return v1PodList;
361+
}
362+
363+
public String getPodStatus(String namespace, String labelSelectors, String podName)
364+
throws ApiException {
365+
String status = null;
366+
List<V1Pod> pods = getPods(namespace, labelSelectors).getItems();
367+
for (V1Pod pod : pods) {
368+
V1PodStatus podStatus = pod.getStatus();
369+
System.out.println(pod.toString() + ":" + podStatus.getMessage());
370+
System.out.println(pod.toString() + ":" + podStatus.getPhase());
371+
System.out.println(pod.toString() + ":" + podStatus.toString());
372+
if (pod.toString().equals(podName)) {
373+
status = pod.getStatus().toString();
374+
}
375+
}
376+
return status;
377+
}
343378
}

0 commit comments

Comments
 (0)