Merge branch '3.1.x' into refactor-integration-tests-2

Author: wind57

docs/modules/ROOT/pages/property-source-config/propertysource-reload.adoc

@@ -2,8 +2,8 @@
 = `PropertySource` Reload
 
 WARNING:  This functionality has been deprecated in the 2020.0 release.  Please see
-the xref:spring-cloud-kubernetes-configuration-watcher.adoc#spring-cloud-kubernetes-configuration-watcher[null] controller for an alternative way
-to achieve the same functionality.
+the xref:spring-cloud-kubernetes-configuration-watcher.adoc#spring-cloud-kubernetes-configuration-watcher[Spring Cloud Kubernetes Configuration Watcher]
+controller for an alternative way to achieve the same functionality.
 
 Some applications may need to detect changes on external property sources and update their internal status to reflect the new configuration.
 The reload feature of Spring Cloud Kubernetes is able to trigger an application reload when a related `ConfigMap` or

docs/package.json

@@ -1,10 +1,10 @@
 {
 	"dependencies": {
-		"antora": "3.2.0-alpha.4",
+		"antora": "3.2.0-alpha.6",
 		"@antora/atlas-extension": "1.0.0-alpha.2",
-		"@antora/collector-extension": "1.0.0-beta.3",
+		"@antora/collector-extension": "1.0.0-rc.1",
 		"@asciidoctor/tabs": "1.0.0-beta.6",
-		"@springio/antora-extensions": "1.11.1",
+		"@springio/antora-extensions": "1.14.2",
 		"@springio/asciidoctor-extensions": "1.0.0-alpha.14"
 	}
 }

docs/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<packaging>jar</packaging>

pom.xml

@@ -25,12 +25,12 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.1.4-SNAPSHOT</version>
+		<version>4.1.5-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes</artifactId>
-	<version>3.1.4-SNAPSHOT</version>
+	<version>3.1.5-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes</name>
 
@@ -69,10 +69,10 @@
 		<surefire-reports-directory>surefire-reports</surefire-reports-directory>
 		<failsafe-reports-directory>failsafe-reports</failsafe-reports-directory>
 		<!-- Dependency Versions -->
-		<spring-cloud-commons.version>4.1.5-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-config.version>4.1.4-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-bus.version>4.1.3-SNAPSHOT</spring-cloud-bus.version>
-		<spring-cloud-contract.version>4.1.5-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-commons.version>4.1.6-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-config.version>4.1.5-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-bus.version>4.1.4-SNAPSHOT</spring-cloud-bus.version>
+		<spring-cloud-contract.version>4.1.6-SNAPSHOT</spring-cloud-contract.version>
 
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true

spring-cloud-kubernetes-client-autoconfig/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

spring-cloud-kubernetes-client-config/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.5-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfiguration.java

@@ -31,6 +31,7 @@
 import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
 import org.springframework.cloud.kubernetes.commons.config.KubernetesBootstrapConfiguration;
 import org.springframework.cloud.kubernetes.commons.config.SecretsConfigProperties;
+import org.springframework.cloud.util.ConditionalOnBootstrapEnabled;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -41,6 +42,7 @@
 @Configuration(proxyBeanMethods = false)
 @AutoConfigureAfter(KubernetesBootstrapConfiguration.class)
 @Import({ KubernetesCommonsAutoConfiguration.class, KubernetesClientAutoConfiguration.class })
+@ConditionalOnBootstrapEnabled
 @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
 public class KubernetesClientBootstrapConfiguration {
 

spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigUtils.java

@@ -147,7 +147,7 @@ private static List<StrippedSourceContainer> strippedConfigMaps(CoreV1Api coreV1
 	private static List<StrippedSourceContainer> strippedSecrets(CoreV1Api coreV1Api, String namespace) {
 		List<StrippedSourceContainer> strippedSecrets = KubernetesClientSecretsCache.byNamespace(coreV1Api, namespace);
 		if (strippedSecrets.isEmpty()) {
-			LOG.debug("No configmaps in namespace '" + namespace + "'");
+			LOG.debug("No secrets in namespace '" + namespace + "'");
 		}
 		return strippedSecrets;
 	}