From cfec3904e262c7e188c96939add97b57414da762 Mon Sep 17 00:00:00 2001 From: erabii Date: Thu, 12 Oct 2023 16:42:37 +0300 Subject: [PATCH] Fabric8 it part 9 (#1476) --- .../pom.xml | 3 +- .../Fabric8ApplicationDiscoveryListener.java | 2 +- .../discovery/Fabric8DiscoveryApp.java | 2 +- .../discovery/Fabric8DiscoveryController.java | 3 +- .../Fabric8ReactiveDiscoveryController.java | 2 +- .../Fabric8DiscoveryClientHealthDelegate.java | 6 ++-- .../discovery/Fabric8DiscoveryClientUtil.java | 2 +- .../discovery/Fabric8DiscoveryDelegate.java | 6 ++-- .../Fabric8DiscoveryFilterDelegate.java | 6 ++-- .../Fabric8DiscoveryNamespaceDelegate.java | 6 ++-- .../Fabric8DiscoveryPodMetadataIT.java | 16 +++++------ .../pom.xml | 2 +- .../k8s/client/discovery}/DiscoveryApp.java | 2 +- .../DiscoveryApplicationListener.java | 2 +- .../discovery}/DiscoveryController.java | 2 +- .../ReactiveDiscoveryController.java | 2 +- .../src/main/resources/application.yaml | 0 .../KubernetesClientDiscoveryClientIT.java | 22 +++++++-------- .../KubernetesClientDiscoveryClientUtils.java | 28 +++++++++---------- ...rnetesClientDiscoveryFilterITDelegate.java | 4 +-- ...rnetesClientDiscoveryHealthITDelegate.java | 26 ++++++++--------- ...MultipleSelectiveNamespacesITDelegate.java | 4 +-- ...sClientDiscoveryPodMetadataITDelegate.java | 10 +++---- ...sClientDiscoverySelectiveNamespacesIT.java | 6 ++-- .../kubernetes-discovery-deployment.yaml | 10 +++---- .../kubernetes-discovery-ingress.yaml | 4 +-- .../kubernetes-discovery-service.yaml | 6 ++-- .../src/test/resources/logback-test.xml | 0 28 files changed, 92 insertions(+), 92 deletions(-) rename spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/{ => client}/discovery/Fabric8ApplicationDiscoveryListener.java (95%) rename spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/{ => client}/discovery/Fabric8DiscoveryApp.java (92%) rename spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/{ => client}/discovery/Fabric8DiscoveryController.java (92%) rename spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/{ => client}/discovery/Fabric8ReactiveDiscoveryController.java (96%) rename spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/{ => client}/discovery/Fabric8DiscoveryClientHealthDelegate.java (96%) rename spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/{ => client}/discovery/Fabric8DiscoveryClientUtil.java (98%) rename spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/{ => client}/discovery/Fabric8DiscoveryDelegate.java (90%) rename spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/{ => client}/discovery/Fabric8DiscoveryFilterDelegate.java (94%) rename spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/{ => client}/discovery/Fabric8DiscoveryNamespaceDelegate.java (86%) rename spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/{ => client}/discovery/Fabric8DiscoveryPodMetadataIT.java (92%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it => spring-cloud-kubernetes-k8s-client-discovery}/pom.xml (97%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it => spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery}/DiscoveryApp.java (93%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it => spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery}/DiscoveryApplicationListener.java (96%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it => spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery}/DiscoveryController.java (96%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it => spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery}/ReactiveDiscoveryController.java (96%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it => spring-cloud-kubernetes-k8s-client-discovery}/src/main/resources/application.yaml (100%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it => spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery}/KubernetesClientDiscoveryClientIT.java (96%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it => spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery}/KubernetesClientDiscoveryClientUtils.java (91%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it => spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery}/KubernetesClientDiscoveryFilterITDelegate.java (98%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it => spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery}/KubernetesClientDiscoveryHealthITDelegate.java (92%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it => spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery}/KubernetesClientDiscoveryMultipleSelectiveNamespacesITDelegate.java (99%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it => spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery}/KubernetesClientDiscoveryPodMetadataITDelegate.java (91%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it => spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery}/KubernetesClientDiscoverySelectiveNamespacesIT.java (99%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it => spring-cloud-kubernetes-k8s-client-discovery}/src/test/resources/kubernetes-discovery-deployment.yaml (70%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it => spring-cloud-kubernetes-k8s-client-discovery}/src/test/resources/kubernetes-discovery-ingress.yaml (67%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it => spring-cloud-kubernetes-k8s-client-discovery}/src/test/resources/kubernetes-discovery-service.yaml (55%) rename spring-cloud-kubernetes-integration-tests/{spring-cloud-kubernetes-client-discovery-it => spring-cloud-kubernetes-k8s-client-discovery}/src/test/resources/logback-test.xml (100%) diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index d1b2bf62..3b84011d 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -52,6 +52,8 @@ spring-cloud-kubernetes-k8s-client-catalog-watcher spring-cloud-kubernetes-fabric8-client-discovery + spring-cloud-kubernetes-k8s-client-discovery + spring-cloud-kubernetes-fabric8-client-reload spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap spring-cloud-kubernetes-fabric8-istio-it @@ -62,6 +64,5 @@ spring-cloud-kubernetes-client-event-and-polling-reload spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps - spring-cloud-kubernetes-client-discovery-it diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ApplicationDiscoveryListener.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ApplicationDiscoveryListener.java similarity index 95% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ApplicationDiscoveryListener.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ApplicationDiscoveryListener.java index 78534a95..0ae7606a 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ApplicationDiscoveryListener.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ApplicationDiscoveryListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.discovery; +package org.springframework.cloud.kubernetes.fabric8.client.discovery; import io.fabric8.kubernetes.api.model.Pod; import org.apache.commons.logging.LogFactory; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryApp.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryApp.java similarity index 92% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryApp.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryApp.java index 88675932..1ef7ea1a 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryApp.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryApp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.discovery; +package org.springframework.cloud.kubernetes.fabric8.client.discovery; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryController.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryController.java similarity index 92% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryController.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryController.java index e56a8622..898c0ebf 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryController.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.discovery; +package org.springframework.cloud.kubernetes.fabric8.client.discovery; import java.util.List; @@ -22,6 +22,7 @@ import io.fabric8.kubernetes.api.model.Endpoints; import org.springframework.beans.factory.ObjectProvider; import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.kubernetes.fabric8.discovery.KubernetesDiscoveryClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ReactiveDiscoveryController.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ReactiveDiscoveryController.java similarity index 96% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ReactiveDiscoveryController.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ReactiveDiscoveryController.java index d497f6f1..d73cdfa6 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ReactiveDiscoveryController.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ReactiveDiscoveryController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.discovery; +package org.springframework.cloud.kubernetes.fabric8.client.discovery; import java.util.List; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientHealthDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientHealthDelegate.java similarity index 96% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientHealthDelegate.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientHealthDelegate.java index 4e2a932d..5f7a3493 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientHealthDelegate.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientHealthDelegate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.discovery; +package org.springframework.cloud.kubernetes.fabric8.client.discovery; import java.util.List; @@ -26,8 +26,8 @@ import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpMethod; import org.springframework.web.reactive.function.client.WebClient; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.builder; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.retrySpec; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.builder; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.retrySpec; import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.waitForLogStatement; /** diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientUtil.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientUtil.java similarity index 98% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientUtil.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientUtil.java index 15949ff3..b7f2c409 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientUtil.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.discovery; +package org.springframework.cloud.kubernetes.fabric8.client.discovery; import java.time.Duration; import java.util.Objects; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryDelegate.java similarity index 90% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryDelegate.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryDelegate.java index e997d422..f4debd42 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryDelegate.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryDelegate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.discovery; +package org.springframework.cloud.kubernetes.fabric8.client.discovery; import java.util.List; import java.util.Map; @@ -26,8 +26,8 @@ import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpMethod; import org.springframework.web.reactive.function.client.WebClient; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.builder; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.retrySpec; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.builder; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.retrySpec; /** * @author wind57 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryFilterDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterDelegate.java similarity index 94% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryFilterDelegate.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterDelegate.java index 51a40692..6e15af66 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryFilterDelegate.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterDelegate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.discovery; +package org.springframework.cloud.kubernetes.fabric8.client.discovery; import java.util.Comparator; import java.util.List; @@ -27,8 +27,8 @@ import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpMethod; import org.springframework.web.reactive.function.client.WebClient; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.builder; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.retrySpec; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.builder; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.retrySpec; final class Fabric8DiscoveryFilterDelegate { diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryNamespaceDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryNamespaceDelegate.java similarity index 86% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryNamespaceDelegate.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryNamespaceDelegate.java index 70e90c0c..59c7db5a 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryNamespaceDelegate.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryNamespaceDelegate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.discovery; +package org.springframework.cloud.kubernetes.fabric8.client.discovery; import java.util.List; @@ -25,8 +25,8 @@ import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpMethod; import org.springframework.web.reactive.function.client.WebClient; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.builder; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.retrySpec; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.builder; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.retrySpec; /** * @author mbialkowski1 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java similarity index 92% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java index 758bc354..3a5aefb0 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.fabric8.discovery; +package org.springframework.cloud.kubernetes.fabric8.client.discovery; import java.io.InputStream; import java.time.Duration; @@ -49,13 +49,13 @@ import org.springframework.http.HttpMethod; import org.springframework.http.client.reactive.ReactorClientHttpConnector; import org.springframework.web.reactive.function.client.WebClient; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.BODY_FIVE; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.BODY_FOUR; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.BODY_ONE; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.BODY_SEVEN; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.BODY_SIX; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.BODY_THREE; -import static org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientUtil.BODY_TWO; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_FIVE; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_FOUR; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_ONE; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_SEVEN; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_SIX; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_THREE; +import static org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryClientUtil.BODY_TWO; import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.pomVersion; /** diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml similarity index 97% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml index ec84212c..4405f5db 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - spring-cloud-kubernetes-client-discovery-it + spring-cloud-kubernetes-k8s-client-discovery diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/DiscoveryApp.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/DiscoveryApp.java similarity index 93% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/DiscoveryApp.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/DiscoveryApp.java index 3a430e58..af9e0fdb 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/DiscoveryApp.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/DiscoveryApp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.discovery.it; +package org.springframework.cloud.kubernetes.k8s.client.discovery; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/DiscoveryApplicationListener.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/DiscoveryApplicationListener.java similarity index 96% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/DiscoveryApplicationListener.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/DiscoveryApplicationListener.java index 01903f24..37af2c70 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/DiscoveryApplicationListener.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/DiscoveryApplicationListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.discovery.it; +package org.springframework.cloud.kubernetes.k8s.client.discovery; import io.kubernetes.client.openapi.models.V1Pod; import org.apache.commons.logging.LogFactory; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/DiscoveryController.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/DiscoveryController.java similarity index 96% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/DiscoveryController.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/DiscoveryController.java index d0ca41c4..189b24bd 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/DiscoveryController.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/DiscoveryController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.discovery.it; +package org.springframework.cloud.kubernetes.k8s.client.discovery; import java.util.List; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/ReactiveDiscoveryController.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/ReactiveDiscoveryController.java similarity index 96% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/ReactiveDiscoveryController.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/ReactiveDiscoveryController.java index 59cd031b..bd79be65 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/ReactiveDiscoveryController.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/ReactiveDiscoveryController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.discovery.it; +package org.springframework.cloud.kubernetes.k8s.client.discovery; import java.util.List; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/resources/application.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/resources/application.yaml similarity index 100% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/resources/application.yaml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/resources/application.yaml diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryClientIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientIT.java similarity index 96% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryClientIT.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientIT.java index 57ddb417..031922d6 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryClientIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.discovery.it; +package org.springframework.cloud.kubernetes.k8s.client.discovery; import java.time.Duration; import java.util.ArrayList; @@ -62,9 +62,9 @@ class KubernetesClientDiscoveryClientIT { private static final String NAMESPACE_B = "b"; - private static final String IMAGE_NAME = "spring-cloud-kubernetes-client-discovery-it"; + private static final String IMAGE_NAME = "spring-cloud-kubernetes-k8s-client-discovery"; - private static final String DEPLOYMENT_NAME = "spring-cloud-kubernetes-client-discovery-deployment-it"; + private static final String DEPLOYMENT_NAME = "spring-cloud-kubernetes-k8s-client-discovery"; private static final String NAMESPACE_A_UAT = "a-uat"; @@ -113,11 +113,11 @@ class KubernetesClientDiscoveryClientIT { Assertions.assertEquals(servicesResult.size(), 3); Assertions.assertTrue(servicesResult.contains("kubernetes")); - Assertions.assertTrue(servicesResult.contains("spring-cloud-kubernetes-client-discovery-it")); + Assertions.assertTrue(servicesResult.contains("spring-cloud-kubernetes-k8s-client-discovery")); Assertions.assertTrue(servicesResult.contains("busybox-service")); WebClient ourServiceClient = builder() - .baseUrl("http://localhost/service-instances/spring-cloud-kubernetes-client-discovery-it").build(); + .baseUrl("http://localhost/service-instances/spring-cloud-kubernetes-k8s-client-discovery").build(); List ourServiceInstances = ourServiceClient.method(HttpMethod.GET).retrieve() .bodyToMono(new ParameterizedTypeReference>() { @@ -128,10 +128,10 @@ class KubernetesClientDiscoveryClientIT { DefaultKubernetesServiceInstance serviceInstance = ourServiceInstances.get(0); Assertions.assertNotNull(serviceInstance.getInstanceId()); - Assertions.assertEquals(serviceInstance.getServiceId(), "spring-cloud-kubernetes-client-discovery-it"); + Assertions.assertEquals(serviceInstance.getServiceId(), "spring-cloud-kubernetes-k8s-client-discovery"); Assertions.assertNotNull(serviceInstance.getHost()); Assertions.assertEquals(serviceInstance.getMetadata(), - Map.of("app", "spring-cloud-kubernetes-client-discovery-it", "custom-spring-k8s", "spring-k8s", "http", + Map.of("app", "spring-cloud-kubernetes-k8s-client-discovery", "custom-spring-k8s", "spring-k8s", "http", "8080", "k8s_namespace", "default", "type", "ClusterIP")); Assertions.assertEquals(serviceInstance.getPort(), 8080); Assertions.assertEquals(serviceInstance.getNamespace(), "default"); @@ -189,7 +189,7 @@ class KubernetesClientDiscoveryClientIT { }).retryWhen(retrySpec()).block(); Assertions.assertEquals(servicesResult.size(), 7); Assertions.assertTrue(servicesResult.contains("kubernetes")); - Assertions.assertTrue(servicesResult.contains("spring-cloud-kubernetes-client-discovery-it")); + Assertions.assertTrue(servicesResult.contains("spring-cloud-kubernetes-k8s-client-discovery")); Assertions.assertTrue(servicesResult.contains("busybox-service")); Assertions.assertTrue(servicesResult.contains("service-wiremock")); @@ -277,7 +277,7 @@ class KubernetesClientDiscoveryClientIT { @Order(4) void testSimplePodMetadata() { util.setUp(NAMESPACE); - String imageName = "docker.io/springcloud/spring-cloud-kubernetes-client-discovery-it:" + Commons.pomVersion(); + String imageName = "docker.io/springcloud/spring-cloud-kubernetes-k8s-client-discovery:" + Commons.pomVersion(); KubernetesClientDiscoveryClientUtils.patchForPodMetadata(imageName, DEPLOYMENT_NAME, NAMESPACE); new KubernetesClientDiscoveryPodMetadataITDelegate().testSimple(); } @@ -285,7 +285,7 @@ class KubernetesClientDiscoveryClientIT { @Test @Order(5) void filterMatchesOneNamespaceViaThePredicate() { - String imageName = "docker.io/springcloud/spring-cloud-kubernetes-client-discovery-it:" + Commons.pomVersion(); + String imageName = "docker.io/springcloud/spring-cloud-kubernetes-k8s-client-discovery:" + Commons.pomVersion(); KubernetesClientDiscoveryClientUtils.patchForUATNamespacesTests(imageName, DEPLOYMENT_NAME, NAMESPACE); new KubernetesClientDiscoveryFilterITDelegate().filterMatchesOneNamespaceViaThePredicate(util); @@ -318,7 +318,7 @@ class KubernetesClientDiscoveryClientIT { // filter tests are done, clean-up a bit to prepare everything for health tests deleteNamespacesAndWiremock(); - String imageName = "docker.io/springcloud/spring-cloud-kubernetes-client-discovery-it:" + Commons.pomVersion(); + String imageName = "docker.io/springcloud/spring-cloud-kubernetes-k8s-client-discovery:" + Commons.pomVersion(); KubernetesClientDiscoveryClientUtils.patchForBlockingHealth(imageName, DEPLOYMENT_NAME, NAMESPACE); new KubernetesClientDiscoveryHealthITDelegate().testBlockingConfiguration(K3S); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryClientUtils.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientUtils.java similarity index 91% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryClientUtils.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientUtils.java index 8a6406a3..b127e58f 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryClientUtils.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.discovery.it; +package org.springframework.cloud.kubernetes.k8s.client.discovery; import java.util.Map; @@ -26,7 +26,7 @@ import static org.springframework.cloud.kubernetes.integration.tests.commons.nat */ final class KubernetesClientDiscoveryClientUtils { - private static final Map POD_LABELS = Map.of("app", "spring-cloud-kubernetes-client-discovery-it"); + private static final Map POD_LABELS = Map.of("app", "spring-cloud-kubernetes-k8s-client-discovery"); // patch the filter so that it matches both namespaces private static final String BODY_ONE = """ @@ -35,7 +35,7 @@ final class KubernetesClientDiscoveryClientUtils { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-discovery", + "name": "spring-cloud-kubernetes-k8s-client-discovery", "env": [{ "name": "SPRING_CLOUD_KUBERNETES_DISCOVERY_FILTER", "value": "#root.metadata.namespace matches '^.*uat$'" @@ -53,7 +53,7 @@ final class KubernetesClientDiscoveryClientUtils { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-discovery", + "name": "spring-cloud-kubernetes-k8s-client-discovery", "env": [ { "name": "LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_DISCOVERY", @@ -96,7 +96,7 @@ final class KubernetesClientDiscoveryClientUtils { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-discovery", + "name": "spring-cloud-kubernetes-k8s-client-discovery", "env": [{ "name": "SPRING_CLOUD_DISCOVERY_BLOCKING_ENABLED", "value": "TRUE" @@ -117,7 +117,7 @@ final class KubernetesClientDiscoveryClientUtils { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-discovery", + "name": "spring-cloud-kubernetes-k8s-client-discovery", "image": "image_name_here", "env": [ { @@ -151,7 +151,7 @@ final class KubernetesClientDiscoveryClientUtils { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-discovery", + "name": "spring-cloud-kubernetes-k8s-client-discovery", "env": [{ "name": "SPRING_CLOUD_KUBERNETES_DISCOVERY_ALL_NAMESPACES", "value": "TRUE" @@ -170,7 +170,7 @@ final class KubernetesClientDiscoveryClientUtils { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-discovery", + "name": "spring-cloud-kubernetes-k8s-client-discovery", "env": [ { "name": "SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0", @@ -194,7 +194,7 @@ final class KubernetesClientDiscoveryClientUtils { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-discovery", + "name": "spring-cloud-kubernetes-k8s-client-discovery", "image": "image_name_here", "env": [ { @@ -231,7 +231,7 @@ final class KubernetesClientDiscoveryClientUtils { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-discovery", + "name": "spring-cloud-kubernetes-k8s-client-discovery", "env": [ { "name": "SPRING_CLOUD_DISCOVERY_REACTIVE_ENABLED", @@ -255,7 +255,7 @@ final class KubernetesClientDiscoveryClientUtils { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-discovery", + "name": "spring-cloud-kubernetes-k8s-client-discovery", "env": [ { "name": "SPRING_CLOUD_DISCOVERY_REACTIVE_ENABLED", @@ -279,7 +279,7 @@ final class KubernetesClientDiscoveryClientUtils { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-discovery", + "name": "spring-cloud-kubernetes-k8s-client-discovery", "env": [ { "name": "SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_1", @@ -303,7 +303,7 @@ final class KubernetesClientDiscoveryClientUtils { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-discovery", + "name": "spring-cloud-kubernetes-k8s-client-discovery", "env": [ { "name": "SPRING_CLOUD_DISCOVERY_BLOCKING_ENABLED", @@ -323,7 +323,7 @@ final class KubernetesClientDiscoveryClientUtils { "template": { "spec": { "containers": [{ - "name": "spring-cloud-kubernetes-client-discovery", + "name": "spring-cloud-kubernetes-k8s-client-discovery", "image": "image_name_here", "env": [ { diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryFilterITDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryFilterITDelegate.java similarity index 98% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryFilterITDelegate.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryFilterITDelegate.java index 9ec93f93..1a09df4b 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryFilterITDelegate.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryFilterITDelegate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.discovery.it; +package org.springframework.cloud.kubernetes.k8s.client.discovery; import java.time.Duration; import java.util.Comparator; @@ -47,7 +47,7 @@ class KubernetesClientDiscoveryFilterITDelegate { private static final String NAMESPACE = "default"; - private static final String DEPLOYMENT_NAME = "spring-cloud-kubernetes-client-discovery-deployment-it"; + private static final String DEPLOYMENT_NAME = "spring-cloud-kubernetes-k8s-client-discovery"; void filterMatchesOneNamespaceViaThePredicate(Util util) { diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryHealthITDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryHealthITDelegate.java similarity index 92% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryHealthITDelegate.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryHealthITDelegate.java index f11fb278..5a1d59be 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryHealthITDelegate.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryHealthITDelegate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.discovery.it; +package org.springframework.cloud.kubernetes.k8s.client.discovery; import java.time.Duration; import java.util.List; @@ -47,9 +47,7 @@ class KubernetesClientDiscoveryHealthITDelegate { private static final String NAMESPACE = "default"; - private static final String IMAGE_NAME = "spring-cloud-kubernetes-client-discovery-it"; - - private static final String DEPLOYMENT_NAME = "spring-cloud-kubernetes-client-discovery-deployment-it"; + private static final String DEPLOYMENT_NAME = "spring-cloud-kubernetes-k8s-client-discovery"; private static final BasicJsonTester BASIC_JSON_TESTER = new BasicJsonTester( KubernetesClientDiscoveryHealthITDelegate.class); @@ -68,7 +66,7 @@ class KubernetesClientDiscoveryHealthITDelegate { assertLogStatement(container, "publishing InstanceRegisteredEvent"); assertLogStatement(container, "Discovery Client has been initialized"); assertLogStatement(container, - "received InstanceRegisteredEvent from pod with 'app' label value : spring-cloud-kubernetes-client-discovery-it"); + "received InstanceRegisteredEvent from pod with 'app' label value : spring-cloud-kubernetes-k8s-client-discovery"); WebClient healthClient = builder().baseUrl("http://localhost/actuator/health").build(); @@ -84,7 +82,7 @@ class KubernetesClientDiscoveryHealthITDelegate { Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) .extractingJsonPathArrayValue( "$.components.discoveryComposite.components.discoveryClient.details.services") - .containsExactlyInAnyOrder("spring-cloud-kubernetes-client-discovery-it", "kubernetes"); + .containsExactlyInAnyOrder("spring-cloud-kubernetes-k8s-client-discovery", "kubernetes"); Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).doesNotHaveJsonPath(REACTIVE_STATUS); @@ -106,7 +104,7 @@ class KubernetesClientDiscoveryHealthITDelegate { assertLogStatement(container, "publishing InstanceRegisteredEvent"); assertLogStatement(container, "Discovery Client has been initialized"); assertLogStatement(container, - "received InstanceRegisteredEvent from pod with 'app' label value : spring-cloud-kubernetes-client-discovery-it"); + "received InstanceRegisteredEvent from pod with 'app' label value : spring-cloud-kubernetes-k8s-client-discovery"); WebClient healthClient = builder().baseUrl("http://localhost/actuator/health").build(); @@ -121,7 +119,7 @@ class KubernetesClientDiscoveryHealthITDelegate { Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathArrayValue( "$.components.reactiveDiscoveryClients.components.['Kubernetes Reactive Discovery Client'].details.services") - .containsExactlyInAnyOrder("spring-cloud-kubernetes-client-discovery-it", "kubernetes"); + .containsExactlyInAnyOrder("spring-cloud-kubernetes-k8s-client-discovery", "kubernetes"); Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).doesNotHaveJsonPath(BLOCKING_STATUS); @@ -133,7 +131,7 @@ class KubernetesClientDiscoveryHealthITDelegate { .bodyToMono(new ParameterizedTypeReference>() { }).retryWhen(retrySpec()).block(); - Assertions.assertThat(servicesResult).contains("spring-cloud-kubernetes-client-discovery-it"); + Assertions.assertThat(servicesResult).contains("spring-cloud-kubernetes-k8s-client-discovery"); Assertions.assertThat(servicesResult).contains("kubernetes"); } @@ -149,7 +147,7 @@ class KubernetesClientDiscoveryHealthITDelegate { assertLogStatement(container, "publishing InstanceRegisteredEvent"); assertLogStatement(container, "Discovery Client has been initialized"); assertLogStatement(container, - "received InstanceRegisteredEvent from pod with 'app' label value : spring-cloud-kubernetes-client-discovery-it"); + "received InstanceRegisteredEvent from pod with 'app' label value : spring-cloud-kubernetes-k8s-client-discovery"); WebClient healthClient = builder().baseUrl("http://localhost/actuator/health").build(); WebClient infoClient = builder().baseUrl("http://localhost/actuator/info").build(); @@ -169,7 +167,7 @@ class KubernetesClientDiscoveryHealthITDelegate { Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) .extractingJsonPathArrayValue( "$.components.discoveryComposite.components.discoveryClient.details.services") - .containsExactlyInAnyOrder("spring-cloud-kubernetes-client-discovery-it", "kubernetes"); + .containsExactlyInAnyOrder("spring-cloud-kubernetes-k8s-client-discovery", "kubernetes"); Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) .extractingJsonPathStringValue("$.components.reactiveDiscoveryClients.status").isEqualTo("UP"); @@ -180,7 +178,7 @@ class KubernetesClientDiscoveryHealthITDelegate { Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)).extractingJsonPathArrayValue( "$.components.reactiveDiscoveryClients.components.['Kubernetes Reactive Discovery Client'].details.services") - .containsExactlyInAnyOrder("spring-cloud-kubernetes-client-discovery-it", "kubernetes"); + .containsExactlyInAnyOrder("spring-cloud-kubernetes-k8s-client-discovery", "kubernetes"); // assert health/info also assertHealth(healthResult); @@ -199,7 +197,7 @@ class KubernetesClientDiscoveryHealthITDelegate { Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) .extractingJsonPathStringValue("$.components.kubernetes.details.labels.app") - .isEqualTo("spring-cloud-kubernetes-client-discovery-it"); + .isEqualTo("spring-cloud-kubernetes-k8s-client-discovery"); Assertions.assertThat(BASIC_JSON_TESTER.from(healthResult)) .extractingJsonPathStringValue("$.components.kubernetes.details.namespace").isNotEmpty(); @@ -251,7 +249,7 @@ class KubernetesClientDiscoveryHealthITDelegate { private void assertLogStatement(K3sContainer container, String message) { try { String appPodName = container.execInContainer("sh", "-c", - "kubectl get pods -l app=" + IMAGE_NAME + " -o=name --no-headers | tr -d '\n'").getStdout(); + "kubectl get pods -l app=" + DEPLOYMENT_NAME + " -o=name --no-headers | tr -d '\n'").getStdout(); await().pollDelay(Duration.ofSeconds(4)).pollInterval(Duration.ofSeconds(1)).atMost(20, TimeUnit.SECONDS) .until(() -> { diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryMultipleSelectiveNamespacesITDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryMultipleSelectiveNamespacesITDelegate.java similarity index 99% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryMultipleSelectiveNamespacesITDelegate.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryMultipleSelectiveNamespacesITDelegate.java index 6d36632b..a9963098 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryMultipleSelectiveNamespacesITDelegate.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryMultipleSelectiveNamespacesITDelegate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.discovery.it; +package org.springframework.cloud.kubernetes.k8s.client.discovery; import java.time.Duration; import java.util.Comparator; @@ -44,7 +44,7 @@ class KubernetesClientDiscoveryMultipleSelectiveNamespacesITDelegate { private static final String REACTIVE_PUBLISH = "Will publish InstanceRegisteredEvent from reactive implementation"; - private static final String IMAGE_NAME = "spring-cloud-kubernetes-client-discovery-it"; + private static final String IMAGE_NAME = "spring-cloud-kubernetes-k8s-client-discovery"; /** * Deploy wiremock in 3 namespaces: default, a, b. Search in selective namespaces 'a' diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryPodMetadataITDelegate.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryPodMetadataITDelegate.java similarity index 91% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryPodMetadataITDelegate.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryPodMetadataITDelegate.java index 5bfebc47..f1d1f931 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryPodMetadataITDelegate.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryPodMetadataITDelegate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.discovery.it; +package org.springframework.cloud.kubernetes.k8s.client.discovery; import java.time.Duration; import java.util.List; @@ -52,10 +52,10 @@ class KubernetesClientDiscoveryPodMetadataITDelegate { Assertions.assertEquals(servicesResult.size(), 2); Assertions.assertTrue(servicesResult.contains("kubernetes")); - Assertions.assertTrue(servicesResult.contains("spring-cloud-kubernetes-client-discovery-it")); + Assertions.assertTrue(servicesResult.contains("spring-cloud-kubernetes-k8s-client-discovery")); WebClient ourServiceClient = builder() - .baseUrl("http://localhost//service-instances/spring-cloud-kubernetes-client-discovery-it").build(); + .baseUrl("http://localhost//service-instances/spring-cloud-kubernetes-k8s-client-discovery").build(); List ourServiceInstances = ourServiceClient.method(HttpMethod.GET).retrieve() .bodyToMono(new ParameterizedTypeReference>() { @@ -66,11 +66,11 @@ class KubernetesClientDiscoveryPodMetadataITDelegate { DefaultKubernetesServiceInstance serviceInstance = ourServiceInstances.get(0); Assertions.assertNotNull(serviceInstance.getInstanceId()); - Assertions.assertEquals(serviceInstance.getServiceId(), "spring-cloud-kubernetes-client-discovery-it"); + Assertions.assertEquals(serviceInstance.getServiceId(), "spring-cloud-kubernetes-k8s-client-discovery"); Assertions.assertNotNull(serviceInstance.getHost()); Assertions.assertEquals(serviceInstance.getMetadata(), Map.of("http", "8080", "k8s_namespace", "default", "type", "ClusterIP", "label-app", - "spring-cloud-kubernetes-client-discovery-it", "annotation-custom-spring-k8s", "spring-k8s")); + "spring-cloud-kubernetes-k8s-client-discovery", "annotation-custom-spring-k8s", "spring-k8s")); Assertions.assertEquals(serviceInstance.getPort(), 8080); Assertions.assertEquals(serviceInstance.getNamespace(), "default"); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java similarity index 99% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java index 980c5e97..a8e51d5c 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.kubernetes.client.discovery.it; +package org.springframework.cloud.kubernetes.k8s.client.discovery; import java.time.Duration; import java.util.ArrayList; @@ -65,9 +65,9 @@ class KubernetesClientDiscoverySelectiveNamespacesIT { private static final String NAMESPACE_B = "b"; - private static final String IMAGE_NAME = "spring-cloud-kubernetes-client-discovery-it"; + private static final String IMAGE_NAME = "spring-cloud-kubernetes-k8s-client-discovery"; - private static final String DEPLOYMENT_NAME = "spring-cloud-kubernetes-client-discovery-deployment-it"; + private static final String DEPLOYMENT_NAME = "spring-cloud-kubernetes-k8s-client-discovery"; private static Util util; diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/kubernetes-discovery-deployment.yaml similarity index 70% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-deployment.yaml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/kubernetes-discovery-deployment.yaml index bb8eaa28..27045945 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-deployment.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/kubernetes-discovery-deployment.yaml @@ -1,20 +1,20 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: spring-cloud-kubernetes-client-discovery-deployment-it + name: spring-cloud-kubernetes-k8s-client-discovery spec: selector: matchLabels: - app: spring-cloud-kubernetes-client-discovery-it + app: spring-cloud-kubernetes-k8s-client-discovery template: metadata: labels: - app: spring-cloud-kubernetes-client-discovery-it + app: spring-cloud-kubernetes-k8s-client-discovery spec: serviceAccountName: spring-cloud-kubernetes-serviceaccount containers: - - name: spring-cloud-kubernetes-client-discovery - image: docker.io/springcloud/spring-cloud-kubernetes-client-discovery-it + - name: spring-cloud-kubernetes-k8s-client-discovery + image: docker.io/springcloud/spring-cloud-kubernetes-k8s-client-discovery imagePullPolicy: IfNotPresent readinessProbe: httpGet: diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-ingress.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/kubernetes-discovery-ingress.yaml similarity index 67% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-ingress.yaml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/kubernetes-discovery-ingress.yaml index 5bb49e97..27e02429 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-ingress.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/kubernetes-discovery-ingress.yaml @@ -1,7 +1,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: spring-cloud-kubernetes-client-discovery-ingress-it + name: spring-cloud-kubernetes-k8s-client-discovery namespace: default spec: rules: @@ -11,6 +11,6 @@ spec: pathType: Prefix backend: service: - name: spring-cloud-kubernetes-client-discovery-it + name: spring-cloud-kubernetes-k8s-client-discovery port: number: 8080 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-service.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/kubernetes-discovery-service.yaml similarity index 55% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-service.yaml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/kubernetes-discovery-service.yaml index 7b9592cf..4f19d879 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-service.yaml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/kubernetes-discovery-service.yaml @@ -2,15 +2,15 @@ apiVersion: v1 kind: Service metadata: labels: - app: spring-cloud-kubernetes-client-discovery-it + app: spring-cloud-kubernetes-k8s-client-discovery annotations: custom-spring-k8s: spring-k8s - name: spring-cloud-kubernetes-client-discovery-it + name: spring-cloud-kubernetes-k8s-client-discovery spec: ports: - name: http port: 8080 targetPort: 8080 selector: - app: spring-cloud-kubernetes-client-discovery-it + app: spring-cloud-kubernetes-k8s-client-discovery type: ClusterIP diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/logback-test.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/logback-test.xml rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/logback-test.xml