Merge branch 'main' of https://github.com/spring-cloud/spring-cloud-kubernetes

wind57 · wind57 · commit 82a3764e78fa · 2025-01-14T16:07:11.000+02:00
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryAllServicesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryAllServicesIT.java
@@ -49,10 +49,10 @@ static void beforeAllInNested() {
 
 	private void externalNameServices(Phase phase) {
 		if (phase == Phase.CREATE) {
-			util.createAndWait(NAMESPACE, null, null, externalServiceName, null, true);
+			util.createAndWait(NAMESPACE, null, null, externalServiceName, true);
 		}
 		else {
-			util.deleteAndWait(NAMESPACE, null, externalServiceName, null);
+			util.deleteAndWait(NAMESPACE, null, externalServiceName);
 		}
 	}
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchOneNamespaceIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchOneNamespaceIT.java
@@ -51,16 +51,16 @@ void beforeEach() {
 		util.createNamespace(NAMESPACE_A_UAT);
 		util.createNamespace(NAMESPACE_B_UAT);
 
-		util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.CREATE, false);
-		util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.CREATE, false);
+		util.wiremock(NAMESPACE_A_UAT, Phase.CREATE);
+		util.wiremock(NAMESPACE_B_UAT, Phase.CREATE);
 
 	}
 
 	@AfterEach
 	void afterEach() {
 
-		util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.DELETE, false);
-		util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.DELETE, false);
+		util.wiremock(NAMESPACE_A_UAT, Phase.DELETE);
+		util.wiremock(NAMESPACE_B_UAT, Phase.DELETE);
 
 		util.deleteNamespace(NAMESPACE_A_UAT);
 		util.deleteNamespace(NAMESPACE_B_UAT);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchTwoNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterMatchTwoNamespacesIT.java
