From 866bcfa1f48592bbdabc1348add8d6fd1c79828d Mon Sep 17 00:00:00 2001 From: erabii Date: Sun, 17 Sep 2023 21:27:32 +0300 Subject: [PATCH] conditional ingress for wiremock pods (#1445) * k8s client moved * fabri8 client moved * review comments * review comments --- .../it/KubernetesClientDiscoveryClientIT.java | 12 +++++----- ...rnetesClientDiscoveryFilterITDelegate.java | 4 ++-- ...sClientDiscoverySelectiveNamespacesIT.java | 12 +++++----- .../loadbalancer/it/LoadBalancerIT.java | 4 ++-- .../it/ReactiveDiscoveryClientIT.java | 4 ++-- .../it/DiscoveryClientFilterNamespaceIT.java | 8 +++---- .../Fabric8DiscoveryBootstrapIT.java | 4 ++-- .../Fabric8DiscoveryPodMetadataIT.java | 20 ++++++++-------- .../it/Fabric8ClientLoadbalancerIT.java | 4 ++-- .../tests/commons/fabric8_client/Util.java | 20 +++++++++++++--- .../tests/commons/native_client/Util.java | 24 +++++++++++++++---- 11 files changed, 73 insertions(+), 43 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryClientIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryClientIT.java index cfadb181..ff8df45e 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryClientIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryClientIT.java @@ -175,7 +175,7 @@ class KubernetesClientDiscoveryClientIT { util.createNamespace(NAMESPACE_A); util.createNamespace(NAMESPACE_B); util.setUpClusterWideClusterRoleBinding(NAMESPACE); - util.wiremock(NAMESPACE_A, "/wiremock", Phase.CREATE); + util.wiremock(NAMESPACE_A, "/wiremock", Phase.CREATE, false); util.busybox(NAMESPACE_B, Phase.CREATE); KubernetesClientDiscoveryClientUtils.patchForAllNamespaces(DEPLOYMENT_NAME, NAMESPACE); @@ -222,7 +222,7 @@ class KubernetesClientDiscoveryClientIT { @Order(3) void testSpecificNamespace() { util.setUpClusterWide(NAMESPACE, Set.of(NAMESPACE, NAMESPACE_A)); - util.wiremock(NAMESPACE_B, "/wiremock", Phase.CREATE); + util.wiremock(NAMESPACE_B, "/wiremock", Phase.CREATE, false); KubernetesClientDiscoveryClientUtils.patchForSingleNamespace(DEPLOYMENT_NAME, NAMESPACE); @@ -266,8 +266,8 @@ class KubernetesClientDiscoveryClientIT { Assertions.assertEquals(resultForNonExistentService.size(), 0); - util.wiremock(NAMESPACE_A, "/wiremock", Phase.DELETE); - util.wiremock(NAMESPACE_B, "/wiremock", Phase.DELETE); + util.wiremock(NAMESPACE_A, "/wiremock", Phase.DELETE, false); + util.wiremock(NAMESPACE_B, "/wiremock", Phase.DELETE, false); util.deleteClusterWide(NAMESPACE, Set.of(NAMESPACE, NAMESPACE_A)); util.deleteNamespace(NAMESPACE_A); util.deleteNamespace(NAMESPACE_B); @@ -343,8 +343,8 @@ class KubernetesClientDiscoveryClientIT { } private void deleteNamespacesAndWiremock() { - util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.DELETE); - util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.DELETE); + util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.DELETE, false); + util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.DELETE, false); util.deleteNamespace(NAMESPACE_A_UAT); util.deleteNamespace(NAMESPACE_B_UAT); } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryFilterITDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryFilterITDelegate.java index 21e25911..12bd1b95 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryFilterITDelegate.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryFilterITDelegate.java @@ -55,8 +55,8 @@ class KubernetesClientDiscoveryFilterITDelegate { util.createNamespace(NAMESPACE_A_UAT); util.createNamespace(NAMESPACE_B_UAT); util.setUpClusterWide(NAMESPACE, Set.of(NAMESPACE, NAMESPACE_A_UAT, NAMESPACE_B_UAT)); - util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.CREATE); - util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.CREATE); + util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.CREATE, false); + util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.CREATE, false); WebClient clientServices = builder().baseUrl("http://localhost/services").build(); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java index 406b273b..980c5e97 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java @@ -84,9 +84,9 @@ class KubernetesClientDiscoverySelectiveNamespacesIT { util.createNamespace(NAMESPACE_A); util.createNamespace(NAMESPACE_B); util.setUpClusterWide(NAMESPACE, Set.of(NAMESPACE, NAMESPACE_A, NAMESPACE_B)); - util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE); - util.wiremock(NAMESPACE_A, "/wiremock", Phase.CREATE); - util.wiremock(NAMESPACE_B, "/wiremock", Phase.CREATE); + util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE, false); + util.wiremock(NAMESPACE_A, "/wiremock", Phase.CREATE, false); + util.wiremock(NAMESPACE_B, "/wiremock", Phase.CREATE, false); manifests(Phase.CREATE); } @@ -94,9 +94,9 @@ class KubernetesClientDiscoverySelectiveNamespacesIT { static void afterAll() throws Exception { Commons.cleanUp(IMAGE_NAME, K3S); - util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE); - util.wiremock(NAMESPACE_A, "/wiremock", Phase.DELETE); - util.wiremock(NAMESPACE_B, "/wiremock", Phase.DELETE); + util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE, false); + util.wiremock(NAMESPACE_A, "/wiremock", Phase.DELETE, false); + util.wiremock(NAMESPACE_B, "/wiremock", Phase.DELETE, false); util.deleteClusterWide(NAMESPACE, Set.of(NAMESPACE, NAMESPACE_A, NAMESPACE_B)); util.deleteNamespace(NAMESPACE_A); util.deleteNamespace(NAMESPACE_B); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java index 3faf4d06..9a3bf5e4 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java @@ -75,12 +75,12 @@ class LoadBalancerIT { @BeforeEach void setup() { - util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE); + util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE, false); } @AfterEach void afterEach() { - util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE); + util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE, false); } @Test diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java index 2c077b6d..c9de33d2 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/client/reactive/discovery/it/ReactiveDiscoveryClientIT.java @@ -78,12 +78,12 @@ class ReactiveDiscoveryClientIT { @BeforeEach void setup() { - util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE); + util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE, false); } @AfterEach void after() { - util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE); + util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE, false); reactiveDiscoveryIt(Phase.DELETE); } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java index 8ff34d9f..65491ee1 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientFilterNamespaceIT.java @@ -105,15 +105,15 @@ class DiscoveryClientFilterNamespaceIT { @AfterEach void afterEach() { - util.wiremock(NAMESPACE_LEFT, "/wiremock-" + NAMESPACE_LEFT, Phase.DELETE); - util.wiremock(NAMESPACE_RIGHT, "/wiremock-" + NAMESPACE_RIGHT, Phase.DELETE); + util.wiremock(NAMESPACE_LEFT, "/wiremock-" + NAMESPACE_LEFT, Phase.DELETE, false); + util.wiremock(NAMESPACE_RIGHT, "/wiremock-" + NAMESPACE_RIGHT, Phase.DELETE, false); discoveryIt(Phase.DELETE); } @Test void testDiscoveryClient() { - util.wiremock(NAMESPACE_LEFT, "/wiremock-" + NAMESPACE_LEFT, Phase.CREATE); - util.wiremock(NAMESPACE_RIGHT, "/wiremock-" + NAMESPACE_RIGHT, Phase.CREATE); + util.wiremock(NAMESPACE_LEFT, "/wiremock-" + NAMESPACE_LEFT, Phase.CREATE, false); + util.wiremock(NAMESPACE_RIGHT, "/wiremock-" + NAMESPACE_RIGHT, Phase.CREATE, false); discoveryIt(Phase.CREATE); testLoadBalancer(); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/bootstrap/Fabric8DiscoveryBootstrapIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/bootstrap/Fabric8DiscoveryBootstrapIT.java index 9b7ba3d1..cc1ee665 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/bootstrap/Fabric8DiscoveryBootstrapIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/bootstrap/Fabric8DiscoveryBootstrapIT.java @@ -73,12 +73,12 @@ class Fabric8DiscoveryBootstrapIT { util.setUp(NAMESPACE); manifests(Phase.CREATE); - util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE); + util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE, false); } @AfterAll static void after() throws Exception { - util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE); + util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE, false); manifests(Phase.DELETE); Commons.cleanUp(IMAGE_NAME, K3S); Commons.systemPrune(); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java index 758cb213..758bc354 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java @@ -97,32 +97,32 @@ class Fabric8DiscoveryPodMetadataIT { util.setUp(NAMESPACE); manifests(Phase.CREATE); - util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE); + util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE, false); util.busybox(NAMESPACE, Phase.CREATE); util.createNamespace(NAMESPACE_A_UAT); util.createNamespace(NAMESPACE_B_UAT); - util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.CREATE); - util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.CREATE); + util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.CREATE, false); + util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.CREATE, false); util.createNamespace(NAMESPACE_LEFT); util.createNamespace(NAMESPACE_RIGHT); - util.wiremock(NAMESPACE_LEFT, "/wiremock", Phase.CREATE); - util.wiremock(NAMESPACE_RIGHT, "/wiremock", Phase.CREATE); + util.wiremock(NAMESPACE_LEFT, "/wiremock", Phase.CREATE, false); + util.wiremock(NAMESPACE_RIGHT, "/wiremock", Phase.CREATE, false); } @AfterAll static void after() throws Exception { - util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE); + util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE, false); util.busybox(NAMESPACE, Phase.DELETE); - util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.DELETE); - util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.DELETE); + util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.DELETE, false); + util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.DELETE, false); util.deleteNamespace(NAMESPACE_A_UAT); util.deleteNamespace(NAMESPACE_B_UAT); - util.wiremock(NAMESPACE_LEFT, "/wiremock", Phase.DELETE); - util.wiremock(NAMESPACE_RIGHT, "/wiremock", Phase.DELETE); + util.wiremock(NAMESPACE_LEFT, "/wiremock", Phase.DELETE, false); + util.wiremock(NAMESPACE_RIGHT, "/wiremock", Phase.DELETE, false); util.deleteNamespace(NAMESPACE_LEFT); util.deleteNamespace(NAMESPACE_RIGHT); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java index b3fa1ec3..0c0ce855 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/Fabric8ClientLoadbalancerIT.java @@ -82,12 +82,12 @@ public class Fabric8ClientLoadbalancerIT { @BeforeEach void beforeEach() { - util.wiremock(NAMESPACE, "/", Phase.CREATE); + util.wiremock(NAMESPACE, "/", Phase.CREATE, false); } @AfterEach void afterEach() { - util.wiremock(NAMESPACE, "/", Phase.DELETE); + util.wiremock(NAMESPACE, "/", Phase.DELETE, false); } @Test diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java index 74060aa5..a11f8b64 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java @@ -261,22 +261,36 @@ public final class Util { } public void wiremock(String namespace, String path, Phase phase) { + wiremock(namespace, path, phase, true); + } + + public void wiremock(String namespace, String path, Phase phase, boolean withIngress) { InputStream deploymentStream = inputStream("wiremock/wiremock-deployment.yaml"); InputStream serviceStream = inputStream("wiremock/wiremock-service.yaml"); InputStream ingressStream = inputStream("wiremock/wiremock-ingress.yaml"); Deployment deployment = client.apps().deployments().load(deploymentStream).get(); Service service = client.services().load(serviceStream).get(); - Ingress ingress = client.network().v1().ingresses().load(ingressStream).get(); + Ingress ingress = null; if (phase.equals(Phase.CREATE)) { + + if (withIngress) { + ingress = client.network().v1().ingresses().load(ingressStream).get(); + ingress.getMetadata().setNamespace(namespace); + ingress.getSpec().getRules().get(0).getHttp().getPaths().get(0).setPath(path); + } + deployment.getMetadata().setNamespace(namespace); service.getMetadata().setNamespace(namespace); - ingress.getMetadata().setNamespace(namespace); - ingress.getSpec().getRules().get(0).getHttp().getPaths().get(0).setPath(path); createAndWait(namespace, "wiremock", deployment, service, ingress, false); } else { + + if (withIngress) { + ingress = client.network().v1().ingresses().load(ingressStream).get(); + } + deleteAndWait(namespace, deployment, service, ingress); } diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java index 8cbc1765..88f72cc8 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java @@ -420,19 +420,35 @@ public final class Util { .getItems().stream().noneMatch(x -> x.getMetadata().getName().equals(name))); } + /** + * deploy wiremock without ingress. + */ public void wiremock(String namespace, String path, Phase phase) { + wiremock(namespace, path, phase, true); + } + + public void wiremock(String namespace, String path, Phase phase, boolean withIngress) { V1Deployment deployment = (V1Deployment) yaml("wiremock/wiremock-deployment.yaml"); V1Service service = (V1Service) yaml("wiremock/wiremock-service.yaml"); - V1Ingress ingress = (V1Ingress) yaml("wiremock/wiremock-ingress.yaml"); + + V1Ingress ingress = null; if (phase.equals(Phase.CREATE)) { + + if (withIngress) { + ingress = (V1Ingress) yaml("wiremock/wiremock-ingress.yaml"); + ingress.getMetadata().setNamespace(namespace); + ingress.getSpec().getRules().get(0).getHttp().getPaths().get(0).setPath(path); + } + deployment.getMetadata().setNamespace(namespace); service.getMetadata().setNamespace(namespace); - ingress.getMetadata().setNamespace(namespace); - ingress.getSpec().getRules().get(0).getHttp().getPaths().get(0).setPath(path); createAndWait(namespace, "wiremock", deployment, service, ingress, false); } else { + if (withIngress) { + ingress = (V1Ingress) yaml("wiremock/wiremock-ingress.yaml"); + } deleteAndWait(namespace, deployment, service, ingress); } @@ -617,7 +633,7 @@ public final class Util { private boolean isDeploymentReady(String deploymentName, String namespace) throws ApiException { V1DeploymentList deployments = appsV1Api.listNamespacedDeployment(namespace, null, null, null, "metadata.name=" + deploymentName, null, null, null, null, null, null); - if (deployments.getItems().size() < 1) { + if (deployments.getItems().isEmpty()) { fail("No deployments with the name " + deploymentName); } V1Deployment deployment = deployments.getItems().get(0);