Merge branch 'main' of https://github.com/spring-cloud/spring-cloud-kubernetes

Author: wind57

README.adoc

@@ -13,7 +13,7 @@ This reference guide covers how to use Spring Cloud Kubernetes.
 [[why-do-you-need-spring-cloud-kubernetes]]
 == Why do you need Spring Cloud Kubernetes?
 
-Spring Cloud Kubernetes provides implementations of well known Spring Cloud interfaces allowing developers to build and run Spring Cloud applications on Kubernetes.  While this project may be useful to you when building a cloud native application, it is also not a requirement in order to deploy a Spring Boot app on Kubernetes.  If you are just getting started in your journey to running your Spring Boot app on Kubernetes you can accomplish a lot with nothing more than a basic Spring Boot app and Kubernetes itself.  To learn more, you can get started by reading the https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#cloud-deployment-kubernetes[Spring Boot reference documentation for deploying to Kubernetes ] and also working through the workshop material https://hackmd.io/@ryanjbaxter/spring-on-k8s-workshop[Spring and Kubernetes].
+Spring Cloud Kubernetes provides implementations of well known Spring Cloud interfaces allowing developers to build and run Spring Cloud applications on Kubernetes.  While this project may be useful to you when building a cloud native application, it is also not a requirement in order to deploy a Spring Boot app on Kubernetes.  If you are just getting started in your journey to running your Spring Boot app on Kubernetes you can accomplish a lot with nothing more than a basic Spring Boot app and Kubernetes itself.  To learn more, you can get started by reading the https://docs.spring.io/spring-boot/how-to/deployment/cloud.html#howto.deployment.cloud.kubernetes[Spring Boot reference documentation for deploying to Kubernetes ] and also working through the workshop material https://hackmd.io/@ryanjbaxter/spring-on-k8s-workshop[Spring and Kubernetes].
 
 [[configuration-properties]]
 == Configuration properties

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadConfigMapTest.java

@@ -37,7 +37,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.boot.test.context.SpringBootTest;
@@ -115,8 +114,6 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
-			disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/reload_it/PollingReloadSecretTest.java

@@ -39,7 +39,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.boot.test.context.SpringBootTest;
@@ -117,8 +116,6 @@ static void after() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
-			disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadConfigMapTest.java

@@ -31,7 +31,6 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.boot.test.context.SpringBootTest;
@@ -91,8 +90,6 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
-			disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'configMapOne'

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/reload_it/PollingReloadSecretTest.java

@@ -33,7 +33,6 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.boot.test.context.SpringBootTest;
@@ -94,8 +93,6 @@ static void beforeAll() {
 	 *     - second polling cycle reads sources from k8s and finds a change
 	 * </pre>
 	 */
-	@DisabledIfEnvironmentVariable(named = "JENKINS_HOME", matches = "^(?=\\s*\\S).*$",
-			disabledReason = "failing on jenkins")
 	@Test
 	void test(CapturedOutput output) {
 		// we fail while reading 'secretOne'

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchBase.java

@@ -60,8 +60,9 @@ protected static void beforeAll() {
 		util = new Util(K3S);
 	}
 
-	protected static KubernetesDiscoveryProperties discoveryProperties(boolean useEndpointSlices) {
-		return new KubernetesDiscoveryProperties(true, false, Set.of(NAMESPACE, NAMESPACE_A), true, 60, false, null,
+	protected static KubernetesDiscoveryProperties discoveryProperties(boolean useEndpointSlices,
+			Set<String> discoveryNamespaces) {
+		return new KubernetesDiscoveryProperties(true, false, discoveryNamespaces, true, 60, false, null,
 				Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, useEndpointSlices,
 				false, null);
 	}

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithEndpointSlicesAndNamespaceFilterIT.java

@@ -96,7 +96,7 @@ KubernetesClient kubernetesClient() {
 		@Bean
 		@Primary
 		KubernetesDiscoveryProperties kubernetesDiscoveryProperties() {
-			return discoveryProperties(true);
+			return discoveryProperties(true, Set.of(NAMESPACE, NAMESPACE_A));
 		}
 
 	}

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithEndpointSlicesIT.java

@@ -87,7 +87,7 @@ KubernetesClient kubernetesClient() {
 		@Bean
 		@Primary
 		KubernetesDiscoveryProperties kubernetesDiscoveryProperties() {
-			return discoveryProperties(true);
+			return discoveryProperties(true, Set.of(NAMESPACE));
 		}
 
 	}

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithEndpointsAndNamespaceFilterIT.java

@@ -96,7 +96,7 @@ KubernetesClient kubernetesClient() {
 		@Bean
 		@Primary
 		KubernetesDiscoveryProperties kubernetesDiscoveryProperties() {
-			return discoveryProperties(false);
+			return discoveryProperties(false, Set.of(NAMESPACE, NAMESPACE_A));
 		}
 
 	}

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Fabric8CatalogWatchWithEndpointsIT.java

@@ -87,7 +87,7 @@ KubernetesClient kubernetesClient() {
 		@Bean
 		@Primary
 		KubernetesDiscoveryProperties kubernetesDiscoveryProperties() {
-			return discoveryProperties(false);
+			return discoveryProperties(false, Set.of(NAMESPACE));
 		}
 
 	}