Merge pull request #1904 from wind57/drop_ingress

ryanjbaxter · web-flow · commit 619a1adf518d · 2025-04-01T16:16:13.000-04:00
Drop ingress
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterIT.java b/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);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java
@@ -44,8 +44,6 @@
  */
 class ActuatorRefreshIT {
 
-	private static final String WIREMOCK_PATH = "/";
-
 	private static final String NAMESPACE = "default";
 
 	private static final K3sContainer K3S = Commons.container();
@@ -72,12 +70,12 @@ static void afterAll() {
 
 	@BeforeEach
 	void setup() {
-		util.wiremock(NAMESPACE, WIREMOCK_PATH, Phase.CREATE);
+		util.wiremock(NAMESPACE, Phase.CREATE, true);
 	}
 
 	@AfterEach
 	void after() {
-		util.wiremock(NAMESPACE, WIREMOCK_PATH, Phase.DELETE);
+		util.wiremock(NAMESPACE, Phase.DELETE, true);
 	}
 
 	/*
@@ -114,10 +112,10 @@ private static void configWatcher(Phase phase) {
 		deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
 
 		if (phase.equals(Phase.CREATE)) {
-			util.createAndWait(NAMESPACE, null, deployment, service, null, true);
+			util.createAndWait(NAMESPACE, null, deployment, service, true);
 		}
 		else {
-			util.deleteAndWait(NAMESPACE, deployment, service, null);
+			util.deleteAndWait(NAMESPACE, deployment, service);
 		}
 
 	}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java
@@ -60,15 +60,15 @@ static void beforeAll() throws Exception {
 		util = new Util(K3S);
 		util.createNamespace(LEFT_NAMESPACE);
 		util.createNamespace(RIGHT_NAMESPACE);
-		util.wiremock(DEFAULT_NAMESPACE, "/", Phase.CREATE);
+		util.wiremock(DEFAULT_NAMESPACE, Phase.CREATE, true);
 		util.setUpClusterWide(DEFAULT_NAMESPACE, Set.of(DEFAULT_NAMESPACE, LEFT_NAMESPACE, RIGHT_NAMESPACE));
 		configWatcher(Phase.CREATE);
 	}
 
 	@AfterAll
 	static void afterAll() {
 		configWatcher(Phase.DELETE);
-		util.wiremock(DEFAULT_NAMESPACE, "/", Phase.DELETE);
+		util.wiremock(DEFAULT_NAMESPACE, Phase.DELETE, true);
 		util.deleteClusterWide(DEFAULT_NAMESPACE, Set.of(DEFAULT_NAMESPACE, LEFT_NAMESPACE, RIGHT_NAMESPACE));
 		util.deleteNamespace(LEFT_NAMESPACE);
 		util.deleteNamespace(RIGHT_NAMESPACE);
@@ -128,10 +128,10 @@ private static void configWatcher(Phase phase) {
 			.yaml("config-watcher/spring-cloud-kubernetes-configuration-watcher-service.yaml");
 
 		if (phase.equals(Phase.CREATE)) {
-			util.createAndWait(DEFAULT_NAMESPACE, null, deployment, service, null, true);
+			util.createAndWait(DEFAULT_NAMESPACE, null, deployment, service, true);
 		}
 		else {
-			util.deleteAndWait(DEFAULT_NAMESPACE, deployment, service, null);
+			util.deleteAndWait(DEFAULT_NAMESPACE, deployment, service);
 		}
 
 	}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/TestUtil.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/TestUtil.java
@@ -46,7 +46,7 @@ final class TestUtil {
 
 	private static final String WIREMOCK_HOST = "localhost";
 
-	private static final int WIREMOCK_PORT = 80;
+	private static final int WIREMOCK_PORT = 32321;
 
 	static final String SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME = "spring-cloud-kubernetes-configuration-watcher";
 
@@ -60,7 +60,7 @@ static void configureWireMock() {
 		// is ready to take a request via 'Wiremock::stubFor' (because sometimes it fails)
 		// As such, get the existing mappings and retrySpec() makes sure we retry until
 		// we get a response back.
-		WebClient client = builder().baseUrl("http://localhost:80/__admin/mappings").build();
+		WebClient client = builder().baseUrl("http://localhost:32321/__admin/mappings").build();
 		client.method(HttpMethod.GET).retrieve().bodyToMono(String.class).retryWhen(retrySpec()).block();
 
 		StubMapping stubMapping = WireMock.stubFor(WireMock.post(WireMock.urlEqualTo("/actuator/refresh"))
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryServerClientBase.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryServerClientBase.java
@@ -93,10 +93,10 @@ protected static void discoveryServer(Phase phase) {
 		V1Service service = (V1Service) util.yaml("manifests/discoveryserver-service.yaml");
 
 		if (phase.equals(Phase.CREATE)) {
-			util.createAndWait(NAMESPACE, null, deployment, service, null, true);
+			util.createAndWait(NAMESPACE, null, deployment, service, true);
 		}
 		else {
-			util.deleteAndWait(NAMESPACE, deployment, service, null);
+			util.deleteAndWait(NAMESPACE, deployment, service);
 		}
 	}
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryServerClientIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryServerClientIT.java
@@ -78,17 +78,17 @@ static void beforeAllLocal() throws Exception {
 		discoveryServer(Phase.CREATE);
 
 		Images.loadWiremock(K3S);
-		util.wiremock(NAMESPACE_LEFT, "/wiremock-" + NAMESPACE_LEFT, Phase.CREATE, false);
-		util.wiremock(NAMESPACE_RIGHT, "/wiremock-" + NAMESPACE_RIGHT, Phase.CREATE, false);
+		util.wiremock(NAMESPACE_LEFT, Phase.CREATE, false);
+		util.wiremock(NAMESPACE_RIGHT, Phase.CREATE, false);
 	}
 
 	@AfterAll
 	static void afterAllLocal() {
 		serviceAccount(Phase.DELETE);
 		discoveryServer(Phase.DELETE);
 
-		util.wiremock(NAMESPACE_LEFT, "/wiremock-" + NAMESPACE_LEFT, Phase.DELETE, false);
-		util.wiremock(NAMESPACE_RIGHT, "/wiremock-" + NAMESPACE_RIGHT, Phase.DELETE, false);
+		util.wiremock(NAMESPACE_LEFT, Phase.DELETE, false);
+		util.wiremock(NAMESPACE_RIGHT, Phase.DELETE, false);
 
 		util.deleteNamespace(NAMESPACE_LEFT);
 		util.deleteNamespace(NAMESPACE_RIGHT);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientBlockingIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientBlockingIT.java
@@ -60,12 +60,12 @@ class KubernetesClientBlockingIT extends KubernetesClientDiscoveryBase {
 	@BeforeEach
 	void beforeEach() {
 		Images.loadWiremock(K3S);
-		util.wiremock(NAMESPACE, "/", Phase.CREATE);
+		util.wiremock(NAMESPACE, Phase.CREATE, true);
 	}
 
 	@AfterEach
 	void afterEach() {
-		util.wiremock(NAMESPACE, "/", Phase.DELETE);
+		util.wiremock(NAMESPACE, Phase.DELETE, true);
 	}
 
 	/**
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryFilterIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryFilterIT.java
@@ -63,14 +63,14 @@ void beforeEach() {
 		util.createNamespace(NAMESPACE_B_UAT);
 
 		Images.loadWiremock(K3S);
-		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);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySimpleIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySimpleIT.java
@@ -64,13 +64,13 @@ void beforeEach() {
 		util.busybox(NAMESPACE, Phase.CREATE);
 
 		externalNameService = (V1Service) util.yaml("external-name-service.yaml");
-		util.createAndWait(NAMESPACE, null, null, externalNameService, null, true);
+		util.createAndWait(NAMESPACE, null, null, externalNameService, true);
 	}
 
 	@AfterEach
 	void afterEach() {
 		util.busybox(NAMESPACE, Phase.DELETE);
-		util.deleteAndWait(NAMESPACE, null, externalNameService, null);
+		util.deleteAndWait(NAMESPACE, null, externalNameService);
 	}
 
 	@Test
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientReactiveIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientReactiveIT.java
@@ -60,12 +60,12 @@ class KubernetesClientReactiveIT extends KubernetesClientDiscoveryBase {
 	@BeforeEach
 	void beforeEach() {
 		Images.loadWiremock(K3S);
-		util.wiremock(NAMESPACE, "/", Phase.CREATE);
+		util.wiremock(NAMESPACE, Phase.CREATE, true);
 	}
 
 	@AfterEach
 	void afterEach() {
-		util.wiremock(NAMESPACE, "/", Phase.DELETE);
+		util.wiremock(NAMESPACE, Phase.DELETE, true);
 	}
 
 	/**
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/TestAssertions.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/TestAssertions.java
@@ -133,8 +133,8 @@ static void assertPodMetadata(DiscoveryClient discoveryClient) {
 		assertThat(wiremockInstance.getServiceId()).isEqualTo("service-wiremock");
 		assertThat(wiremockInstance.getInstanceId()).isNotNull();
 		assertThat(wiremockInstance.getHost()).isNotNull();
-		assertThat(wiremockInstance.getMetadata()).isEqualTo(Map.of("k8s_namespace", "default", "type", "ClusterIP",
-				"port.http", "8080", "app", "service-wiremock"));
+		assertThat(wiremockInstance.getMetadata()).isEqualTo(
+				Map.of("k8s_namespace", "default", "type", "NodePort", "port.http", "8080", "app", "service-wiremock"));
 
 	}
 
@@ -147,8 +147,8 @@ static void assertPodMetadata(ReactiveDiscoveryClient discoveryClient) {
 		assertThat(wiremockInstance.getServiceId()).isEqualTo("service-wiremock");
 		assertThat(wiremockInstance.getInstanceId()).isNotNull();
 		assertThat(wiremockInstance.getHost()).isNotNull();
-		assertThat(wiremockInstance.getMetadata()).isEqualTo(Map.of("k8s_namespace", "default", "type", "ClusterIP",
-				"port.http", "8080", "app", "service-wiremock"));
+		assertThat(wiremockInstance.getMetadata()).isEqualTo(
+				Map.of("k8s_namespace", "default", "type", "NodePort", "port.http", "8080", "app", "service-wiremock"));
 
 	}
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBusKafkaIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBusKafkaIT.java
@@ -22,7 +22,6 @@
 import io.kubernetes.client.openapi.models.V1ConfigMap;
 import io.kubernetes.client.openapi.models.V1ConfigMapBuilder;
 import io.kubernetes.client.openapi.models.V1Deployment;
-import io.kubernetes.client.openapi.models.V1Ingress;
 import io.kubernetes.client.openapi.models.V1Service;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
@@ -153,7 +152,7 @@ void testRefresh() {
 		util.createAndWait(NAMESPACE, configMap, null);
 
 		WebClient.Builder builder = builder();
-		WebClient serviceClient = builder.baseUrl("http://localhost:80/app").build();
+		WebClient serviceClient = builder.baseUrl("http://localhost:32321/app").build();
 
 		Boolean[] value = new Boolean[1];
 		await().pollInterval(Duration.ofSeconds(3)).atMost(Duration.ofSeconds(240)).until(() -> {
@@ -173,13 +172,12 @@ void testRefresh() {
 	private void app(Phase phase) {
 		V1Deployment deployment = (V1Deployment) util.yaml("app/app-deployment.yaml");
 		V1Service service = (V1Service) util.yaml("app/app-service.yaml");
-		V1Ingress ingress = (V1Ingress) util.yaml("ingress/ingress.yaml");
 
 		if (phase.equals(Phase.CREATE)) {
-			util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
+			util.createAndWait(NAMESPACE, null, deployment, service, true);
 		}
 		else if (phase.equals(Phase.DELETE)) {
-			util.deleteAndWait(NAMESPACE, deployment, service, ingress);
+			util.deleteAndWait(NAMESPACE, deployment, service);
 		}
 	}
 
@@ -188,10 +186,10 @@ private void configWatcher(Phase phase) {
 		V1Service service = (V1Service) util.yaml("config-watcher/watcher-kus-kafka-service.yaml");
 
 		if (phase.equals(Phase.CREATE)) {
-			util.createAndWait(NAMESPACE, null, deployment, service, null, true);
+			util.createAndWait(NAMESPACE, null, deployment, service, true);
 		}
 		else if (phase.equals(Phase.DELETE)) {
-			util.deleteAndWait(NAMESPACE, deployment, service, null);
+			util.deleteAndWait(NAMESPACE, deployment, service);
 		}
 	}
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/src/test/resources/app/app-service.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/src/test/resources/app/app-service.yaml
@@ -9,6 +9,7 @@ spec:
     - name: http
       port: 8081
       targetPort: 8081
+      nodePort: 32321
   selector:
     app: app
-  type: ClusterIP
+  type: NodePort
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/src/test/resources/ingress/ingress.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload/kafka-configmap-test-app/src/test/resources/ingress/ingress.yaml
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBusAmqpIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherBusAmqpIT.java
@@ -20,7 +20,6 @@
 import java.util.Objects;
 
 import io.kubernetes.client.openapi.models.V1Deployment;
-import io.kubernetes.client.openapi.models.V1Ingress;
 import io.kubernetes.client.openapi.models.V1Secret;
 import io.kubernetes.client.openapi.models.V1SecretBuilder;
 import io.kubernetes.client.openapi.models.V1Service;
@@ -103,7 +102,7 @@ void testRefresh() {
 		util.createAndWait(NAMESPACE, null, secret);
 
 		WebClient.Builder builder = builder();
-		WebClient serviceClient = builder.baseUrl("http://localhost:80/app").build();
+		WebClient serviceClient = builder.baseUrl("http://localhost:32321/app").build();
 
 		Boolean[] value = new Boolean[1];
 		await().pollInterval(Duration.ofSeconds(3)).atMost(Duration.ofSeconds(240)).until(() -> {
@@ -122,13 +121,12 @@ void testRefresh() {
 	private void appA(Phase phase) {
 		V1Deployment deployment = (V1Deployment) util.yaml("app/app-deployment.yaml");
 		V1Service service = (V1Service) util.yaml("app/app-service.yaml");
-		V1Ingress ingress = (V1Ingress) util.yaml("ingress/ingress.yaml");
 
 		if (phase.equals(Phase.CREATE)) {
-			util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
+			util.createAndWait(NAMESPACE, null, deployment, service, true);
 		}
 		else if (phase.equals(Phase.DELETE)) {
-			util.deleteAndWait(NAMESPACE, deployment, service, ingress);
+			util.deleteAndWait(NAMESPACE, deployment, service);
 		}
 	}
 
@@ -137,10 +135,10 @@ private void configWatcher(Phase phase) {
 		V1Service service = (V1Service) util.yaml("config-watcher/watcher-service.yaml");
 
 		if (phase.equals(Phase.CREATE)) {
-			util.createAndWait(NAMESPACE, null, deployment, service, null, true);
+			util.createAndWait(NAMESPACE, null, deployment, service, true);
 		}
 		else if (phase.equals(Phase.DELETE)) {
-			util.deleteAndWait(NAMESPACE, deployment, service, null);
+			util.deleteAndWait(NAMESPACE, deployment, service);
 		}
 	}
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload/rabbitmq-secret-test-app/src/test/resources/app/app-service.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload/rabbitmq-secret-test-app/src/test/resources/app/app-service.yaml
@@ -9,6 +9,7 @@ spec:
     - name: http
       port: 8080
       targetPort: 8080
+      nodePort: 32321
   selector:
     app: app
-  type: ClusterIP
+  type: NodePort
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload/rabbitmq-secret-test-app/src/test/resources/ingress/ingress.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload/rabbitmq-secret-test-app/src/test/resources/ingress/ingress.yaml
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/it/K8sClientReloadBase.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/it/K8sClientReloadBase.java
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
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
diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/wiremock/wiremock-ingress.yaml b/spring-cloud-kubernetes-test-support/src/main/resources/wiremock/wiremock-ingress.yaml
diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/wiremock/wiremock-service.yaml b/spring-cloud-kubernetes-test-support/src/main/resources/wiremock/wiremock-service.yaml

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,6 @@`
`44`	`44`	`*/`
`45`	`45`	`class ActuatorRefreshIT {`
`46`	`46`
`47`		`- private static final String WIREMOCK_PATH = "/";`
`48`		`-`
`49`	`47`	`private static final String NAMESPACE = "default";`
`50`	`48`
`51`	`49`	`private static final K3sContainer K3S = Commons.container();`
`@@ -72,12 +70,12 @@ static void afterAll() {`
`72`	`70`
`73`	`71`	`@BeforeEach`
`74`	`72`	`void setup() {`
`75`		`- util.wiremock(NAMESPACE, WIREMOCK_PATH, Phase.CREATE);`
	`73`	`+ util.wiremock(NAMESPACE, Phase.CREATE, true);`
`76`	`74`	`}`
`77`	`75`
`78`	`76`	`@AfterEach`
`79`	`77`	`void after() {`
`80`		`- util.wiremock(NAMESPACE, WIREMOCK_PATH, Phase.DELETE);`
	`78`	`+ util.wiremock(NAMESPACE, Phase.DELETE, true);`
`81`	`79`	`}`
`82`	`80`
`83`	`81`	`/*`
`@@ -114,10 +112,10 @@ private static void configWatcher(Phase phase) {`
`114`	`112`	`deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);`
`115`	`113`
`116`	`114`	`if (phase.equals(Phase.CREATE)) {`
`117`		`- util.createAndWait(NAMESPACE, null, deployment, service, null, true);`
	`115`	`+ util.createAndWait(NAMESPACE, null, deployment, service, true);`
`118`	`116`	`}`
`119`	`117`	`else {`
`120`		`- util.deleteAndWait(NAMESPACE, deployment, service, null);`
	`118`	`+ util.deleteAndWait(NAMESPACE, deployment, service);`
`121`	`119`	`}`
`122`	`120`
`123`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,10 +93,10 @@ protected static void discoveryServer(Phase phase) {`
`93`	`93`	`V1Service service = (V1Service) util.yaml("manifests/discoveryserver-service.yaml");`
`94`	`94`
`95`	`95`	`if (phase.equals(Phase.CREATE)) {`
`96`		`- util.createAndWait(NAMESPACE, null, deployment, service, null, true);`
	`96`	`+ util.createAndWait(NAMESPACE, null, deployment, service, true);`
`97`	`97`	`}`
`98`	`98`	`else {`
`99`		`- util.deleteAndWait(NAMESPACE, deployment, service, null);`
	`99`	`+ util.deleteAndWait(NAMESPACE, deployment, service);`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -60,12 +60,12 @@ class KubernetesClientBlockingIT extends KubernetesClientDiscoveryBase {`
`60`	`60`	`@BeforeEach`
`61`	`61`	`void beforeEach() {`
`62`	`62`	`Images.loadWiremock(K3S);`
`63`		`- util.wiremock(NAMESPACE, "/", Phase.CREATE);`
	`63`	`+ util.wiremock(NAMESPACE, Phase.CREATE, true);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`@AfterEach`
`67`	`67`	`void afterEach() {`
`68`		`- util.wiremock(NAMESPACE, "/", Phase.DELETE);`
	`68`	`+ util.wiremock(NAMESPACE, Phase.DELETE, true);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,13 @@ void beforeEach() {`
`64`	`64`	`util.busybox(NAMESPACE, Phase.CREATE);`
`65`	`65`
`66`	`66`	`externalNameService = (V1Service) util.yaml("external-name-service.yaml");`
`67`		`- util.createAndWait(NAMESPACE, null, null, externalNameService, null, true);`
	`67`	`+ util.createAndWait(NAMESPACE, null, null, externalNameService, true);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@AfterEach`
`71`	`71`	`void afterEach() {`
`72`	`72`	`util.busybox(NAMESPACE, Phase.DELETE);`
`73`		`- util.deleteAndWait(NAMESPACE, null, externalNameService, null);`
	`73`	`+ util.deleteAndWait(NAMESPACE, null, externalNameService);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@Test`