first

wind57 · wind57 · commit 6d507424b0e6 · 2025-03-28T14:56:12.000+02:00
Signed-off-by: wind57 &lt;eugen.rabii@gmail.com&gt;
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
@@ -114,10 +114,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
@@ -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-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);
+		util.wiremock(NAMESPACE_RIGHT, Phase.CREATE);
 	}
 
 	@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);
+		util.wiremock(NAMESPACE_RIGHT, Phase.DELETE);
 
 		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/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-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
@@ -103,7 +103,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 +122,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 +136,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/config-watcher/watcher-service.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload/rabbitmq-secret-test-app/src/test/resources/config-watcher/watcher-service.yaml
@@ -9,6 +9,7 @@ spec:
     - name: http
       port: 8888
       targetPort: 8888
+      nodePort: 32321
   selector:
     app: configuration-watcher
-  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
@@ -105,11 +105,11 @@ protected static void manifests(Phase phase, Util util, String namespace, String
 
 		if (phase.equals(Phase.CREATE)) {
 			util.createAndWait(namespace, configMap, null);
-			util.createAndWait(namespace, imageName, deployment, service, null, true);
+			util.createAndWait(namespace, imageName, deployment, service, true);
 		}
 		else {
 			util.deleteAndWait(namespace, configMap, null);
-			util.deleteAndWait(namespace, deployment, service, null);
+			util.deleteAndWait(namespace, deployment, service);
 		}
 
 	}
@@ -122,11 +122,11 @@ protected static void manifestsSecret(Phase phase, Util util, String namespace,
 
 		if (phase.equals(Phase.CREATE)) {
 			util.createAndWait(namespace, null, secret);
-			util.createAndWait(namespace, imageName, deployment, service, null, true);
+			util.createAndWait(namespace, imageName, deployment, service, true);
 		}
 		else {
 			util.deleteAndWait(namespace, null, secret);
-			util.deleteAndWait(namespace, deployment, service, null);
+			util.deleteAndWait(namespace, deployment, service);
 		}
 
 	}
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

Original file line number	Diff line number	Diff line change
`@@ -114,10 +114,10 @@ private static void configWatcher(Phase phase) {`
`114`	`114`	`deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);`
`115`	`115`
`116`	`116`	`if (phase.equals(Phase.CREATE)) {`
`117`		`- util.createAndWait(NAMESPACE, null, deployment, service, null, true);`
	`117`	`+ util.createAndWait(NAMESPACE, null, deployment, service, true);`
`118`	`118`	`}`
`119`	`119`	`else {`
`120`		`- util.deleteAndWait(NAMESPACE, deployment, service, null);`
	`120`	`+ util.deleteAndWait(NAMESPACE, deployment, service);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,10 +128,10 @@ private static void configWatcher(Phase phase) {`
`128`	`128`	`.yaml("config-watcher/spring-cloud-kubernetes-configuration-watcher-service.yaml");`
`129`	`129`
`130`	`130`	`if (phase.equals(Phase.CREATE)) {`
`131`		`- util.createAndWait(DEFAULT_NAMESPACE, null, deployment, service, null, true);`
	`131`	`+ util.createAndWait(DEFAULT_NAMESPACE, null, deployment, service, true);`
`132`	`132`	`}`
`133`	`133`	`else {`
`134`		`- util.deleteAndWait(DEFAULT_NAMESPACE, deployment, service, null);`
	`134`	`+ util.deleteAndWait(DEFAULT_NAMESPACE, deployment, service);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`}`
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
`@@ -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`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ void testRefresh() {`
`103`	`103`	`util.createAndWait(NAMESPACE, null, secret);`
`104`	`104`
`105`	`105`	`WebClient.Builder builder = builder();`
`106`		`- WebClient serviceClient = builder.baseUrl("http://localhost:80/app").build();`
	`106`	`+ WebClient serviceClient = builder.baseUrl("http://localhost:32321/app").build();`
`107`	`107`
`108`	`108`	`Boolean[] value = new Boolean[1];`
`109`	`109`	`await().pollInterval(Duration.ofSeconds(3)).atMost(Duration.ofSeconds(240)).until(() -> {`
`@@ -122,13 +122,12 @@ void testRefresh() {`
`122`	`122`	`private void appA(Phase phase) {`
`123`	`123`	`V1Deployment deployment = (V1Deployment) util.yaml("app/app-deployment.yaml");`
`124`	`124`	`V1Service service = (V1Service) util.yaml("app/app-service.yaml");`
`125`		`- V1Ingress ingress = (V1Ingress) util.yaml("ingress/ingress.yaml");`
`126`	`125`
`127`	`126`	`if (phase.equals(Phase.CREATE)) {`
`128`		`- util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);`
	`127`	`+ util.createAndWait(NAMESPACE, null, deployment, service, true);`
`129`	`128`	`}`
`130`	`129`	`else if (phase.equals(Phase.DELETE)) {`
`131`		`- util.deleteAndWait(NAMESPACE, deployment, service, ingress);`
	`130`	`+ util.deleteAndWait(NAMESPACE, deployment, service);`
`132`	`131`	`}`
`133`	`132`	`}`
`134`	`133`
`@@ -137,10 +136,10 @@ private void configWatcher(Phase phase) {`
`137`	`136`	`V1Service service = (V1Service) util.yaml("config-watcher/watcher-service.yaml");`
`138`	`137`
`139`	`138`	`if (phase.equals(Phase.CREATE)) {`
`140`		`- util.createAndWait(NAMESPACE, null, deployment, service, null, true);`
	`139`	`+ util.createAndWait(NAMESPACE, null, deployment, service, true);`
`141`	`140`	`}`
`142`	`141`	`else if (phase.equals(Phase.DELETE)) {`
`143`		`- util.deleteAndWait(NAMESPACE, deployment, service, null);`
	`142`	`+ util.deleteAndWait(NAMESPACE, deployment, service);`
`144`	`143`	`}`
`145`	`144`	`}`
`146`	`145`