Merge branch 'main' into move-to-a-common-configuration-for-health

spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapper.java

@@ -29,7 +29,6 @@
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
-import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
 import org.springframework.cloud.kubernetes.commons.config.KubernetesConfigServerBootstrapper;
 import org.springframework.cloud.kubernetes.commons.config.KubernetesConfigServerInstanceProvider;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
@@ -53,14 +52,11 @@ public void initialize(BootstrapRegistry registry) {
 
 	final static class KubernetesFunction implements ConfigServerInstanceProvider.Function {
 
-		private final BootstrapContext context;
-
-		private KubernetesFunction(BootstrapContext context) {
-			this.context = context;
+		private KubernetesFunction() {
 		}
 
 		static KubernetesFunction create(BootstrapContext context) {
-			return new KubernetesFunction(context);
+			return new KubernetesFunction();
 		}
 
 		@Override
@@ -73,18 +69,12 @@ public List<ServiceInstance> apply(String serviceId, Binder binder, BindHandler
 				// Kubernetes DiscoveryClient
 				return Collections.emptyList();
 			}
-			KubernetesDiscoveryProperties discoveryProperties = createKubernetesDiscoveryProperties(binder,
-					bindHandler);
-			KubernetesClientProperties clientProperties = createKubernetesClientProperties(binder, bindHandler);
-			return getInstanceProvider(discoveryProperties, clientProperties, context, binder, bindHandler, log)
-					.getInstances(serviceId);
+			return getInstanceProvider(binder, bindHandler).getInstances(serviceId);
 		}
 
-		private KubernetesConfigServerInstanceProvider getInstanceProvider(
-				KubernetesDiscoveryProperties discoveryProperties, KubernetesClientProperties clientProperties,
-				BootstrapContext context, Binder binder, BindHandler bindHandler, Log log) {
+		private KubernetesConfigServerInstanceProvider getInstanceProvider(Binder binder, BindHandler bindHandler) {
 			KubernetesDiscoveryClientProperties kubernetesDiscoveryClientProperties = binder
-					.bind("spring.cloud.kubernetes.discovery", Bindable.of(KubernetesDiscoveryClientProperties.class),
+					.bind(KubernetesDiscoveryProperties.PREFIX, Bindable.of(KubernetesDiscoveryClientProperties.class),
 							bindHandler)
 					.orElseGet(KubernetesDiscoveryClientProperties::new);
 			KubernetesDiscoveryClientAutoConfiguration.Servlet autoConfiguration = new KubernetesDiscoveryClientAutoConfiguration.Servlet();

spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java

@@ -43,13 +43,16 @@
 
 /**
  * @author Ryan Baxter
+ * @deprecated in favor of {@link KubernetesDiscoveryClientBlockingAutoConfiguration} and
+ * {@link KubernetesDiscoveryClientReactiveAutoConfiguration}
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnDiscoveryEnabled
 @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
 @ConditionalOnKubernetesDiscoveryEnabled
 @EnableConfigurationProperties({ DiscoveryClientHealthIndicatorProperties.class,
 		KubernetesDiscoveryClientProperties.class })
+@Deprecated(forRemoval = true)
 public class KubernetesDiscoveryClientAutoConfiguration {
 
 	@Configuration(proxyBeanMethods = false)

spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientBlockingAutoConfiguration.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2013-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.discovery;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
+import org.springframework.boot.cloud.CloudPlatform;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
+import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled;
+import org.springframework.cloud.client.discovery.event.InstanceRegisteredEvent;
+import org.springframework.cloud.client.discovery.health.DiscoveryClientHealthIndicatorProperties;
+import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnKubernetesDiscoveryEnabled;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author wind57
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnDiscoveryEnabled
+@ConditionalOnKubernetesDiscoveryEnabled
+@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
+@EnableConfigurationProperties({ DiscoveryClientHealthIndicatorProperties.class,
+		KubernetesDiscoveryClientProperties.class })
+class KubernetesDiscoveryClientBlockingAutoConfiguration {
+
+	@Bean
+	@ConditionalOnMissingClass("org.springframework.web.reactive.function.client.WebClient")
+	@ConditionalOnMissingBean(RestTemplate.class)
+	RestTemplate restTemplate() {
+		return new RestTemplateBuilder().build();
+	}
+
+	@Bean
+	@ConditionalOnMissingClass("org.springframework.web.reactive.function.client.WebClient")
+	KubernetesDiscoveryClient kubernetesDiscoveryClient(RestTemplate restTemplate,
+			KubernetesDiscoveryClientProperties properties) {
+		return new KubernetesDiscoveryClient(restTemplate, properties);
+	}
+
+	@Bean
+	@ConditionalOnClass({ HealthIndicator.class })
+	@ConditionalOnDiscoveryHealthIndicatorEnabled
+	InitializingBean indicatorInitializer(ApplicationEventPublisher applicationEventPublisher,
+			ApplicationContext applicationContext) {
+		InitializingBean bean = () -> applicationEventPublisher
+				.publishEvent(new InstanceRegisteredEvent<>(applicationContext.getId(), null));
+		return bean;
+
+	}
+
+}

spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientReactiveAutoConfiguration.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2013-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.discovery;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.cloud.CloudPlatform;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
+import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled;
+import org.springframework.cloud.client.ConditionalOnReactiveDiscoveryEnabled;
+import org.springframework.cloud.client.discovery.event.InstanceRegisteredEvent;
+import org.springframework.cloud.client.discovery.health.DiscoveryClientHealthIndicatorProperties;
+import org.springframework.cloud.client.discovery.health.reactive.ReactiveDiscoveryClientHealthIndicator;
+import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnKubernetesDiscoveryEnabled;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.function.client.WebClient;
+
+/**
+ * @author wind57
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnDiscoveryEnabled
+@ConditionalOnKubernetesDiscoveryEnabled
+@ConditionalOnReactiveDiscoveryEnabled
+@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
+@EnableConfigurationProperties({ DiscoveryClientHealthIndicatorProperties.class,
+		KubernetesDiscoveryClientProperties.class })
+class KubernetesDiscoveryClientReactiveAutoConfiguration {
+
+	@Bean
+	@ConditionalOnClass(name = { "org.springframework.web.reactive.function.client.WebClient" })
+	@ConditionalOnMissingBean(WebClient.Builder.class)
+	WebClient.Builder webClientBuilder() {
+		return WebClient.builder();
+	}
+
+	@Bean
+	@ConditionalOnClass(name = { "org.springframework.web.reactive.function.client.WebClient" })
+	KubernetesReactiveDiscoveryClient kubernetesReactiveDiscoveryClient(WebClient.Builder webClientBuilder,
+			KubernetesDiscoveryClientProperties properties) {
+		return new KubernetesReactiveDiscoveryClient(webClientBuilder, properties);
+	}
+
+	@Bean
+	@ConditionalOnClass(name = "org.springframework.boot.actuate.health.ReactiveHealthIndicator")
+	@ConditionalOnDiscoveryHealthIndicatorEnabled
+	ReactiveDiscoveryClientHealthIndicator kubernetesReactiveDiscoveryClientHealthIndicator(
+			KubernetesReactiveDiscoveryClient client, DiscoveryClientHealthIndicatorProperties properties,
+			ApplicationContext applicationContext) {
+		ReactiveDiscoveryClientHealthIndicator healthIndicator = new ReactiveDiscoveryClientHealthIndicator(client,
+				properties);
+		InstanceRegisteredEvent event = new InstanceRegisteredEvent(applicationContext.getId(), null);
+		healthIndicator.onApplicationEvent(event);
+		return healthIndicator;
+	}
+
+}

spring-cloud-kubernetes-discovery/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1,2 @@
-org.springframework.cloud.kubernetes.discovery.KubernetesDiscoveryClientAutoConfiguration
+org.springframework.cloud.kubernetes.discovery.KubernetesDiscoveryClientBlockingAutoConfiguration
+org.springframework.cloud.kubernetes.discovery.KubernetesDiscoveryClientReactiveAutoConfiguration

spring-cloud-kubernetes-discovery/src/test/java/org/springframework/cloud/kubernetes/discovery/ConfigServerBootstrapperTests.java

@@ -68,9 +68,21 @@ void beforeAll() throws JsonProcessingException {
 		wireMockServer = new WireMockServer(options().dynamicPort());
 		wireMockServer.start();
 		WireMock.configureFor(wireMockServer.port());
-		String APPS_NAME = "[{\"instanceId\":\"uid2\",\"serviceId\":\"spring-cloud-kubernetes-configserver\",\"host\":\"localhost\",\"port\":"
-				+ wireMockServer.port() + ",\"uri\":\"" + wireMockServer.baseUrl()
-				+ "\",\"secure\":false,\"metadata\":{\"spring\":\"true\",\"http\":\"8080\",\"k8s\":\"true\"},\"namespace\":\"namespace1\",\"cluster\":null,\"scheme\":\"http\"}]";
+		String APPS_NAME = """
+								[{
+									"instanceId": "uid2",
+									"serviceId": "spring-cloud-kubernetes-configserver",
+									"host": "localhost",
+									"port": "%s",
+									"uri": "%s",
+									"secure":false,
+									"metadata":{"spring": "true", "http": "8080", "k8s": "true"},
+									"namespace": "namespace1",
+									"cluster": null,
+									"scheme":"http"
+					}]
+				""".formatted(wireMockServer.port(), wireMockServer.baseUrl());
+
 		stubFor(get("/apps/spring-cloud-kubernetes-configserver").willReturn(
 				aResponse().withStatus(200).withBody(APPS_NAME).withHeader("content-type", "application/json")));
 		Environment environment = new Environment("test", "default");