Merge branch '3.2.x' into 3.3.x

Author: ryanjbaxter

docs/modules/ROOT/partials/_configprops.adoc

@@ -1,66 +1,66 @@
 |===
 |Name | Default | Description
 
-|spring.cloud.kubernetes.client.api-version |  | 
+|spring.cloud.kubernetes.client.api-version |  |
 |spring.cloud.kubernetes.client.apiVersion | `+++v1+++` | Kubernetes API Version
-|spring.cloud.kubernetes.client.ca-cert-data |  | 
-|spring.cloud.kubernetes.client.ca-cert-file |  | 
+|spring.cloud.kubernetes.client.ca-cert-data |  |
+|spring.cloud.kubernetes.client.ca-cert-file |  |
 |spring.cloud.kubernetes.client.caCertData |  | Kubernetes API CACertData
 |spring.cloud.kubernetes.client.caCertFile |  | Kubernetes API CACertFile
-|spring.cloud.kubernetes.client.client-cert-data |  | 
-|spring.cloud.kubernetes.client.client-cert-file |  | 
-|spring.cloud.kubernetes.client.client-key-algo |  | 
-|spring.cloud.kubernetes.client.client-key-data |  | 
-|spring.cloud.kubernetes.client.client-key-file |  | 
-|spring.cloud.kubernetes.client.client-key-passphrase |  | 
+|spring.cloud.kubernetes.client.client-cert-data |  |
+|spring.cloud.kubernetes.client.client-cert-file |  |
+|spring.cloud.kubernetes.client.client-key-algo |  |
+|spring.cloud.kubernetes.client.client-key-data |  |
+|spring.cloud.kubernetes.client.client-key-file |  |
+|spring.cloud.kubernetes.client.client-key-passphrase |  |
 |spring.cloud.kubernetes.client.clientCertData |  | Kubernetes API ClientCertData
 |spring.cloud.kubernetes.client.clientCertFile |  | Kubernetes API ClientCertFile
 |spring.cloud.kubernetes.client.clientKeyAlgo | `+++RSA+++` | Kubernetes API ClientKeyAlgo
 |spring.cloud.kubernetes.client.clientKeyData |  | Kubernetes API ClientKeyData
 |spring.cloud.kubernetes.client.clientKeyFile |  | Kubernetes API ClientKeyFile
 |spring.cloud.kubernetes.client.clientKeyPassphrase | `+++changeit+++` | Kubernetes API ClientKeyPassphrase
-|spring.cloud.kubernetes.client.connection-timeout |  | 
+|spring.cloud.kubernetes.client.connection-timeout |  |
 |spring.cloud.kubernetes.client.connectionTimeout | `+++10s+++` | Connection timeout
-|spring.cloud.kubernetes.client.http-proxy |  | 
-|spring.cloud.kubernetes.client.https-proxy |  | 
-|spring.cloud.kubernetes.client.logging-interval |  | 
+|spring.cloud.kubernetes.client.http-proxy |  |
+|spring.cloud.kubernetes.client.https-proxy |  |
+|spring.cloud.kubernetes.client.logging-interval |  |
 |spring.cloud.kubernetes.client.loggingInterval | `+++20s+++` | Logging interval
-|spring.cloud.kubernetes.client.master-url |  | 
+|spring.cloud.kubernetes.client.master-url |  |
 |spring.cloud.kubernetes.client.masterUrl | `+++https://kubernetes.default.svc+++` | Kubernetes API Master Node URL
 |spring.cloud.kubernetes.client.namespace | `+++true+++` | Kubernetes Namespace
-|spring.cloud.kubernetes.client.no-proxy |  | 
-|spring.cloud.kubernetes.client.oauth-token |  | 
+|spring.cloud.kubernetes.client.no-proxy |  |
+|spring.cloud.kubernetes.client.oauth-token |  |
 |spring.cloud.kubernetes.client.oauthToken |  | Kubernetes API Oauth Token
 |spring.cloud.kubernetes.client.password |  | Kubernetes API Password
-|spring.cloud.kubernetes.client.proxy-password |  | 
-|spring.cloud.kubernetes.client.proxy-username |  | 
-|spring.cloud.kubernetes.client.request-timeout |  | 
+|spring.cloud.kubernetes.client.proxy-password |  |
+|spring.cloud.kubernetes.client.proxy-username |  |
+|spring.cloud.kubernetes.client.request-timeout |  |
 |spring.cloud.kubernetes.client.requestTimeout | `+++10s+++` | Request timeout