@@ -51,16 +51,16 @@ void beforeEach() {
 		util.createNamespace(NAMESPACE_A_UAT);
 		util.createNamespace(NAMESPACE_B_UAT);
 
-		util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.CREATE, false);
-		util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.CREATE, false);
+		util.wiremock(NAMESPACE_A_UAT, Phase.CREATE);
+		util.wiremock(NAMESPACE_B_UAT, Phase.CREATE);
 
 	}
 
 	@AfterEach
 	void afterEach() {
 
-		util.wiremock(NAMESPACE_A_UAT, "/wiremock", Phase.DELETE, false);
-		util.wiremock(NAMESPACE_B_UAT, "/wiremock", Phase.DELETE, false);
+		util.wiremock(NAMESPACE_A_UAT, Phase.DELETE);
+		util.wiremock(NAMESPACE_B_UAT, Phase.DELETE);
 
 		util.deleteNamespace(NAMESPACE_A_UAT);
 		util.deleteNamespace(NAMESPACE_B_UAT);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/main/resources/bootstrap.yml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/main/resources/bootstrap.yml
@@ -1,8 +1,3 @@
-logging:
-  level:
-    org:
-      springframework: DEBUG
-
 spring:
   cloud:
     istio:
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/istio/Fabric8IstioIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/istio/Fabric8IstioIT.java
@@ -21,7 +21,6 @@
 
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
-import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
@@ -97,7 +96,7 @@ static void after() {
 
 	@Test
 	void test() {
-		WebClient client = builder().baseUrl("http://localhost/profiles").build();
+		WebClient client = builder().baseUrl("http://localhost:32321/profiles").build();
 
 		@SuppressWarnings("unchecked")
 		List<String> result = client.method(HttpMethod.GET)
@@ -114,18 +113,15 @@ private static void appManifests(Phase phase) {
 
 		InputStream deploymentStream = util.inputStream("istio-deployment.yaml");
 		InputStream serviceStream = util.inputStream("istio-service.yaml");
-		InputStream ingressStream = util.inputStream("istio-ingress.yaml");
 
 		Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class);
-
 		Service service = Serialization.unmarshal(serviceStream, Service.class);
-		Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class);
 
 		if (phase.equals(Phase.CREATE)) {
-			util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
+			util.createAndWait(NAMESPACE, null, deployment, service, true);
 		}
 		else {
-			util.deleteAndWait(NAMESPACE, deployment, service, ingress);
+			util.deleteAndWait(NAMESPACE, deployment, service);
 		}
 
 	}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/resources/istio-ingress.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/resources/istio-ingress.yaml
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/resources/istio-service.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/resources/istio-service.yaml
@@ -9,6 +9,7 @@ spec:
     - name: http
       port: 8080
       targetPort: 8080
+      nodePort: 32321
   selector:
     app: spring-cloud-kubernetes-fabric8-client-istio
-  type: ClusterIP
+  type: NodePort
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java
@@ -37,9 +37,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
-import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAssertions.builder;
 import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAssertions.manifests;
-import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAssertions.retrySpec;
+import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.builder;
+import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.retrySpec;
 
 /**
  * @author wind57
@@ -95,7 +95,7 @@ void test() {
 		Commons.waitForLogStatement("will add file-based property source : /tmp/application.properties", K3S,
 				IMAGE_NAME);
 		// (3)
-		WebClient webClient = builder().baseUrl("http://localhost/key").build();
+		WebClient webClient = builder().baseUrl("http://localhost:32321/key").build();
 		String result = webClient.method(HttpMethod.GET)
 			.retrieve()
 			.bodyToMono(String.class)
@@ -112,7 +112,8 @@ void test() {
 		configMap.setData(Map.of(Constants.APPLICATION_PROPERTIES, "from.properties.key=as-mount-changed"));
 		client.configMaps().inNamespace("default").resource(configMap).createOrReplace();
 
-		await().timeout(Duration.ofSeconds(360))
+		await().atMost(Duration.ofSeconds(120))
+			.pollInterval(Duration.ofSeconds(1))
 			.until(() -> webClient.method(HttpMethod.GET)
 				.retrieve()
 				.bodyToMono(String.class)
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/ConfigMapMountPollingReloadDelegateIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/ConfigMapMountPollingReloadDelegateIT.java
@@ -37,9 +37,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
-import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAssertions.builder;
 import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAssertions.manifests;
-import static org.springframework.cloud.kubernetes.fabric8.client.reload.TestAssertions.retrySpec;
+import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.builder;
+import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.retrySpec;
 
 /**
  * @author wind57
@@ -96,7 +96,7 @@ void test() {
 		Commons.waitForLogStatement("will add file-based property source : /tmp/application.properties", K3S,
 				IMAGE_NAME);
 		// (3)
-		WebClient webClient = builder().baseUrl("http://localhost/key").build();
+		WebClient webClient = builder().baseUrl("http://localhost:32321/key").build();
 		String result = webClient.method(HttpMethod.GET)
 			.retrieve()
 			.bodyToMono(String.class)
@@ -113,7 +113,8 @@ void test() {
 		configMap.setData(Map.of(Constants.APPLICATION_PROPERTIES, "from.properties.key=as-mount-changed"));
 		client.configMaps().inNamespace("default").resource(configMap).createOrReplace();
 
-		await().timeout(Duration.ofSeconds(360))
+		await().atMost(Duration.ofSeconds(120))
+			.pollInterval(Duration.ofSeconds(1))
 			.until(() -> webClient.method(HttpMethod.GET)
 				.retrieve()
 				.bodyToMono(String.class)
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/TestAssertions.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/TestAssertions.java
@@ -18,24 +18,17 @@
 
 import java.io.InputStream;
 import java.time.Duration;
-import java.util.Objects;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
-import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.utils.Serialization;
-import reactor.netty.http.client.HttpClient;
-import reactor.util.retry.Retry;
-import reactor.util.retry.RetryBackoffSpec;
 
 import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
 import org.springframework.cloud.kubernetes.integration.tests.commons.fabric8_client.Util;
-import org.springframework.http.client.reactive.ReactorClientHttpConnector;
-import org.springframework.web.reactive.function.client.WebClient;
 
 import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
 
@@ -96,32 +89,22 @@ static void manifests(Phase phase, Util util, String namespace) {
 
 		InputStream deploymentStream = util.inputStream("manifests/deployment.yaml");
 		InputStream serviceStream = util.inputStream("manifests/service.yaml");
-		InputStream ingressStream = util.inputStream("manifests/ingress.yaml");
 		InputStream configMapAsStream = util.inputStream("manifests/configmap.yaml");
 
 		Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class);
 
 		Service service = Serialization.unmarshal(serviceStream, Service.class);
-		Ingress ingress = Serialization.unmarshal(ingressStream, Ingress.class);
 		ConfigMap configMap = Serialization.unmarshal(configMapAsStream, ConfigMap.class);
 
 		if (phase.equals(Phase.CREATE)) {
 			util.createAndWait(namespace, configMap, null);
-			util.createAndWait(namespace, null, deployment, service, ingress, true);
+			util.createAndWait(namespace, null, deployment, service, true);
 		}
 		else {
 			util.deleteAndWait(namespace, configMap, null);
-			util.deleteAndWait(namespace, deployment, service, ingress);
+			util.deleteAndWait(namespace, deployment, service);
 		}
 
 	}
 
-	static WebClient.Builder builder() {
-		return WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.create()));
-	}
-
-	static RetryBackoffSpec retrySpec() {
-		return Retry.fixedDelay(120, Duration.ofSeconds(2)).filter(Objects::nonNull);
-	}
-
 }
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/resources/manifests/ingress.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/resources/manifests/ingress.yaml
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/resources/manifests/service.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/resources/manifests/service.yaml
@@ -9,6 +9,7 @@ spec:
     - name: http
       port: 8080
       targetPort: 8080
+      nodePort: 32321
   selector:
     app: spring-cloud-kubernetes-fabric8-client-reload
-  type: ClusterIP
+  type: NodePort
diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/FixedPortsK3sContainer.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/FixedPortsK3sContainer.java
@@ -37,7 +37,7 @@ final class FixedPortsK3sContainer extends K3sContainer {
 	/**
 	 * Test containers exposed ports.
 	 */
-	private static final int[] EXPOSED_PORTS = new int[] { 80, 6443, 8080, 8888, 9092 };
+	private static final int[] EXPOSED_PORTS = new int[] { 80, 6443, 8080, 8888, 9092, 32321 };
 
 	/**
 	 * Rancher version to use for test-containers.
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

Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,10 @@ static void beforeAllInNested() {`
`49`	`49`
`50`	`50`	`private void externalNameServices(Phase phase) {`
`51`	`51`	`if (phase == Phase.CREATE) {`
`52`		`- util.createAndWait(NAMESPACE, null, null, externalServiceName, null, true);`
	`52`	`+ util.createAndWait(NAMESPACE, null, null, externalServiceName, true);`
`53`	`53`	`}`
`54`	`54`	`else {`
`55`		`- util.deleteAndWait(NAMESPACE, null, externalServiceName, null);`
	`55`	`+ util.deleteAndWait(NAMESPACE, null, externalServiceName);`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
-Original file line number
+Diff line change
@@ @@ -1,8 +1,3 @@ @@
 -logging:
 -  level:
 -    org:
 -      springframework: DEBUG
+-
 spring:
   cloud:
     istio: