Adds actuator conditional on class.

spencergibb · spencergibb · commit b44e502df419 · 2025-07-01T17:56:56.000-04:00
Updates for Spring Boot 4.0
diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer.java
@@ -35,7 +35,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Inherited
-@ConditionalOnClass(name = "org.springframework.boot.health.contributor.ReactiveHealthIndicator")
+@ConditionalOnClass(name = {"org.springframework.boot.health.contributor.ReactiveHealthIndicator", "org.springframework.boot.actuate.health.HealthEndpoint"})
 @ConditionalOnDiscoveryHealthIndicatorEnabled
 public @interface ConditionalOnSpringCloudKubernetesReactiveDiscoveryHealthInitializer {
 
diff --git a/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java
@@ -103,7 +103,7 @@ public ReactiveDiscoveryClient kubernetesReactiveDiscoveryClient(WebClient.Build
 		}
 
 		@Bean
-		@ConditionalOnClass(name = "org.springframework.boot.health.contributor.ReactiveHealthIndicator")
+		@ConditionalOnClass(name = {"org.springframework.boot.health.contributor.ReactiveHealthIndicator", "org.springframework.boot.actuate.health.HealthEndpoint"})
 		@ConditionalOnDiscoveryHealthIndicatorEnabled
 		public ReactiveDiscoveryClientHealthIndicator kubernetesReactiveDiscoveryClientHealthIndicator(
 				KubernetesReactiveDiscoveryClient client, DiscoveryClientHealthIndicatorProperties properties,

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public ReactiveDiscoveryClient kubernetesReactiveDiscoveryClient(WebClient.Build`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`@Bean`
`106`		`- @ConditionalOnClass(name = "org.springframework.boot.health.contributor.ReactiveHealthIndicator")`
	`106`	`+ @ConditionalOnClass(name = {"org.springframework.boot.health.contributor.ReactiveHealthIndicator", "org.springframework.boot.actuate.health.HealthEndpoint"})`
`107`	`107`	`@ConditionalOnDiscoveryHealthIndicatorEnabled`
`108`	`108`	`public ReactiveDiscoveryClientHealthIndicator kubernetesReactiveDiscoveryClientHealthIndicator(`
`109`	`109`	`KubernetesReactiveDiscoveryClient client, DiscoveryClientHealthIndicatorProperties properties,`