-|spring.cloud.kubernetes.client.rolling-timeout |  | 
+|spring.cloud.kubernetes.client.rolling-timeout |  |
 |spring.cloud.kubernetes.client.rollingTimeout | `+++900s+++` | Rolling timeout
-|spring.cloud.kubernetes.client.service-account-namespace-path | `+++/var/run/secrets/kubernetes.io/serviceaccount/namespace+++` | 
-|spring.cloud.kubernetes.client.trust-certs |  | 
+|spring.cloud.kubernetes.client.service-account-namespace-path | `+++/var/run/secrets/kubernetes.io/serviceaccount/namespace+++` |
+|spring.cloud.kubernetes.client.trust-certs |  |
 |spring.cloud.kubernetes.client.trustCerts | `+++false+++` | Kubernetes API Trust Certificates
-|spring.cloud.kubernetes.client.user-agent | `+++Spring-Cloud-Kubernetes-Application+++` | 
+|spring.cloud.kubernetes.client.user-agent | `+++Spring-Cloud-Kubernetes-Application+++` |
 |spring.cloud.kubernetes.client.username |  | Kubernetes API Username
-|spring.cloud.kubernetes.client.watch-reconnect-interval |  | 
-|spring.cloud.kubernetes.client.watch-reconnect-limit |  | 
+|spring.cloud.kubernetes.client.watch-reconnect-interval |  |
+|spring.cloud.kubernetes.client.watch-reconnect-limit |  |
 |spring.cloud.kubernetes.client.watchReconnectInterval | `+++1s+++` | Reconnect Interval
 |spring.cloud.kubernetes.client.watchReconnectLimit | `+++-1+++` | Reconnect Interval limit retries
-|spring.cloud.kubernetes.config.enable-api | `+++true+++` | 
+|spring.cloud.kubernetes.config.enable-api | `+++true+++` |
 |spring.cloud.kubernetes.config.enabled | `+++true+++` | Enable the ConfigMap property source locator.
-|spring.cloud.kubernetes.config.fail-fast | `+++false+++` | 
-|spring.cloud.kubernetes.config.include-profile-specific-sources | `+++true+++` | 
-|spring.cloud.kubernetes.config.labels |  | 
-|spring.cloud.kubernetes.config.name |  | 
-|spring.cloud.kubernetes.config.namespace |  | 
-|spring.cloud.kubernetes.config.paths |  | 
-|spring.cloud.kubernetes.config.retry |  | 
-|spring.cloud.kubernetes.config.sources |  | 
-|spring.cloud.kubernetes.config.use-name-as-prefix | `+++false+++` | 
+|spring.cloud.kubernetes.config.fail-fast | `+++false+++` |
+|spring.cloud.kubernetes.config.include-profile-specific-sources | `+++true+++` |
+|spring.cloud.kubernetes.config.labels |  |
+|spring.cloud.kubernetes.config.name |  |
+|spring.cloud.kubernetes.config.namespace |  |
+|spring.cloud.kubernetes.config.paths |  |
+|spring.cloud.kubernetes.config.retry |  |
+|spring.cloud.kubernetes.config.sources |  |
+|spring.cloud.kubernetes.config.use-name-as-prefix | `+++false+++` |
 |spring.cloud.kubernetes.discovery.all-namespaces | `+++false+++` | if discovery is enabled for all namespaces
 |spring.cloud.kubernetes.discovery.cache-loading-timeout-seconds | `+++60+++` | timeout for initializing discovery cache, will abort the application if exceeded.
-|spring.cloud.kubernetes.discovery.discovery-server-url |  | 
+|spring.cloud.kubernetes.discovery.discovery-server-url |  |
 |spring.cloud.kubernetes.discovery.enabled | `+++true+++` | if kubernetes discovery is enabled
 |spring.cloud.kubernetes.discovery.filter |  | SpEL expression to filter services after they have been retrieved from the Kubernetes API server.
 |spring.cloud.kubernetes.discovery.include-external-name-services | `+++false+++` | should the discovery also search for services that have "type: ExternalName" in their spec.
@@ -75,7 +75,7 @@
 |spring.cloud.kubernetes.discovery.metadata.labels-prefix |  | prefix for the labels
 |spring.cloud.kubernetes.discovery.metadata.ports-prefix | `+++port.+++` | prefix for the ports, by default it is "port."
 |spring.cloud.kubernetes.discovery.namespaces |  | If set and allNamespaces is false, then only the services and endpoints matching these namespaces will be fetched from the Kubernetes API server.
