From 9b920516f438911d8e202d609fe5314ead59fb6a Mon Sep 17 00:00:00 2001 From: James Netherton Date: Thu, 6 Feb 2025 10:28:22 +0000 Subject: [PATCH] Adapt master-openshift tests for CAMEL-21720 --- .../it/MasterOpenShiftTestResource.java | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/integration-tests/master-openshift/src/test/java/org/apache/camel/quarkus/component/master/it/MasterOpenShiftTestResource.java b/integration-tests/master-openshift/src/test/java/org/apache/camel/quarkus/component/master/it/MasterOpenShiftTestResource.java index 23dab082228c..34758a5e9102 100644 --- a/integration-tests/master-openshift/src/test/java/org/apache/camel/quarkus/component/master/it/MasterOpenShiftTestResource.java +++ b/integration-tests/master-openshift/src/test/java/org/apache/camel/quarkus/component/master/it/MasterOpenShiftTestResource.java @@ -20,6 +20,8 @@ import io.fabric8.kubernetes.api.model.PodBuilder; import io.fabric8.kubernetes.api.model.PodList; import io.fabric8.kubernetes.api.model.PodListBuilder; +import io.fabric8.kubernetes.api.model.PodStatus; +import io.fabric8.kubernetes.api.model.PodStatusBuilder; import io.quarkus.test.kubernetes.client.KubernetesServerTestResource; public class MasterOpenShiftTestResource extends KubernetesServerTestResource { @@ -27,24 +29,48 @@ public class MasterOpenShiftTestResource extends KubernetesServerTestResource { protected void configureServer() { super.configureServer(); + PodStatus ready = new PodStatusBuilder().withPhase("Running").addNewCondition().withType("Ready").withStatus("true") + .endCondition().build(); + PodStatus failed = new PodStatusBuilder().withPhase("Failed").build(); + PodStatus notReady = new PodStatusBuilder().withPhase("Running").addNewCondition().withType("Ready").withStatus("false") + .endCondition().build(); + final Pod leader = new PodBuilder() .withNewMetadata() .withName("leader") .withNamespace("test") - .and() + .endMetadata() + .withStatus(ready) .build(); final Pod follower = new PodBuilder() .withNewMetadata() .withName("follower") .withNamespace("test") - .and() + .endMetadata() + .withStatus(ready) + .build(); + + final Pod badPod1 = new PodBuilder() + .withNewMetadata() + .withName("badpod1") + .withNamespace("test") + .endMetadata() + .withStatus(failed) + .build(); + + final Pod badPod2 = new PodBuilder() + .withNewMetadata() + .withName("badpod2") + .withNamespace("test") + .endMetadata() + .withStatus(notReady) .build(); PodList podList = new PodListBuilder() .withNewMetadata() .withResourceVersion("1") .endMetadata() - .withItems(leader, follower) + .withItems(leader, follower, badPod1, badPod2) .build(); server.expect()