conditional ingress for wiremock pods (#1445)

wind57 · web-flow · commit 866bcfa1f485 · 2023-09-17T14:27:32.000-04:00
* k8s client moved

* fabri8 client moved

* review comments

* review comments
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
@@ -175,7 +175,7 @@ void testAllNamespaces() {
 		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 @@ void testAllNamespaces() {
 	@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 @@ void testSpecificNamespace() {
 
 		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 @@ void testDefaultConfiguration() {
 	}
 
 	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
@@ -55,8 +55,8 @@ void filterMatchesOneNamespaceViaThePredicate(Util util) {
 		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
@@ -84,19 +84,19 @@ static void beforeAll() throws Exception {
 		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);
 	}
 
 	@AfterAll
 	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
@@ -75,12 +75,12 @@ static void afterAll() throws Exception {
 
 	@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
@@ -78,12 +78,12 @@ static void afterAll() throws Exception {
 
 	@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
@@ -105,15 +105,15 @@ static void afterAll() throws Exception {
 
 	@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
@@ -73,12 +73,12 @@ static void beforeAll() throws Exception {
 		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
@@ -97,32 +97,32 @@ static void beforeAll() throws Exception {
 		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
@@ -82,12 +82,12 @@ static void afterAll() throws Exception {
 
 	@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
@@ -261,22 +261,36 @@ private void waitForConfigMap(String namespace, ConfigMap configMap, Phase phase
 	}
 
 	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
@@ -420,19 +420,35 @@ public void deleteNamespace(String name) {
 						.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 @@ private void waitForIngressToBeDeleted(String ingressName, String namespace) {
 	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);

Original file line number	Diff line number	Diff line change
`@@ -75,12 +75,12 @@ static void afterAll() throws Exception {`
`75`	`75`
`76`	`76`	`@BeforeEach`
`77`	`77`	`void setup() {`
`78`		`- util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE);`
	`78`	`+ util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE, false);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`@AfterEach`
`82`	`82`	`void afterEach() {`
`83`		`- util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE);`
	`83`	`+ util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE, false);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -78,12 +78,12 @@ static void afterAll() throws Exception {`
`78`	`78`
`79`	`79`	`@BeforeEach`
`80`	`80`	`void setup() {`
`81`		`- util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE);`
	`81`	`+ util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE, false);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`@AfterEach`
`85`	`85`	`void after() {`
`86`		`- util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE);`
	`86`	`+ util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE, false);`
`87`	`87`	`reactiveDiscoveryIt(Phase.DELETE);`
`88`	`88`	`}`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -82,12 +82,12 @@ static void afterAll() throws Exception {`
`82`	`82`
`83`	`83`	`@BeforeEach`
`84`	`84`	`void beforeEach() {`
`85`		`- util.wiremock(NAMESPACE, "/", Phase.CREATE);`
	`85`	`+ util.wiremock(NAMESPACE, "/", Phase.CREATE, false);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@AfterEach`
`89`	`89`	`void afterEach() {`
`90`		`- util.wiremock(NAMESPACE, "/", Phase.DELETE);`
	`90`	`+ util.wiremock(NAMESPACE, "/", Phase.DELETE, false);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`@Test`