SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x'

Browse Source
This commit is contained in:
Ryan Baxter
2023-10-12 09:43:03 -04:00
parent d703431963 cfec3904e2
commit bf8aa200d4
28 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-kubernetes-integration-tests/pom.xml
View File

@@ -52,6 +52,8 @@
<module>spring-cloud-kubernetes-k8s-client-catalog-watcher</module>
<module>spring-cloud-kubernetes-fabric8-client-discovery</module>
<module>spring-cloud-kubernetes-k8s-client-discovery</module>
<module>spring-cloud-kubernetes-fabric8-client-reload</module>
<module>spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap</module>
<module>spring-cloud-kubernetes-fabric8-istio-it</module>
@@ -62,6 +64,5 @@
<module>spring-cloud-kubernetes-client-event-and-polling-reload</module>
<module>spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps</module>
<module>spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps</module>
<module>spring-cloud-kubernetes-client-discovery-it</module>
</modules>
</project>

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ApplicationDiscoveryListener.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ApplicationDiscoveryListener.java
View File

@@ -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;

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryApp.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryApp.java
View File

@@ -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;

3
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryController.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryController.java
View File

@@ -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;

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ReactiveDiscoveryController.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8ReactiveDiscoveryController.java
View File

@@ -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;

6
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientHealthDelegate.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientHealthDelegate.java
View File

@@ -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;
/**

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientUtil.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryClientUtil.java
View File

@@ -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;

6
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryDelegate.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryDelegate.java
View File

@@ -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

6
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryFilterDelegate.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryFilterDelegate.java
View File

@@ -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 {

6
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryNamespaceDelegate.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryNamespaceDelegate.java
View File

@@ -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

16
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryPodMetadataIT.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java
View File

@@ -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;
/**

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml
View File

@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-kubernetes-client-discovery-it</artifactId>
<artifactId>spring-cloud-kubernetes-k8s-client-discovery</artifactId>
<dependencies>
<dependency>

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/DiscoveryApp.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/DiscoveryApp.java
View File

@@ -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;

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/DiscoveryApplicationListener.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/DiscoveryApplicationListener.java
View File

@@ -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;

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/DiscoveryController.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/DiscoveryController.java
View File

@@ -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;

2
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/java/org/springframework/cloud/kubernetes/client/discovery/it/ReactiveDiscoveryController.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/java/org/springframework/cloud/kubernetes/k8s/client/discovery/ReactiveDiscoveryController.java
View File

@@ -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;

0
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/main/resources/application.yaml → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/main/resources/application.yaml
View File

22
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryClientIT.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientIT.java
View File

@@ -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<DefaultKubernetesServiceInstance> ourServiceInstances = ourServiceClient.method(HttpMethod.GET).retrieve()
.bodyToMono(new ParameterizedTypeReference<List<DefaultKubernetesServiceInstance>>() {
@@ -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);

28
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryClientUtils.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientUtils.java
View File

@@ -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<String, String> POD_LABELS = Map.of("app", "spring-cloud-kubernetes-client-discovery-it");
private static final Map<String, String> 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": [
{

4
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryFilterITDelegate.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryFilterITDelegate.java
View File

@@ -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) {

26
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryHealthITDelegate.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryHealthITDelegate.java
View File

@@ -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<List<String>>() {
}).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(() -> {

4
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryMultipleSelectiveNamespacesITDelegate.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryMultipleSelectiveNamespacesITDelegate.java
View File

@@ -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'

10
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoveryPodMetadataITDelegate.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryPodMetadataITDelegate.java
View File

@@ -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<DefaultKubernetesServiceInstance> ourServiceInstances = ourServiceClient.method(HttpMethod.GET).retrieve()
.bodyToMono(new ParameterizedTypeReference<List<DefaultKubernetesServiceInstance>>() {
@@ -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");

6
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java
View File

@@ -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;

10
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-deployment.yaml → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/kubernetes-discovery-deployment.yaml
View File

@@ -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:

4
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-ingress.yaml → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/kubernetes-discovery-ingress.yaml
View File

@@ -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

6
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-service.yaml → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/kubernetes-discovery-service.yaml
View File

@@ -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

0
spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/logback-test.xml → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/resources/logback-test.xml
View File