From bb81e3f44bb41614b5b184b2d9cb1016abfb0084 Mon Sep 17 00:00:00 2001 From: erabii Date: Tue, 25 Feb 2025 20:54:56 +0200 Subject: [PATCH] fix (#1882) Signed-off-by: wind57 --- .../configuration/watcher/BusKafkaAutoConfiguration.java | 4 ++-- .../configuration/watcher/BusRabbitAutoConfiguration.java | 4 ++-- .../watcher/ConfigurationWatcherAutoConfiguration.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusKafkaAutoConfiguration.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusKafkaAutoConfiguration.java index e80d908a..16cfc728 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusKafkaAutoConfiguration.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusKafkaAutoConfiguration.java @@ -49,7 +49,7 @@ import static org.springframework.cloud.kubernetes.configuration.watcher.Configu class BusKafkaAutoConfiguration { @Bean - @ConditionalOnMissingBean(ConfigMapWatcherChangeDetector.class) + @ConditionalOnMissingBean @ConditionalOnBean(KubernetesClientConfigMapPropertySourceLocator.class) ConfigMapWatcherChangeDetector busConfigMapChangeWatcher(AbstractEnvironment environment, CoreV1Api coreV1Api, KubernetesClientConfigMapPropertySourceLocator configMapPropertySourceLocator, @@ -63,7 +63,7 @@ class BusKafkaAutoConfiguration { } @Bean - @ConditionalOnMissingBean(SecretsWatcherChangeDetector.class) + @ConditionalOnMissingBean @ConditionalOnBean(KubernetesClientSecretsPropertySourceLocator.class) SecretsWatcherChangeDetector busSecretsChangeWatcher(AbstractEnvironment environment, CoreV1Api coreV1Api, KubernetesClientSecretsPropertySourceLocator secretsPropertySourceLocator, diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusRabbitAutoConfiguration.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusRabbitAutoConfiguration.java index 1f755f7e..43a887e8 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusRabbitAutoConfiguration.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusRabbitAutoConfiguration.java @@ -50,7 +50,7 @@ import static org.springframework.cloud.kubernetes.configuration.watcher.Configu class BusRabbitAutoConfiguration { @Bean - @ConditionalOnMissingBean(ConfigMapWatcherChangeDetector.class) + @ConditionalOnMissingBean @ConditionalOnBean(KubernetesClientConfigMapPropertySourceLocator.class) ConfigMapWatcherChangeDetector busConfigMapChangeWatcher(AbstractEnvironment environment, CoreV1Api coreV1Api, KubernetesClientConfigMapPropertySourceLocator configMapPropertySourceLocator, @@ -64,7 +64,7 @@ class BusRabbitAutoConfiguration { } @Bean - @ConditionalOnMissingBean(SecretsWatcherChangeDetector.class) + @ConditionalOnMissingBean @ConditionalOnBean(KubernetesClientSecretsPropertySourceLocator.class) SecretsWatcherChangeDetector busSecretsChangeWatcher(AbstractEnvironment environment, CoreV1Api coreV1Api, KubernetesClientSecretsPropertySourceLocator secretsPropertySourceLocator, diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherAutoConfiguration.java b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherAutoConfiguration.java index 30c78901..ca62a66c 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherAutoConfiguration.java +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherAutoConfiguration.java @@ -56,7 +56,7 @@ public class ConfigurationWatcherAutoConfiguration { } @Bean - @ConditionalOnMissingBean(ConfigMapWatcherChangeDetector.class) + @ConditionalOnMissingBean @ConditionalOnBean(KubernetesClientConfigMapPropertySourceLocator.class) public ConfigMapWatcherChangeDetector httpBasedConfigMapWatchChangeDetector(AbstractEnvironment environment, CoreV1Api coreV1Api, KubernetesClientConfigMapPropertySourceLocator configMapPropertySourceLocator,