From 8763b69a8069bb6908817c5e2aa24ed036ad33ed Mon Sep 17 00:00:00 2001 From: Steve Hawkins Date: Thu, 1 Jun 2023 10:51:40 -0400 Subject: [PATCH] fix #5194: deflaking ScaleIT by ensuring api metadata lookup succeeds --- .../java/io/fabric8/kubernetes/ScaleIT.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ScaleIT.java b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ScaleIT.java index a8ff69e9af1..2e55eae57be 100644 --- a/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ScaleIT.java +++ b/kubernetes-itests/src/test/java/io/fabric8/kubernetes/ScaleIT.java @@ -41,17 +41,18 @@ class ScaleIT { @BeforeEach void setUp() { - client.apiextensions().v1().customResourceDefinitions().withName("crontabs.stable.example.com") - .waitUntilCondition(crd -> crd != null && crd.getStatus() != null && crd.getStatus().getConditions() != null && - crd.getStatus().getConditions().stream() - .filter(c -> c.getType() != null) - .filter(c -> c.getStatus() != null) - .anyMatch(c -> c.getType().equals("Established") && c.getStatus().equals("True")), - 10, TimeUnit.SECONDS); + Awaitility.await().atMost(30, TimeUnit.SECONDS).until(() -> { + try { + client.genericKubernetesResources("stable.example.com/v1", "CronTab"); + return true; + } catch (KubernetesClientException e) { + return false; + } + }); } @Test - void scale() { + void scaleGeneric() { GenericKubernetesResource cronTab = Serialization.unmarshal("apiVersion: \"stable.example.com/v1\"\n" + "kind: CronTab\n" + "metadata:\n" @@ -61,8 +62,7 @@ void scale() { + " image: my-awesome-cron-image\n" + " replicas: 3", GenericKubernetesResource.class); - Resource resource = client.genericKubernetesResources("stable.example.com/v1", "CronTab") - .resource(cronTab); + Resource resource = client.resource(cronTab); Awaitility.await().atMost(30, TimeUnit.SECONDS).until(() -> { try {