From fb61c4aca7aefb0f4274b66f731d0e89a7c7ab3c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 31 Oct 2023 19:04:00 +0000 Subject: [PATCH 1/7] Update SNAPSHOT to 3.1.0-RC1 --- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-kubernetes-client-autoconfig/pom.xml | 2 +- spring-cloud-kubernetes-client-config/pom.xml | 2 +- spring-cloud-kubernetes-client-discovery/pom.xml | 2 +- spring-cloud-kubernetes-client-loadbalancer/pom.xml | 2 +- spring-cloud-kubernetes-commons/pom.xml | 2 +- spring-cloud-kubernetes-controllers/pom.xml | 2 +- .../spring-cloud-kubernetes-configserver/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-kubernetes-discoveryserver/pom.xml | 2 +- spring-cloud-kubernetes-dependencies/pom.xml | 4 ++-- spring-cloud-kubernetes-discovery/pom.xml | 2 +- .../kubernetes-leader-election-example/pom.xml | 2 +- spring-cloud-kubernetes-examples/pom.xml | 2 +- spring-cloud-kubernetes-fabric8-autoconfig/pom.xml | 2 +- spring-cloud-kubernetes-fabric8-config/pom.xml | 2 +- spring-cloud-kubernetes-fabric8-discovery/pom.xml | 2 +- spring-cloud-kubernetes-fabric8-istio/pom.xml | 2 +- spring-cloud-kubernetes-fabric8-leader/pom.xml | 2 +- spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml | 2 +- spring-cloud-kubernetes-integration-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../kafka-configmap-app-a/pom.xml | 2 +- .../kafka-configmap-app-b/pom.xml | 2 +- .../kafka-configmap-test-app/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../k8s/client/loadbalancer/LoadBalancerIT.java | 7 +++---- .../pom.xml | 2 +- .../rabbitmq-secret-app-a/pom.xml | 2 +- .../rabbitmq-secret-app-b/pom.xml | 2 +- .../rabbitmq-secret-test-app/pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-kubernetes-test-support/pom.xml | 2 +- spring-cloud-starter-kubernetes-client-all/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-starter-kubernetes-client/pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-starter-kubernetes-fabric8-all/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-starter-kubernetes-fabric8/pom.xml | 2 +- 52 files changed, 60 insertions(+), 61 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 46cb659fc9..f5357dd0a4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-SNAPSHOT + 3.1.0-RC1 .. jar diff --git a/pom.xml b/pom.xml index 017125f3bc..71eb0915c4 100644 --- a/pom.xml +++ b/pom.xml @@ -25,12 +25,12 @@ org.springframework.cloud spring-cloud-build - 4.1.0-SNAPSHOT + 4.1.0-RC1 spring-cloud-kubernetes - 3.1.0-SNAPSHOT + 3.1.0-RC1 pom Spring Cloud Kubernetes @@ -70,10 +70,10 @@ failsafe-reports 4.8.1 - 4.1.0-SNAPSHOT - 4.1.0-SNAPSHOT - 4.1.0-SNAPSHOT - 4.1.0-SNAPSHOT + 4.1.0-RC1 + 4.1.0-RC1 + 4.1.0-RC1 + 4.1.0-RC1 true true diff --git a/spring-cloud-kubernetes-client-autoconfig/pom.xml b/spring-cloud-kubernetes-client-autoconfig/pom.xml index ed1dc54104..e6f9c8ef2e 100644 --- a/spring-cloud-kubernetes-client-autoconfig/pom.xml +++ b/spring-cloud-kubernetes-client-autoconfig/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-client-config/pom.xml b/spring-cloud-kubernetes-client-config/pom.xml index 80a8d7dbed..dd3b689ea6 100644 --- a/spring-cloud-kubernetes-client-config/pom.xml +++ b/spring-cloud-kubernetes-client-config/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-client-discovery/pom.xml b/spring-cloud-kubernetes-client-discovery/pom.xml index db48e67fca..bf10373ddb 100644 --- a/spring-cloud-kubernetes-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-client-discovery/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-client-loadbalancer/pom.xml index dbed72cbe6..f206eab51c 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/pom.xml +++ b/spring-cloud-kubernetes-client-loadbalancer/pom.xml @@ -6,7 +6,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-commons/pom.xml b/spring-cloud-kubernetes-commons/pom.xml index 879d2009dc..f12db1f313 100644 --- a/spring-cloud-kubernetes-commons/pom.xml +++ b/spring-cloud-kubernetes-commons/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-controllers/pom.xml b/spring-cloud-kubernetes-controllers/pom.xml index f3452c1e9b..9d2633270a 100644 --- a/spring-cloud-kubernetes-controllers/pom.xml +++ b/spring-cloud-kubernetes-controllers/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 pom diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml index 5d9640212d..154d26e17f 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-controllers org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml index c105609951..78330c3111 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-controllers - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml index 7b8b762050..c7aa259af1 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-controllers org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml index 911ebbf11a..3ced7759bb 100644 --- a/spring-cloud-kubernetes-dependencies/pom.xml +++ b/spring-cloud-kubernetes-dependencies/pom.xml @@ -23,11 +23,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.0-SNAPSHOT + 4.1.0-RC1 spring-cloud-kubernetes-dependencies - 3.1.0-SNAPSHOT + 3.1.0-RC1 pom Spring Cloud Kubernetes :: Dependencies Spring Cloud Kubernetes Dependencies diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml index 945d6ee881..cb2eca28c3 100644 --- a/spring-cloud-kubernetes-discovery/pom.xml +++ b/spring-cloud-kubernetes-discovery/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml index e245d5cfe8..574840376d 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml +++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-kubernetes-examples - 3.1.0-SNAPSHOT + 3.1.0-RC1 kubernetes-leader-election-example diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml index 7a0598f2a3..1df5d1a712 100644 --- a/spring-cloud-kubernetes-examples/pom.xml +++ b/spring-cloud-kubernetes-examples/pom.xml @@ -23,7 +23,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 spring-cloud-kubernetes-examples diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml index 897eed634a..1817aee6ce 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml +++ b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml @@ -23,7 +23,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-fabric8-config/pom.xml b/spring-cloud-kubernetes-fabric8-config/pom.xml index 0767d79f4a..c736ab6e62 100644 --- a/spring-cloud-kubernetes-fabric8-config/pom.xml +++ b/spring-cloud-kubernetes-fabric8-config/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-fabric8-discovery/pom.xml b/spring-cloud-kubernetes-fabric8-discovery/pom.xml index 2a93d3f48e..6ea0d1ba1a 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/pom.xml +++ b/spring-cloud-kubernetes-fabric8-discovery/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-fabric8-istio/pom.xml b/spring-cloud-kubernetes-fabric8-istio/pom.xml index 53a74cff24..8154a2d829 100644 --- a/spring-cloud-kubernetes-fabric8-istio/pom.xml +++ b/spring-cloud-kubernetes-fabric8-istio/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-fabric8-leader/pom.xml b/spring-cloud-kubernetes-fabric8-leader/pom.xml index f0d4aa061c..fa3c3359f3 100644 --- a/spring-cloud-kubernetes-fabric8-leader/pom.xml +++ b/spring-cloud-kubernetes-fabric8-leader/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-SNAPSHOT + 3.1.0-RC1 spring-cloud-kubernetes-fabric8-leader diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml index 01ea247ba8..3881e486e4 100644 --- a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml +++ b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index 3acf3d6185..e2e8093892 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-SNAPSHOT + 3.1.0-RC1 spring-cloud-kubernetes-integration-tests diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml index 067ab40442..ac16055c25 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-integration-tests org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml index 3b67fe1143..7490def920 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml index d9b721f5c5..76d52d39de 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml index 2dd4996398..c6e1263453 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml index 5ee2a45a27..6639898336 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml index f1fdd219a2..d0c82b63ac 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-integration-tests org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml index 9035ce6265..d4c62844ae 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml index 165eaf4414..1c9f9312dd 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-integration-tests org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml index 3ccc79bc0d..8b9da6c71d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-integration-tests org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml index 9318bdc94d..ac9c46b687 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 jar diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml index 5652d93060..4e3e0cba53 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 ../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml index 8e1c4dbd5f..2bdda2c9d1 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 jar diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml index 23707303ec..deac2ecf26 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-integration-tests org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/pom.xml index 9953169b69..4d7303e5e7 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java index e07081ad8a..85374aaaa1 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java @@ -76,8 +76,7 @@ class LoadBalancerIT { private static final String SERVICE_URL = "http://localhost:80/loadbalancer-it/service"; - private static final String SPRING_CLOUD_K8S_LOADBALANCER_APP_NAME = - "spring-cloud-kubernetes-k8s-client-loadbalancer"; + private static final String SPRING_CLOUD_K8S_LOADBALANCER_APP_NAME = "spring-cloud-kubernetes-k8s-client-loadbalancer"; private static final String NAMESPACE = "default"; @@ -155,8 +154,8 @@ private WebClient.Builder builder() { } private static void patchForServiceMode() { - patchWithMerge("spring-cloud-kubernetes-k8s-client-loadbalancer", LoadBalancerIT.NAMESPACE, - BODY_FOR_MERGE, POD_LABELS); + patchWithMerge("spring-cloud-kubernetes-k8s-client-loadbalancer", LoadBalancerIT.NAMESPACE, BODY_FOR_MERGE, + POD_LABELS); } } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml index cb97e99877..92016c99b6 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-integration-tests org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml index 0ed30828c6..c9f854727d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 jar diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml index f21df296ef..16ea7896c6 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 jar diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml index 94d19ff45a..90f18a8f65 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 jar diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml index d06836f1f5..68772bf132 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-SNAPSHOT + 3.1.0-RC1 spring-cloud-kubernetes-k8s-client-reload diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml index cf2a394ebd..a87fd7c812 100644 --- a/spring-cloud-kubernetes-test-support/pom.xml +++ b/spring-cloud-kubernetes-test-support/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-starter-kubernetes-client-all/pom.xml b/spring-cloud-starter-kubernetes-client-all/pom.xml index fa19803995..5efd37bf0f 100644 --- a/spring-cloud-starter-kubernetes-client-all/pom.xml +++ b/spring-cloud-starter-kubernetes-client-all/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-starter-kubernetes-client-config/pom.xml b/spring-cloud-starter-kubernetes-client-config/pom.xml index f938fb5f3f..2ddcbfb6b5 100644 --- a/spring-cloud-starter-kubernetes-client-config/pom.xml +++ b/spring-cloud-starter-kubernetes-client-config/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml index a7cb9e31ce..30ce1cf4de 100644 --- a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml +++ b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-starter-kubernetes-client/pom.xml b/spring-cloud-starter-kubernetes-client/pom.xml index afc70fcde2..c50eeb9746 100644 --- a/spring-cloud-starter-kubernetes-client/pom.xml +++ b/spring-cloud-starter-kubernetes-client/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml index 07942943c1..c0baf2f6a0 100644 --- a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml +++ b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml index ba613b7e25..a1ebcc5a82 100644 --- a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml +++ b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml index 418ae22577..a7096ae6fb 100644 --- a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml +++ b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml index 6f3228e3db..c7d3184d60 100644 --- a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml +++ b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 diff --git a/spring-cloud-starter-kubernetes-fabric8/pom.xml b/spring-cloud-starter-kubernetes-fabric8/pom.xml index e9fab4b3a4..33adc09d5e 100644 --- a/spring-cloud-starter-kubernetes-fabric8/pom.xml +++ b/spring-cloud-starter-kubernetes-fabric8/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-RC1 4.0.0 From 8acf42cf5ed11ec19b4b38747539360a89164929 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 31 Oct 2023 19:16:07 +0000 Subject: [PATCH 2/7] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-kubernetes-client-autoconfig/pom.xml | 2 +- spring-cloud-kubernetes-client-config/pom.xml | 2 +- spring-cloud-kubernetes-client-discovery/pom.xml | 2 +- spring-cloud-kubernetes-client-loadbalancer/pom.xml | 2 +- spring-cloud-kubernetes-commons/pom.xml | 2 +- spring-cloud-kubernetes-controllers/pom.xml | 2 +- .../spring-cloud-kubernetes-configserver/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-kubernetes-discoveryserver/pom.xml | 2 +- spring-cloud-kubernetes-dependencies/pom.xml | 4 ++-- spring-cloud-kubernetes-discovery/pom.xml | 2 +- .../kubernetes-leader-election-example/pom.xml | 2 +- spring-cloud-kubernetes-examples/pom.xml | 2 +- spring-cloud-kubernetes-fabric8-autoconfig/pom.xml | 2 +- spring-cloud-kubernetes-fabric8-config/pom.xml | 2 +- spring-cloud-kubernetes-fabric8-discovery/pom.xml | 2 +- spring-cloud-kubernetes-fabric8-istio/pom.xml | 2 +- spring-cloud-kubernetes-fabric8-leader/pom.xml | 2 +- spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml | 2 +- spring-cloud-kubernetes-integration-tests/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../kafka-configmap-app-a/pom.xml | 2 +- .../kafka-configmap-app-b/pom.xml | 2 +- .../kafka-configmap-test-app/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../k8s/client/loadbalancer/LoadBalancerIT.java | 7 ++++--- .../pom.xml | 2 +- .../rabbitmq-secret-app-a/pom.xml | 2 +- .../rabbitmq-secret-app-b/pom.xml | 2 +- .../rabbitmq-secret-test-app/pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-kubernetes-test-support/pom.xml | 2 +- spring-cloud-starter-kubernetes-client-all/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-starter-kubernetes-client/pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-starter-kubernetes-fabric8-all/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-starter-kubernetes-fabric8/pom.xml | 2 +- 52 files changed, 61 insertions(+), 60 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index f5357dd0a4..46cb659fc9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-RC1 + 3.1.0-SNAPSHOT .. jar diff --git a/pom.xml b/pom.xml index 71eb0915c4..017125f3bc 100644 --- a/pom.xml +++ b/pom.xml @@ -25,12 +25,12 @@ org.springframework.cloud spring-cloud-build - 4.1.0-RC1 + 4.1.0-SNAPSHOT spring-cloud-kubernetes - 3.1.0-RC1 + 3.1.0-SNAPSHOT pom Spring Cloud Kubernetes @@ -70,10 +70,10 @@ failsafe-reports 4.8.1 - 4.1.0-RC1 - 4.1.0-RC1 - 4.1.0-RC1 - 4.1.0-RC1 + 4.1.0-SNAPSHOT + 4.1.0-SNAPSHOT + 4.1.0-SNAPSHOT + 4.1.0-SNAPSHOT true true diff --git a/spring-cloud-kubernetes-client-autoconfig/pom.xml b/spring-cloud-kubernetes-client-autoconfig/pom.xml index e6f9c8ef2e..ed1dc54104 100644 --- a/spring-cloud-kubernetes-client-autoconfig/pom.xml +++ b/spring-cloud-kubernetes-client-autoconfig/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-client-config/pom.xml b/spring-cloud-kubernetes-client-config/pom.xml index dd3b689ea6..80a8d7dbed 100644 --- a/spring-cloud-kubernetes-client-config/pom.xml +++ b/spring-cloud-kubernetes-client-config/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-client-discovery/pom.xml b/spring-cloud-kubernetes-client-discovery/pom.xml index bf10373ddb..db48e67fca 100644 --- a/spring-cloud-kubernetes-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-client-discovery/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-client-loadbalancer/pom.xml index f206eab51c..dbed72cbe6 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/pom.xml +++ b/spring-cloud-kubernetes-client-loadbalancer/pom.xml @@ -6,7 +6,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-commons/pom.xml b/spring-cloud-kubernetes-commons/pom.xml index f12db1f313..879d2009dc 100644 --- a/spring-cloud-kubernetes-commons/pom.xml +++ b/spring-cloud-kubernetes-commons/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-controllers/pom.xml b/spring-cloud-kubernetes-controllers/pom.xml index 9d2633270a..f3452c1e9b 100644 --- a/spring-cloud-kubernetes-controllers/pom.xml +++ b/spring-cloud-kubernetes-controllers/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 pom diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml index 154d26e17f..5d9640212d 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-controllers org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml index 78330c3111..c105609951 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-controllers - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml index c7aa259af1..7b8b762050 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-controllers org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml index 3ced7759bb..911ebbf11a 100644 --- a/spring-cloud-kubernetes-dependencies/pom.xml +++ b/spring-cloud-kubernetes-dependencies/pom.xml @@ -23,11 +23,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 4.1.0-RC1 + 4.1.0-SNAPSHOT spring-cloud-kubernetes-dependencies - 3.1.0-RC1 + 3.1.0-SNAPSHOT pom Spring Cloud Kubernetes :: Dependencies Spring Cloud Kubernetes Dependencies diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml index cb2eca28c3..945d6ee881 100644 --- a/spring-cloud-kubernetes-discovery/pom.xml +++ b/spring-cloud-kubernetes-discovery/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml index 574840376d..e245d5cfe8 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml +++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-kubernetes-examples - 3.1.0-RC1 + 3.1.0-SNAPSHOT kubernetes-leader-election-example diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml index 1df5d1a712..7a0598f2a3 100644 --- a/spring-cloud-kubernetes-examples/pom.xml +++ b/spring-cloud-kubernetes-examples/pom.xml @@ -23,7 +23,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT spring-cloud-kubernetes-examples diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml index 1817aee6ce..897eed634a 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml +++ b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml @@ -23,7 +23,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-fabric8-config/pom.xml b/spring-cloud-kubernetes-fabric8-config/pom.xml index c736ab6e62..0767d79f4a 100644 --- a/spring-cloud-kubernetes-fabric8-config/pom.xml +++ b/spring-cloud-kubernetes-fabric8-config/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-fabric8-discovery/pom.xml b/spring-cloud-kubernetes-fabric8-discovery/pom.xml index 6ea0d1ba1a..2a93d3f48e 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/pom.xml +++ b/spring-cloud-kubernetes-fabric8-discovery/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-fabric8-istio/pom.xml b/spring-cloud-kubernetes-fabric8-istio/pom.xml index 8154a2d829..53a74cff24 100644 --- a/spring-cloud-kubernetes-fabric8-istio/pom.xml +++ b/spring-cloud-kubernetes-fabric8-istio/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-fabric8-leader/pom.xml b/spring-cloud-kubernetes-fabric8-leader/pom.xml index fa3c3359f3..f0d4aa061c 100644 --- a/spring-cloud-kubernetes-fabric8-leader/pom.xml +++ b/spring-cloud-kubernetes-fabric8-leader/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-RC1 + 3.1.0-SNAPSHOT spring-cloud-kubernetes-fabric8-leader diff --git a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml index 3881e486e4..01ea247ba8 100644 --- a/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml +++ b/spring-cloud-kubernetes-fabric8-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index e2e8093892..3acf3d6185 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-RC1 + 3.1.0-SNAPSHOT spring-cloud-kubernetes-integration-tests diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml index ac16055c25..067ab40442 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-integration-tests org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml index 7490def920..3b67fe1143 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml index 76d52d39de..d9b721f5c5 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml index c6e1263453..2dd4996398 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml index 6639898336..5ee2a45a27 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml index d0c82b63ac..f1fdd219a2 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-integration-tests org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml index d4c62844ae..9035ce6265 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml index 1c9f9312dd..165eaf4414 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-integration-tests org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml index 8b9da6c71d..3ccc79bc0d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-integration-tests org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml index ac9c46b687..9318bdc94d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-a/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 jar diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml index 4e3e0cba53..5652d93060 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-app-b/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT ../../spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml index 2bdda2c9d1..8e1c4dbd5f 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 jar diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml index deac2ecf26..23707303ec 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-integration-tests org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/pom.xml index 4d7303e5e7..9953169b69 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java index 85374aaaa1..e07081ad8a 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java @@ -76,7 +76,8 @@ class LoadBalancerIT { private static final String SERVICE_URL = "http://localhost:80/loadbalancer-it/service"; - private static final String SPRING_CLOUD_K8S_LOADBALANCER_APP_NAME = "spring-cloud-kubernetes-k8s-client-loadbalancer"; + private static final String SPRING_CLOUD_K8S_LOADBALANCER_APP_NAME = + "spring-cloud-kubernetes-k8s-client-loadbalancer"; private static final String NAMESPACE = "default"; @@ -154,8 +155,8 @@ private WebClient.Builder builder() { } private static void patchForServiceMode() { - patchWithMerge("spring-cloud-kubernetes-k8s-client-loadbalancer", LoadBalancerIT.NAMESPACE, BODY_FOR_MERGE, - POD_LABELS); + patchWithMerge("spring-cloud-kubernetes-k8s-client-loadbalancer", LoadBalancerIT.NAMESPACE, + BODY_FOR_MERGE, POD_LABELS); } } diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml index 92016c99b6..cb97e99877 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-integration-tests org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml index c9f854727d..0ed30828c6 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-a/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 jar diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml index 16ea7896c6..f21df296ef 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-app-b/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 jar diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml index 90f18a8f65..94d19ff45a 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 jar diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml index 68772bf132..d06836f1f5 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-kubernetes-integration-tests - 3.1.0-RC1 + 3.1.0-SNAPSHOT spring-cloud-kubernetes-k8s-client-reload diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml index a87fd7c812..cf2a394ebd 100644 --- a/spring-cloud-kubernetes-test-support/pom.xml +++ b/spring-cloud-kubernetes-test-support/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-kubernetes - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-client-all/pom.xml b/spring-cloud-starter-kubernetes-client-all/pom.xml index 5efd37bf0f..fa19803995 100644 --- a/spring-cloud-starter-kubernetes-client-all/pom.xml +++ b/spring-cloud-starter-kubernetes-client-all/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-client-config/pom.xml b/spring-cloud-starter-kubernetes-client-config/pom.xml index 2ddcbfb6b5..f938fb5f3f 100644 --- a/spring-cloud-starter-kubernetes-client-config/pom.xml +++ b/spring-cloud-starter-kubernetes-client-config/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml index 30ce1cf4de..a7cb9e31ce 100644 --- a/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml +++ b/spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-client/pom.xml b/spring-cloud-starter-kubernetes-client/pom.xml index c50eeb9746..afc70fcde2 100644 --- a/spring-cloud-starter-kubernetes-client/pom.xml +++ b/spring-cloud-starter-kubernetes-client/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml index c0baf2f6a0..07942943c1 100644 --- a/spring-cloud-starter-kubernetes-discoveryclient/pom.xml +++ b/spring-cloud-starter-kubernetes-discoveryclient/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml index a1ebcc5a82..ba613b7e25 100644 --- a/spring-cloud-starter-kubernetes-fabric8-all/pom.xml +++ b/spring-cloud-starter-kubernetes-fabric8-all/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml index a7096ae6fb..418ae22577 100644 --- a/spring-cloud-starter-kubernetes-fabric8-config/pom.xml +++ b/spring-cloud-starter-kubernetes-fabric8-config/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml index c7d3184d60..6f3228e3db 100644 --- a/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml +++ b/spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 diff --git a/spring-cloud-starter-kubernetes-fabric8/pom.xml b/spring-cloud-starter-kubernetes-fabric8/pom.xml index 33adc09d5e..e9fab4b3a4 100644 --- a/spring-cloud-starter-kubernetes-fabric8/pom.xml +++ b/spring-cloud-starter-kubernetes-fabric8/pom.xml @@ -5,7 +5,7 @@ spring-cloud-kubernetes org.springframework.cloud - 3.1.0-RC1 + 3.1.0-SNAPSHOT 4.0.0 From 34f7db3d34765a94d12942391dd58da1ae8630c7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 1 Nov 2023 01:44:34 +0000 Subject: [PATCH 3/7] Bumping versions --- .../kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java index e07081ad8a..85374aaaa1 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java @@ -76,8 +76,7 @@ class LoadBalancerIT { private static final String SERVICE_URL = "http://localhost:80/loadbalancer-it/service"; - private static final String SPRING_CLOUD_K8S_LOADBALANCER_APP_NAME = - "spring-cloud-kubernetes-k8s-client-loadbalancer"; + private static final String SPRING_CLOUD_K8S_LOADBALANCER_APP_NAME = "spring-cloud-kubernetes-k8s-client-loadbalancer"; private static final String NAMESPACE = "default"; @@ -155,8 +154,8 @@ private WebClient.Builder builder() { } private static void patchForServiceMode() { - patchWithMerge("spring-cloud-kubernetes-k8s-client-loadbalancer", LoadBalancerIT.NAMESPACE, - BODY_FOR_MERGE, POD_LABELS); + patchWithMerge("spring-cloud-kubernetes-k8s-client-loadbalancer", LoadBalancerIT.NAMESPACE, BODY_FOR_MERGE, + POD_LABELS); } } From c6f331f40bd2a27aac0289969dbcb7e32f4e9028 Mon Sep 17 00:00:00 2001 From: erabii Date: Wed, 1 Nov 2023 23:32:52 +0200 Subject: [PATCH 4/7] Kafka no zookeeper (#1493) --- .../ConfigurationWatcherMultipleAppsIT.java | 2 - .../client/loadbalancer/LoadBalancerIT.java | 7 ++- .../tests/commons/native_client/Util.java | 15 ++---- .../kafka/kafka-configmap-startup-script.yaml | 12 +++++ .../resources/kafka/kafka-deployment.yaml | 49 ++++++++++--------- .../zookeeper/zookeeper-deployment.yaml | 31 ------------ .../zookeeper/zookeeper-service.yaml | 16 ------ 7 files changed, 45 insertions(+), 87 deletions(-) create mode 100644 spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-configmap-startup-script.yaml delete mode 100644 spring-cloud-kubernetes-test-support/src/main/resources/zookeeper/zookeeper-deployment.yaml delete mode 100644 spring-cloud-kubernetes-test-support/src/main/resources/zookeeper/zookeeper-service.yaml diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java index 9655554f62..57c94a5b2b 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java @@ -91,7 +91,6 @@ static void afterAll() throws Exception { @BeforeEach void setup() { - util.zookeeper(NAMESPACE, Phase.CREATE); util.kafka(NAMESPACE, Phase.CREATE); appA(Phase.CREATE); appB(Phase.CREATE); @@ -100,7 +99,6 @@ void setup() { @AfterEach void afterEach() { - util.zookeeper(NAMESPACE, Phase.DELETE); util.kafka(NAMESPACE, Phase.DELETE); appA(Phase.DELETE); appB(Phase.DELETE); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java index e07081ad8a..85374aaaa1 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/k8s/client/loadbalancer/LoadBalancerIT.java @@ -76,8 +76,7 @@ class LoadBalancerIT { private static final String SERVICE_URL = "http://localhost:80/loadbalancer-it/service"; - private static final String SPRING_CLOUD_K8S_LOADBALANCER_APP_NAME = - "spring-cloud-kubernetes-k8s-client-loadbalancer"; + private static final String SPRING_CLOUD_K8S_LOADBALANCER_APP_NAME = "spring-cloud-kubernetes-k8s-client-loadbalancer"; private static final String NAMESPACE = "default"; @@ -155,8 +154,8 @@ private WebClient.Builder builder() { } private static void patchForServiceMode() { - patchWithMerge("spring-cloud-kubernetes-k8s-client-loadbalancer", LoadBalancerIT.NAMESPACE, - BODY_FOR_MERGE, POD_LABELS); + patchWithMerge("spring-cloud-kubernetes-k8s-client-loadbalancer", LoadBalancerIT.NAMESPACE, BODY_FOR_MERGE, + POD_LABELS); } } diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java index b55751800f..55e39c7037 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java @@ -232,11 +232,14 @@ else if (phase.equals(Phase.DELETE)) { public void kafka(String namespace, Phase phase) { V1Deployment deployment = (V1Deployment) yaml("kafka/kafka-deployment.yaml"); V1Service service = (V1Service) yaml("kafka/kafka-service.yaml"); + V1ConfigMap configMap = (V1ConfigMap) yaml("kafka/kafka-configmap-startup-script.yaml"); if (phase.equals(Phase.CREATE)) { + createAndWait(namespace, configMap, null); createAndWait(namespace, "kafka", deployment, service, null, false); } else if (phase.equals(Phase.DELETE)) { + deleteAndWait(namespace, configMap, null); deleteAndWait(namespace, deployment, service, null); } } @@ -253,18 +256,6 @@ else if (phase.equals(Phase.DELETE)) { } } - public void zookeeper(String namespace, Phase phase) { - V1Deployment deployment = (V1Deployment) yaml("zookeeper/zookeeper-deployment.yaml"); - V1Service service = (V1Service) yaml("zookeeper/zookeeper-service.yaml"); - - if (phase.equals(Phase.CREATE)) { - createAndWait(namespace, "zookeeper", deployment, service, null, false); - } - else if (phase.equals(Phase.DELETE)) { - deleteAndWait(namespace, deployment, service, null); - } - } - /** * reads a yaml from classpath, fails if not found. */ diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-configmap-startup-script.yaml b/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-configmap-startup-script.yaml new file mode 100644 index 0000000000..de6ffe2139 --- /dev/null +++ b/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-configmap-startup-script.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: kafka-start-config-script +data: + kafka_start.sh: | + #!/bin/sh + sed -i '/KAFKA_ZOOKEEPER_CONNECT/d' /etc/confluent/docker/configure + sed -i 's/cub zk-ready/echo ignore zk-ready/' /etc/confluent/docker/ensure + KAFKA_CLUSTER_ID="$(kafka-storage random-uuid)" + echo "kafka-storage format --ignore-formatted -t $KAFKA_CLUSTER_ID -c /etc/kafka/kafka.properties" >> /etc/confluent/docker/ensure + /etc/confluent/docker/run diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml b/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml index 6cce9e9181..cbe261d3d7 100644 --- a/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml +++ b/spring-cloud-kubernetes-test-support/src/main/resources/kafka/kafka-deployment.yaml @@ -21,34 +21,39 @@ spec: # and this will cause this problem: https://github.com/confluentinc/cp-docker-images/blob/master/debian/kafka/include/etc/confluent/docker/configure#L58-L62 # Another solution is to rename the service. enableServiceLinks: false + volumes: + - name: kafka-start-config-script + configMap: + name: kafka-start-config-script + defaultMode: 0744 containers: - - name: kafka + - name: kafka-start-config-script + volumeMounts: + - name: kafka-start-config-script + mountPath: /tmp + command: + - /tmp/./kafka_start.sh image: confluentinc/cp-kafka:7.2.1 ports: - containerPort: 9092 env: - - name: KAFKA_LISTENERS - value: "INTERNAL://0.0.0.0:9092,OUTSIDE://0.0.0.0:9094" - + - name: KAFKA_BROKER_ID + value: "1" - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP - value: "INTERNAL:PLAINTEXT,OUTSIDE:PLAINTEXT" - + value: "CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT" - name: KAFKA_ADVERTISED_LISTENERS - value: "INTERNAL://kafka:9092,OUTSIDE://localhost:9094" - - - name: KAFKA_INTER_BROKER_LISTENER_NAME - value: "INTERNAL" - - - name: KAFKA_ADVERTISED_HOST_NAME - valueFrom: - fieldRef: - fieldPath: status.podIP - - - name: KAFKA_ZOOKEEPER_CONNECT - value: zookeeper:2181 - - # we have enabled auto creation of topics and when this happens there is a replication factor of 3 - # that is set automatically. Since we don't have that many, producers will fail. - # This setting ensures that there is just one replication + value: "PLAINTEXT://kafka:9092" - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR value: "1" + - name: KAFKA_PROCESS_ROLES + value: "broker,controller" + - name: KAFKA_NODE_ID + value: "1" + - name: KAFKA_LISTENERS + value: "PLAINTEXT://:9092,CONTROLLER://:9093" + - name: KAFKA_INTER_BROKER_LISTENER_NAME + value: "PLAINTEXT" + - name: KAFKA_CONTROLLER_LISTENER_NAMES + value: "CONTROLLER" + - name: KAFKA_CONTROLLER_QUORUM_VOTERS + value: "1@localhost:9093" diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/zookeeper/zookeeper-deployment.yaml b/spring-cloud-kubernetes-test-support/src/main/resources/zookeeper/zookeeper-deployment.yaml deleted file mode 100644 index 3c285c30f4..0000000000 --- a/spring-cloud-kubernetes-test-support/src/main/resources/zookeeper/zookeeper-deployment.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: kafka - component: zookeeper - name: zookeeper -spec: - replicas: 1 - selector: - matchLabels: - app: kafka - component: zookeeper - template: - metadata: - labels: - app: kafka - component: zookeeper - spec: - containers: - - name: zookeeper - image: confluentinc/cp-zookeeper:7.2.1 - ports: - - containerPort: 2181 - env: - - name: ZOOKEEPER_ID - value: "1" - - name: ZOOKEEPER_SERVER_1 - value: zookeeper - - name: ZOOKEEPER_CLIENT_PORT - value: 2181 diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/zookeeper/zookeeper-service.yaml b/spring-cloud-kubernetes-test-support/src/main/resources/zookeeper/zookeeper-service.yaml deleted file mode 100644 index eb025d3c4a..0000000000 --- a/spring-cloud-kubernetes-test-support/src/main/resources/zookeeper/zookeeper-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: zookeeper - labels: - app: kafka - component: zookeeper -spec: - ports: - - port: 2181 - name: zookeeper-port - targetPort: 2181 - protocol: TCP - selector: - app: kafka - component: zookeeper From e23ffab088e0e598c85c6ae7f12bc0258140f477 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:34:49 -0400 Subject: [PATCH 5/7] Revert "Fixing checkstyle" This reverts commit 59a3665cceddd009cd726ecf458466cc95fd5d9c. --- .../kubernetes/configuration/watcher/ActuatorRefreshIT.java | 6 ++++-- .../watcher/ActuatorRefreshMultipleNamespacesIT.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java index a476fe027a..2ffa07d0be 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java @@ -24,8 +24,10 @@ import io.kubernetes.client.openapi.models.V1ConfigMapBuilder; import io.kubernetes.client.openapi.models.V1Deployment; import io.kubernetes.client.openapi.models.V1Service; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -60,7 +62,7 @@ class ActuatorRefreshIT { private static Util util; - // @BeforeAll +// @BeforeAll static void beforeAll() throws Exception { K3S.start(); Commons.validateImage(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S); @@ -71,7 +73,7 @@ static void beforeAll() throws Exception { configWatcher(Phase.CREATE); } - // @AfterAll +// @AfterAll static void afterAll() throws Exception { configWatcher(Phase.DELETE); Commons.cleanUp(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java index 16a38a6273..a63bd15b87 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java @@ -32,6 +32,8 @@ import io.kubernetes.client.openapi.models.V1Secret; import io.kubernetes.client.openapi.models.V1SecretBuilder; import io.kubernetes.client.openapi.models.V1Service; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.testcontainers.k3s.K3sContainer; @@ -62,7 +64,7 @@ class ActuatorRefreshMultipleNamespacesIT { private static Util util; - // @BeforeAll +// @BeforeAll static void beforeAll() throws Exception { K3S.start(); Commons.validateImage(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S); @@ -75,7 +77,7 @@ static void beforeAll() throws Exception { configWatcher(Phase.CREATE); } - // @AfterAll +// @AfterAll static void afterAll() throws Exception { configWatcher(Phase.DELETE); util.wiremock(DEFAULT_NAMESPACE, "/", Phase.DELETE); From 3939fb78b1b8068dd201744093d8dae749d14779 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:36:41 -0400 Subject: [PATCH 6/7] Revert "Disable tests" This reverts commit 3a6aabdf8eda586a74fb108a7c124d117d6bc95e. --- .../kubernetes/configuration/watcher/ActuatorRefreshIT.java | 6 ++---- .../watcher/ActuatorRefreshMultipleNamespacesIT.java | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java index 2ffa07d0be..5eea8aa0a7 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java @@ -29,7 +29,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.testcontainers.containers.Container; import org.testcontainers.k3s.K3sContainer; @@ -62,7 +61,7 @@ class ActuatorRefreshIT { private static Util util; -// @BeforeAll + @BeforeAll static void beforeAll() throws Exception { K3S.start(); Commons.validateImage(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S); @@ -73,7 +72,7 @@ static void beforeAll() throws Exception { configWatcher(Phase.CREATE); } -// @AfterAll + @AfterAll static void afterAll() throws Exception { configWatcher(Phase.DELETE); Commons.cleanUp(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S); @@ -99,7 +98,6 @@ void after() { */ // curl :8080/__admin/mappings @Test - @Disabled void testActuatorRefresh() { WireMock.configureFor(WIREMOCK_HOST, WIREMOCK_PORT, WIREMOCK_PATH); diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java index a63bd15b87..c8ae889a26 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java @@ -34,7 +34,6 @@ import io.kubernetes.client.openapi.models.V1Service; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.testcontainers.k3s.K3sContainer; @@ -64,7 +63,7 @@ class ActuatorRefreshMultipleNamespacesIT { private static Util util; -// @BeforeAll + @BeforeAll static void beforeAll() throws Exception { K3S.start(); Commons.validateImage(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S); @@ -77,7 +76,7 @@ static void beforeAll() throws Exception { configWatcher(Phase.CREATE); } -// @AfterAll + @AfterAll static void afterAll() throws Exception { configWatcher(Phase.DELETE); util.wiremock(DEFAULT_NAMESPACE, "/", Phase.DELETE); @@ -99,7 +98,6 @@ static void afterAll() throws Exception { * */ @Test - @Disabled void testConfigMapActuatorRefreshMultipleNamespaces() { WireMock.configureFor(WIREMOCK_HOST, WIREMOCK_PORT, WIREMOCK_PATH); await().timeout(Duration.ofSeconds(60)) From b0a72b155183650ec63496fd6424324a2493379c Mon Sep 17 00:00:00 2001 From: erabii Date: Thu, 2 Nov 2023 23:01:15 +0200 Subject: [PATCH 7/7] fix-1413 (#1495) --- .../discovery/Fabric8CatalogWatchContext.java | 6 +- .../Fabric8CatalogWatchContextTests.java | 76 +++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContextTests.java diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContext.java b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContext.java index 9d3fc70f8b..9a9fadf8f1 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContext.java +++ b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContext.java @@ -16,7 +16,6 @@ package org.springframework.cloud.kubernetes.fabric8.discovery; -import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.stream.Stream; @@ -28,6 +27,9 @@ import org.springframework.cloud.kubernetes.commons.discovery.EndpointNameAndNamespace; import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties; +import static java.util.Comparator.comparing; +import static java.util.Comparator.nullsLast; + /** * A simple holder for some instances needed for either Endpoints or EndpointSlice catalog * implementations. @@ -39,7 +41,7 @@ record Fabric8CatalogWatchContext(KubernetesClient kubernetesClient, KubernetesD static List state(Stream references) { return references.filter(Objects::nonNull).map(x -> new EndpointNameAndNamespace(x.getName(), x.getNamespace())) - .sorted(Comparator.comparing(EndpointNameAndNamespace::endpointName, String::compareTo)).toList(); + .sorted(comparing(EndpointNameAndNamespace::endpointName, nullsLast(String::compareTo))).toList(); } } diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContextTests.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContextTests.java new file mode 100644 index 0000000000..3324baaba1 --- /dev/null +++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8CatalogWatchContextTests.java @@ -0,0 +1,76 @@ +/* + * Copyright 2012-2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.kubernetes.fabric8.discovery; + +import java.util.List; +import java.util.stream.Stream; + +import io.fabric8.kubernetes.api.model.ObjectReference; +import io.fabric8.kubernetes.api.model.ObjectReferenceBuilder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import org.springframework.cloud.kubernetes.commons.discovery.EndpointNameAndNamespace; + +/** + * @author wind57 + */ +class Fabric8CatalogWatchContextTests { + + @Test + void stateWithASingleElementNameNotNull() { + + Stream referenceStream = Stream + .of(new ObjectReferenceBuilder().withName("a").withNamespace("default").build()); + + List result = Fabric8CatalogWatchContext.state(referenceStream); + Assertions.assertEquals(result.size(), 1); + Assertions.assertEquals(result.get(0).endpointName(), "a"); + Assertions.assertEquals(result.get(0).namespace(), "default"); + + } + + @Test + void stateWithASingleElementNameNull() { + + Stream referenceStream = Stream + .of(new ObjectReferenceBuilder().withName(null).withNamespace("default").build()); + + List result = Fabric8CatalogWatchContext.state(referenceStream); + Assertions.assertEquals(result.size(), 1); + Assertions.assertNull(result.get(0).endpointName()); + Assertions.assertEquals(result.get(0).namespace(), "default"); + + } + + @Test + void stateWithTwoElementsNameNull() { + + Stream referenceStream = Stream.of( + new ObjectReferenceBuilder().withName(null).withNamespace("defaultNull").build(), + new ObjectReferenceBuilder().withName("a").withNamespace("defaultA").build()); + + List result = Fabric8CatalogWatchContext.state(referenceStream); + Assertions.assertEquals(result.size(), 2); + Assertions.assertEquals(result.get(0).endpointName(), "a"); + Assertions.assertEquals(result.get(0).namespace(), "defaultA"); + Assertions.assertNull(result.get(1).endpointName()); + Assertions.assertEquals(result.get(1).namespace(), "defaultNull"); + + } + +}