Merge branch 'main' into move-to-a-common-configuration-for-health

wind57 · Oct 7, 2023 · 237f4aa · 237f4aa
2 parents 3dc6b44 + 494454a
commit 237f4aa
Show file tree

Hide file tree

Showing 74 changed files with 1,022 additions and 2,333 deletions.
diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml
@@ -48,13 +48,10 @@
 	</dependencyManagement>
 
 	<modules>
-		<module>spring-cloud-kubernetes-fabric8-client-configmap</module>
 		<module>spring-cloud-kubernetes-fabric8-istio-it</module>
 		<module>spring-cloud-kubernetes-fabric8-client-discovery</module>
 		<module>spring-cloud-kubernetes-fabric8-client-loadbalancer</module>
-		<module>spring-cloud-kubernetes-fabric8-client-configmap-polling-reload</module>
-		<module>spring-cloud-kubernetes-fabric8-client-secrets-event-reload</module>
-		<module>spring-cloud-kubernetes-fabric8-client-configmap-event-reload</module>
+		<module>spring-cloud-kubernetes-fabric8-client-reload</module>
 
 		<module>spring-cloud-kubernetes-discoveryclient-it</module>
 		<module>spring-cloud-kubernetes-client-loadbalancer-it</module>

diff --git a/...s-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml b/...s-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml
diff --git a/...ework/cloud/kubernetes/fabric8/configmap/event/reload/DataChangesInConfigMapReloadIT.java b/...ework/cloud/kubernetes/fabric8/configmap/event/reload/DataChangesInConfigMapReloadIT.java
diff --git a/...ng-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/resources/ingress.yaml b/...ng-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/resources/ingress.yaml
diff --git a/...ng-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/resources/service.yaml b/...ng-cloud-kubernetes-fabric8-client-configmap-event-reload/src/test/resources/service.yaml