-|spring.cloud.kubernetes.discovery.order | `+++0+++` | 
+|spring.cloud.kubernetes.discovery.order | `+++0+++` |
 |spring.cloud.kubernetes.discovery.primary-port-name |  | If set then the port with a given name is used as primary when multiple ports are defined for a service.
 |spring.cloud.kubernetes.discovery.service-labels |  | if set, then only the services matching these labels will be fetched from the Kubernetes API server.
 |spring.cloud.kubernetes.discovery.use-endpoint-slices | `+++false+++` | use EndpointSlice instead of Endpoints
@@ -102,16 +102,16 @@
 |spring.cloud.kubernetes.reload.namespaces |  | namespaces where an informer will be set-up. this property is only relevant for event based reloading.
 |spring.cloud.kubernetes.reload.period | `+++15000ms+++` | Sets the polling period to use when the detection mode is POLLING.
 |spring.cloud.kubernetes.reload.strategy | `+++REFRESH+++` | Sets reload strategy for Kubernetes configuration reload on change.
-|spring.cloud.kubernetes.secrets.enable-api | `+++false+++` | 
+|spring.cloud.kubernetes.secrets.enable-api | `+++false+++` |
 |spring.cloud.kubernetes.secrets.enabled | `+++true+++` | Enable the Secrets property source locator.
-|spring.cloud.kubernetes.secrets.fail-fast | `+++false+++` | 
-|spring.cloud.kubernetes.secrets.include-profile-specific-sources | `+++true+++` | 
-|spring.cloud.kubernetes.secrets.labels |  | 
-|spring.cloud.kubernetes.secrets.name |  | 
-|spring.cloud.kubernetes.secrets.namespace |  | 
-|spring.cloud.kubernetes.secrets.paths |  | 
-|spring.cloud.kubernetes.secrets.retry |  | 
-|spring.cloud.kubernetes.secrets.sources |  | 
-|spring.cloud.kubernetes.secrets.use-name-as-prefix | `+++false+++` | 
+|spring.cloud.kubernetes.secrets.fail-fast | `+++false+++` |
+|spring.cloud.kubernetes.secrets.include-profile-specific-sources | `+++true+++` |
+|spring.cloud.kubernetes.secrets.labels |  |
+|spring.cloud.kubernetes.secrets.name |  |
+|spring.cloud.kubernetes.secrets.namespace |  |
+|spring.cloud.kubernetes.secrets.paths |  |
+|spring.cloud.kubernetes.secrets.retry |  |
+|spring.cloud.kubernetes.secrets.sources |  |
+|spring.cloud.kubernetes.secrets.use-name-as-prefix | `+++false+++` |
 
-|===
+|===

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

@@ -10,6 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-kubernetes-client-autoconfig</artifactId>
+	<name>${project.artifactId}</name>
 
 	<dependencies>
 		<dependency>

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

@@ -10,6 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-kubernetes-client-config</artifactId>
+	<name>${project.artifactId}</name>
 
 	<dependencies>
 		<dependency>

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

@@ -11,6 +11,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-kubernetes-client-loadbalancer</artifactId>
+	<name>${project.artifactId}</name>
 
 	<dependencies>
 		<dependency>

spring-cloud-kubernetes-commons/pom.xml

@@ -10,6 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-kubernetes-commons</artifactId>
+	<name>${project.artifactId}</name>
     <build>
         <plugins>
             <plugin>

spring-cloud-kubernetes-controllers/pom.xml

@@ -11,6 +11,7 @@
 	<packaging>pom</packaging>
 
 	<artifactId>spring-cloud-kubernetes-controllers</artifactId>
+	<name>${project.artifactId}</name>
 
 	<modules>
 		<module>spring-cloud-kubernetes-configuration-watcher</module>

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml

@@ -10,6 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-kubernetes-configserver</artifactId>
+	<name>${project.artifactId}</name>
 
 	<properties>
 		<docker.registry.organization>springcloud</docker.registry.organization>

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml

@@ -10,6 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-kubernetes-configuration-watcher</artifactId>
+	<name>${project.artifactId}</name>
 
 	<properties>
 		<docker.registry.organization>springcloud</docker.registry.organization>

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml

@@ -10,6 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-kubernetes-discoveryserver</artifactId>
+	<name>${project.artifactId}</name>
 
 	<properties>
 		<docker.registry.organization>springcloud</docker.registry.organization>

spring-cloud-kubernetes-discovery/pom.xml

@@ -10,6 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-kubernetes-discovery</artifactId>
+	<name>${project.artifactId}</name>
 
 	<dependencies>
 		<dependency>