SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Ryan Baxter
2025-02-25 12:55:16 -06:00
parent bb200cd949 bb81e3f44b
commit bc8de30847
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusKafkaAutoConfiguration.java
View File

@@ -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,

4
spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/BusRabbitAutoConfiguration.java
View File

@@ -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,

2
spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/src/main/java/org/springframework/cloud/kubernetes/configuration/watcher/ConfigurationWatcherAutoConfiguration.java
View File

@@ -56,7 +56,7 @@ public class ConfigurationWatcherAutoConfiguration {
}
@Bean
@ConditionalOnMissingBean(ConfigMapWatcherChangeDetector.class)
@ConditionalOnMissingBean
@ConditionalOnBean(KubernetesClientConfigMapPropertySourceLocator.class)
public ConfigMapWatcherChangeDetector httpBasedConfigMapWatchChangeDetector(AbstractEnvironment environment,
CoreV1Api coreV1Api, KubernetesClientConfigMapPropertySourceLocator configMapPropertySourceLocator,