-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of https://github.com/spring-cloud/spring-cloud-k…
- Loading branch information
Showing
6 changed files
with
237 additions
and
105 deletions.
There are no files selected for viewing
79 changes: 79 additions & 0 deletions
79
...org/springframework/cloud/kubernetes/configuration/watcher/BusKafkaAutoConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Copyright 2013-2024 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.configuration.watcher; | ||
|
|
||
| import io.kubernetes.client.openapi.apis.CoreV1Api; | ||
|
|
||
| import org.springframework.boot.autoconfigure.AutoConfigureAfter; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; | ||
| import org.springframework.boot.cloud.CloudPlatform; | ||
| import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; | ||
| import org.springframework.cloud.kubernetes.client.config.KubernetesClientConfigMapPropertySourceLocator; | ||
| import org.springframework.cloud.kubernetes.client.config.KubernetesClientSecretsPropertySourceLocator; | ||
| import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider; | ||
| import org.springframework.cloud.kubernetes.commons.config.reload.ConfigReloadProperties; | ||
| import org.springframework.cloud.kubernetes.commons.config.reload.ConfigurationUpdateStrategy; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.context.annotation.Import; | ||
| import org.springframework.context.annotation.Profile; | ||
| import org.springframework.core.env.AbstractEnvironment; | ||
| import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; | ||
|
|
||
| import static org.springframework.cloud.kubernetes.configuration.watcher.ConfigurationWatcherConfigurationProperties.KAFKA; | ||
|
|
||
| /** | ||
| * @author wind57 | ||
| */ | ||
| @Configuration(proxyBeanMethods = false) | ||
| @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) | ||
| @Profile(KAFKA) | ||
| @Import(ContextFunctionCatalogAutoConfiguration.class) | ||
| @AutoConfigureAfter(RefreshTriggerAutoConfiguration.class) | ||
| class BusKafkaAutoConfiguration { | ||
|
|
||
| @Bean | ||
| @ConditionalOnMissingBean(ConfigMapWatcherChangeDetector.class) | ||
| @ConditionalOnBean(KubernetesClientConfigMapPropertySourceLocator.class) | ||
| ConfigMapWatcherChangeDetector busConfigMapChangeWatcher(AbstractEnvironment environment, CoreV1Api coreV1Api, | ||
| KubernetesClientConfigMapPropertySourceLocator configMapPropertySourceLocator, | ||
| ConfigReloadProperties properties, KubernetesNamespaceProvider namespaceProvider, | ||
| ConfigurationUpdateStrategy strategy, | ||
| ConfigurationWatcherConfigurationProperties k8SConfigurationProperties, | ||
| ThreadPoolTaskExecutor threadFactory, BusRefreshTrigger busRefreshTrigger) { | ||
| return new BusEventBasedConfigMapWatcherChangeDetector(coreV1Api, environment, properties, strategy, | ||
| configMapPropertySourceLocator, namespaceProvider, k8SConfigurationProperties, threadFactory, | ||
| busRefreshTrigger); | ||
| } | ||
|
|
||
| @Bean | ||
| @ConditionalOnMissingBean(SecretsWatcherChangeDetector.class) | ||
| @ConditionalOnBean(KubernetesClientSecretsPropertySourceLocator.class) | ||
| SecretsWatcherChangeDetector busSecretsChangeWatcher(AbstractEnvironment environment, CoreV1Api coreV1Api, | ||
| KubernetesClientSecretsPropertySourceLocator secretsPropertySourceLocator, | ||
| ConfigReloadProperties properties, ConfigurationUpdateStrategy strategy, | ||
| ConfigurationWatcherConfigurationProperties k8SConfigurationProperties, | ||
| ThreadPoolTaskExecutor threadFactory, KubernetesNamespaceProvider namespaceProvider, | ||
| BusRefreshTrigger busRefreshTrigger) { | ||
| return new BusEventBasedSecretsWatcherChangeDetector(coreV1Api, environment, properties, strategy, | ||
| secretsPropertySourceLocator, namespaceProvider, k8SConfigurationProperties, threadFactory, | ||
| busRefreshTrigger); | ||
| } | ||
|
|
||
| } |
80 changes: 80 additions & 0 deletions
80
...rg/springframework/cloud/kubernetes/configuration/watcher/BusRabbitAutoConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * Copyright 2013-2024 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.configuration.watcher; | ||
|
|
||
| import io.kubernetes.client.openapi.apis.CoreV1Api; | ||
|
|
||
| import org.springframework.boot.actuate.autoconfigure.amqp.RabbitHealthContributorAutoConfiguration; | ||
| import org.springframework.boot.autoconfigure.AutoConfigureAfter; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; | ||
| import org.springframework.boot.cloud.CloudPlatform; | ||
| import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; | ||
| import org.springframework.cloud.kubernetes.client.config.KubernetesClientConfigMapPropertySourceLocator; | ||
| import org.springframework.cloud.kubernetes.client.config.KubernetesClientSecretsPropertySourceLocator; | ||
| import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider; | ||
| import org.springframework.cloud.kubernetes.commons.config.reload.ConfigReloadProperties; | ||
| import org.springframework.cloud.kubernetes.commons.config.reload.ConfigurationUpdateStrategy; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.context.annotation.Import; | ||
| import org.springframework.context.annotation.Profile; | ||
| import org.springframework.core.env.AbstractEnvironment; | ||
| import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; | ||
|
|
||
| import static org.springframework.cloud.kubernetes.configuration.watcher.ConfigurationWatcherConfigurationProperties.AMQP; | ||
|
|
||
| /** | ||
| * @author wind57 | ||
| */ | ||
| @Configuration(proxyBeanMethods = false) | ||
| @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) | ||
| @Profile(AMQP) | ||
| @Import({ ContextFunctionCatalogAutoConfiguration.class, RabbitHealthContributorAutoConfiguration.class }) | ||
| @AutoConfigureAfter(RefreshTriggerAutoConfiguration.class) | ||
| class BusRabbitAutoConfiguration { | ||
|
|
||
| @Bean | ||
| @ConditionalOnMissingBean(ConfigMapWatcherChangeDetector.class) | ||
| @ConditionalOnBean(KubernetesClientConfigMapPropertySourceLocator.class) | ||
| ConfigMapWatcherChangeDetector busConfigMapChangeWatcher(AbstractEnvironment environment, CoreV1Api coreV1Api, | ||
| KubernetesClientConfigMapPropertySourceLocator configMapPropertySourceLocator, | ||
| KubernetesNamespaceProvider kubernetesNamespaceProvider, ConfigReloadProperties properties, | ||
| ConfigurationUpdateStrategy strategy, | ||
| ConfigurationWatcherConfigurationProperties k8SConfigurationProperties, | ||
| ThreadPoolTaskExecutor threadFactory, BusRefreshTrigger busRefreshTrigger) { | ||
| return new BusEventBasedConfigMapWatcherChangeDetector(coreV1Api, environment, properties, strategy, | ||
| configMapPropertySourceLocator, kubernetesNamespaceProvider, k8SConfigurationProperties, threadFactory, | ||
| busRefreshTrigger); | ||
| } | ||
|
|
||
| @Bean | ||
| @ConditionalOnMissingBean(SecretsWatcherChangeDetector.class) | ||
| @ConditionalOnBean(KubernetesClientSecretsPropertySourceLocator.class) | ||
| SecretsWatcherChangeDetector busSecretsChangeWatcher(AbstractEnvironment environment, CoreV1Api coreV1Api, | ||
| KubernetesClientSecretsPropertySourceLocator secretsPropertySourceLocator, | ||
| ConfigReloadProperties properties, KubernetesNamespaceProvider kubernetesNamespaceProvider, | ||
| ConfigurationUpdateStrategy strategy, | ||
| ConfigurationWatcherConfigurationProperties k8SConfigurationProperties, | ||
| ThreadPoolTaskExecutor threadFactory, BusRefreshTrigger busRefreshTrigger) { | ||
| return new BusEventBasedSecretsWatcherChangeDetector(coreV1Api, environment, properties, strategy, | ||
| secretsPropertySourceLocator, kubernetesNamespaceProvider, k8SConfigurationProperties, threadFactory, | ||
| busRefreshTrigger); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
...ringframework/cloud/kubernetes/configuration/watcher/RefreshTriggerAutoConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /* | ||
| * Copyright 2013-2024 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.configuration.watcher; | ||
|
|
||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform; | ||
| import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; | ||
| import org.springframework.boot.cloud.CloudPlatform; | ||
| import org.springframework.cloud.bus.BusProperties; | ||
| import org.springframework.cloud.kubernetes.client.discovery.reactive.KubernetesInformerReactiveDiscoveryClient; | ||
| import org.springframework.context.ApplicationEventPublisher; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.context.annotation.Profile; | ||
| import org.springframework.web.reactive.function.client.WebClient; | ||
|
|
||
| import static org.springframework.cloud.kubernetes.configuration.watcher.ConfigurationWatcherConfigurationProperties.AMQP; | ||
| import static org.springframework.cloud.kubernetes.configuration.watcher.ConfigurationWatcherConfigurationProperties.KAFKA; | ||
|
|
||
| /** | ||
| * @author wind57 | ||
| */ | ||
| @Configuration(proxyBeanMethods = false) | ||
| @ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES) | ||
| class RefreshTriggerAutoConfiguration { | ||
|
|
||
| @Bean | ||
| @ConditionalOnMissingBean | ||
| @Profile({ AMQP, KAFKA }) | ||
| BusRefreshTrigger busRefreshTrigger(ApplicationEventPublisher applicationEventPublisher, | ||
| BusProperties busProperties) { | ||
| return new BusRefreshTrigger(applicationEventPublisher, busProperties.getId()); | ||
| } | ||
|
|
||
| @Bean | ||
| @ConditionalOnMissingBean | ||
| HttpRefreshTrigger httpRefreshTrigger(KubernetesInformerReactiveDiscoveryClient client, | ||
| ConfigurationWatcherConfigurationProperties properties, WebClient webClient) { | ||
| return new HttpRefreshTrigger(client, properties, webClient); | ||
| } | ||
|
|
||
| } |
3 changes: 3 additions & 0 deletions
3
...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,5 @@ | ||
| org.springframework.cloud.kubernetes.configuration.watcher.ConfigurationWatcherAutoConfiguration | ||
| org.springframework.cloud.kubernetes.configuration.watcher.ConfigUpdateStrategyAutoConfiguration | ||
| org.springframework.cloud.kubernetes.configuration.watcher.BusKafkaAutoConfiguration | ||
| org.springframework.cloud.kubernetes.configuration.watcher.BusRabbitAutoConfiguration | ||
| org.springframework.cloud.kubernetes.configuration.watcher.RefreshTriggerAutoConfiguration |