fix tests

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterIT.java

@@ -51,16 +51,16 @@ void beforeEach() {
 		util.createNamespace(NAMESPACE_A_UAT);
 		util.createNamespace(NAMESPACE_B_UAT);
 
-		util.wiremock(NAMESPACE_A_UAT, Phase.CREATE);
-		util.wiremock(NAMESPACE_B_UAT, Phase.CREATE);
+		util.wiremock(NAMESPACE_A_UAT, Phase.CREATE, false);
+		util.wiremock(NAMESPACE_B_UAT, Phase.CREATE, false);
 
 	}
 
 	@AfterEach
 	void afterEach() {
 
-		util.wiremock(NAMESPACE_A_UAT, Phase.DELETE);
-		util.wiremock(NAMESPACE_B_UAT, Phase.DELETE);
+		util.wiremock(NAMESPACE_A_UAT, Phase.DELETE, false);
+		util.wiremock(NAMESPACE_B_UAT, Phase.DELETE, false);
 
 		util.deleteNamespace(NAMESPACE_A_UAT);
 		util.deleteNamespace(NAMESPACE_B_UAT);

spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java

@@ -295,7 +295,12 @@ private void waitForConfigMap(String namespace, ConfigMap configMap, Phase phase
 		});
 	}
 
-	public void wiremock(String namespace, Phase phase) {
+	/**
+	 * 'withNodePort' specifies if we add the NodePort or not. It is needed because we
+	 * sometimes deploy two instances of wiremock, and they can't have the same NodePort
+	 * exposed
+	 */
+	public void wiremock(String namespace, Phase phase, boolean withNodePort) {
 		InputStream deploymentStream = inputStream("wiremock/wiremock-deployment.yaml");
 		InputStream serviceStream = inputStream("wiremock/wiremock-service.yaml");
 
@@ -305,6 +310,11 @@ public void wiremock(String namespace, Phase phase) {
 		deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setImage(imageWithVersion);
 
 		Service service = client.services().load(serviceStream).item();
+		if (!withNodePort) {
+			// we assume we only have one 'http' port
+			service.getSpec().getPorts().get(0).setNodePort(null);
+			service.getSpec().setType("ClusterIP");
+		}
 
 		if (phase.equals(Phase.CREATE)) {
 			deployment.getMetadata().setNamespace(namespace);