Skip to content

Commit 05b0246

Browse files
ryanjbaxterryanjbaxter
committed
Merge branch '3.1.x'
2 parents 30dd28c + d33764d commit 05b0246

File tree

2 files changed

+27
-20
lines changed

2 files changed

+27
-20
lines changed

‎spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientBootstrapConfiguration.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.springframework.cloud.kubernetes.commons.config.ConfigMapConfigProperties;
3232
import org.springframework.cloud.kubernetes.commons.config.KubernetesBootstrapConfiguration;
3333
import org.springframework.cloud.kubernetes.commons.config.SecretsConfigProperties;
34+
import org.springframework.cloud.util.ConditionalOnBootstrapEnabled;
3435
import org.springframework.context.annotation.Bean;
3536
import org.springframework.context.annotation.Configuration;
3637
import org.springframework.context.annotation.Import;
@@ -41,6 +42,7 @@
4142
@Configuration(proxyBeanMethods = false)
4243
@AutoConfigureAfter(KubernetesBootstrapConfiguration.class)
4344
@Import({ KubernetesCommonsAutoConfiguration.class, KubernetesClientAutoConfiguration.class })
45+
@ConditionalOnBootstrapEnabled
4446
@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
4547
public class KubernetesClientBootstrapConfiguration {
4648

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientConfigReloadAutoConfigurationTest.java‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ void kubernetesReloadEnabledButSecretAndConfigDisabled() {
174174
*/
175175
@Test
176176
void reloadEventEnabledMonitoringConfigMapsEnabledByDefault() {
177-
setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES");
177+
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
178+
"spring.main.cloud-platform=KUBERNETES");
178179
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
179180
Assertions.assertEquals(map.size(), 1);
180181
Assertions.assertTrue(map.values()
@@ -197,8 +198,8 @@ void reloadEventEnabledMonitoringConfigMapsEnabledByDefault() {
197198
*/
198199
@Test
199200
void reloadEventEnabledMonitoringConfigMapsEnabled() {
200-
setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=event",
201-
"spring.main.cloud-platform=KUBERNETES");
201+
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
202+
"spring.cloud.kubernetes.reload.mode=event", "spring.main.cloud-platform=KUBERNETES");
202203
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
203204
Assertions.assertEquals(map.size(), 1);
204205
Assertions.assertTrue(map.values()
@@ -259,8 +260,8 @@ void reloadPollingEnabledMonitoringConfigMapsDisabledMonitoringSecretsDisabled()
259260
*/
260261
@Test
261262
void reloadPollingEnabledMonitoringConfigMapsEnabled() {
262-
setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=polling",
263-
"spring.main.cloud-platform=KUBERNETES");
263+
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
264+
"spring.cloud.kubernetes.reload.mode=polling", "spring.main.cloud-platform=KUBERNETES");
264265
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
265266
Assertions.assertEquals(map.size(), 1);
266267
Assertions.assertTrue(
@@ -281,8 +282,8 @@ void reloadPollingEnabledMonitoringConfigMapsEnabled() {
281282
*/
282283
@Test
283284
void reloadEventEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled() {
284-
setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES",
285-
"spring.cloud.kubernetes.reload.monitoring-secrets=true",
285+
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
286+
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-secrets=true",
286287
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
287288
"spring.cloud.kubernetes.reload.mode=event");
288289
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
@@ -308,8 +309,8 @@ void reloadEventEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled() {
308309
*/
309310
@Test
310311
void reloadPollingEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled() {
311-
setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES",
312-
"spring.cloud.kubernetes.reload.monitoring-secrets=true",
312+
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
313+
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-secrets=true",
313314
"spring.cloud.kubernetes.reload.monitoring-configMaps=false",
314315
"spring.cloud.kubernetes.reload.mode=polling");
315316
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
@@ -332,8 +333,8 @@ void reloadPollingEnabledMonitoringConfigMapsDisabledMonitoringSecretsEnabled()
332333
*/
333334
@Test
334335
void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsEnabled() {
335-
setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES",
336-
"spring.cloud.kubernetes.reload.monitoring-secrets=true",
336+
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
337+
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-secrets=true",
337338
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
338339
"spring.cloud.kubernetes.reload.mode=event");
339340
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
@@ -360,8 +361,8 @@ void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsEnabled() {
360361
*/
361362
@Test
362363
void reloadPollingEnabledMonitoringConfigMapsEnabledMonitoringSecretsEnabled() {
363-
setup("spring.cloud.kubernetes.reload.enabled=true", "spring.main.cloud-platform=KUBERNETES",
364-
"spring.cloud.kubernetes.reload.monitoring-secrets=true",
364+
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
365+
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-secrets=true",
365366
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
366367
"spring.cloud.kubernetes.reload.mode=polling");
367368
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
@@ -430,8 +431,9 @@ void reloadPollingEnabledMonitorConfigMapsDisabledMonitoringSecretsDisabled() {
430431
*/
431432
@Test
432433
void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled() {
433-
setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=event",
434-
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=true",
434+
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
435+
"spring.cloud.kubernetes.reload.mode=event", "spring.main.cloud-platform=KUBERNETES",
436+
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
435437
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
436438
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
437439
Assertions.assertEquals(map.size(), 1);
@@ -456,8 +458,9 @@ void reloadEventEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled() {
456458
*/
457459
@Test
458460
void reloadPollingEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled() {
459-
setup("spring.cloud.kubernetes.reload.enabled=true", "spring.cloud.kubernetes.reload.mode=polling",
460-
"spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.reload.monitoring-configMaps=true",
461+
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.reload.enabled=true",
462+
"spring.cloud.kubernetes.reload.mode=polling", "spring.main.cloud-platform=KUBERNETES",
463+
"spring.cloud.kubernetes.reload.monitoring-configMaps=true",
461464
"spring.cloud.kubernetes.reload.monitoring-secrets=false");
462465
Map<String, ConfigurationChangeDetector> map = context.getBeansOfType(ConfigurationChangeDetector.class);
463466
Assertions.assertEquals(map.size(), 1);
@@ -472,21 +475,23 @@ void reloadPollingEnabledMonitoringConfigMapsEnabledMonitoringSecretsDisabled()
472475

473476
@Test
474477
void kubernetesConfigAndSecretEnabledByDefault() {
475-
setup("spring.main.cloud-platform=KUBERNETES");
478+
setup("spring.cloud.bootstrap.enabled=true", "spring.main.cloud-platform=KUBERNETES");
476479
assertThat(context.containsBean("configMapPropertySourceLocator")).isTrue();
477480
assertThat(context.containsBean("secretsPropertySourceLocator")).isTrue();
478481
}
479482

480483
@Test
481484
void kubernetesConfigEnabledButSecretDisabled() {
482-
setup("spring.cloud.kubernetes.secrets.enabled=false", "spring.main.cloud-platform=KUBERNETES");
485+
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.secrets.enabled=false",
486+
"spring.main.cloud-platform=KUBERNETES");
483487
assertThat(context.containsBean("configMapPropertySourceLocator")).isTrue();
484488
assertThat(context.containsBean("secretsPropertySourceLocator")).isFalse();
485489
}
486490

487491
@Test
488492
void kubernetesSecretsEnabledButConfigDisabled() {
489-
setup("spring.cloud.kubernetes.config.enabled=false", "spring.main.cloud-platform=KUBERNETES");
493+
setup("spring.cloud.bootstrap.enabled=true", "spring.cloud.kubernetes.config.enabled=false",
494+
"spring.main.cloud-platform=KUBERNETES");
490495
assertThat(context.containsBean("configMapPropertySourceLocator")).isFalse();
491496
assertThat(context.containsBean("secretsPropertySourceLocator")).isTrue();
492497
}

0 commit comments

Comments
 (0)