Skip to content

Commit 2faa38d

Browse files
wind57wind57
committed
fix tests
Signed-off-by: wind57 <[email protected]>
1 parent 2f61a85 commit 2faa38d

File tree

13 files changed

+17
-19
lines changed

13 files changed

+17
-19
lines changed

‎docs/modules/ROOT/pages/property-source-config/configmap-propertysource.adoc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,6 @@ NOTE: Since version `5.0.0`, we have introduced the possibility to read sources
575575
| `spring.cloud.kubernetes.config.enabled` | `Boolean` | `true` | Enable ConfigMaps `PropertySource`
576576
| `spring.cloud.kubernetes.config.name` | `String` | `${spring.application.name}` | Sets the name of `ConfigMap` to look up
577577
| `spring.cloud.kubernetes.config.namespace` | `String` | Client namespace | Sets the Kubernetes namespace where to lookup
578-
| `spring.cloud.kubernetes.config.enableApi` | `Boolean` | `true` | Enable or disable consuming `ConfigMap` instances through APIs
579578
| `spring.cloud.kubernetes.config.fail-fast` | `Boolean` | `false` | Enable or disable failing the application start-up when an error occurred while loading a `ConfigMap`
580579
| `spring.cloud.kubernetes.config.retry.enabled` | `Boolean` | `true` | Enable or disable config retry.
581580
| `spring.cloud.kubernetes.config.retry.initial-interval` | `Long` | `1000` | Initial retry interval in milliseconds.

‎docs/modules/ROOT/pages/property-source-config/secrets-propertysource.adoc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ This setting is supported since `3.0.6` and upwards.
151151
| `spring.cloud.kubernetes.secrets.name` | `String` | `${spring.application.name}` | Sets the name of the secret to look up
152152
| `spring.cloud.kubernetes.secrets.namespace` | `String` | Client namespace | Sets the Kubernetes namespace where to look up
153153
| `spring.cloud.kubernetes.secrets.labels` | `Map` | `null` | Sets the labels used to lookup secrets
154-
| `spring.cloud.kubernetes.secrets.enableApi` | `Boolean` | `false` | Enables or disables consuming secrets through APIs (examples 2 and 3)
155154
| `spring.cloud.kubernetes.secrets.fail-fast` | `Boolean` | `false` | Enable or disable failing the application start-up when an error occurred while loading a `Secret`
156155
| `spring.cloud.kubernetes.secrets.retry.enabled` | `Boolean` | `true` | Enable or disable secrets retry.
157156
| `spring.cloud.kubernetes.secrets.retry.initial-interval` | `Long` | `1000` | Initial retry interval in milliseconds.

‎docs/modules/ROOT/pages/spring-cloud-kubernetes-configserver.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ To enable the Kubernetes environment repository the `kubernetes` profile must be
1818
You may activate other profiles as well to use other environment repository implementations.
1919

2020
=== Config Map and Secret PropertySources
21-
By default, only Config Map data will be fetched. To enable Secrets as well you will need to set `spring.cloud.kubernetes.secrets.enableApi=true`.
22-
You can disable the Config Map `PropertySource` by setting `spring.cloud.kubernetes.config.enableApi=false`.
21+
By default, only Config Map data will be fetched. To enable Secrets as well you will need to set `spring.cloud.kubernetes.secrets.enabled=true`.
22+
You can disable the Config Map `PropertySource` by setting `spring.cloud.kubernetes.config.enabled=false`.
2323

2424
=== Fetching Config Map and Secret Data From Additional Namespaces
2525
By default, the Kubernetes environment repository will only fetch Config Map and Secrets from the namespace in which it is deployed.

‎spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/main/java/org/springframework/cloud/kubernetes/configserver/KubernetesConfigServerAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public KubernetesEnvironmentRepositoryFactory kubernetesEnvironmentRepositoryFac
8080

8181
@Bean
8282
@ConditionalOnKubernetesConfigEnabled
83-
@ConditionalOnProperty(value = "spring.cloud.kubernetes.config.enableApi", matchIfMissing = true)
83+
@ConditionalOnProperty(value = "spring.cloud.kubernetes.config.enabled", matchIfMissing = true)
8484
public KubernetesPropertySourceSupplier configMapPropertySourceSupplier(
8585
KubernetesConfigServerProperties properties) {
8686
return (coreApi, applicationName, namespace, springEnv) -> {
@@ -102,7 +102,7 @@ public KubernetesPropertySourceSupplier configMapPropertySourceSupplier(
102102

103103
@Bean
104104
@ConditionalOnKubernetesSecretsEnabled
105-
@ConditionalOnProperty("spring.cloud.kubernetes.secrets.enableApi")
105+
@ConditionalOnProperty("spring.cloud.kubernetes.secrets.enabled")
106106
public KubernetesPropertySourceSupplier secretsPropertySourceSupplier(KubernetesConfigServerProperties properties) {
107107
return (coreApi, applicationName, namespace, springEnv) -> {
108108
List<String> namespaces = namespaceSplitter(properties.getSecretsNamespaces(), namespace);

‎spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabledTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
3131
classes = { KubernetesConfigServerApplication.class },
3232
properties = { "spring.main.cloud-platform=KUBERNETES", "spring.profiles.include=kubernetes",
33-
"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.enableApi=false" })
33+
"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.config.enabled=false" })
3434
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedConfigApiDisabledTests {
3535

3636
@Autowired

‎spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabledTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
3131
classes = { KubernetesConfigServerApplication.class },
3232
properties = { "spring.profiles.include=kubernetes", "spring.main.cloud-platform=KUBERNETES",
33-
"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.enableApi=true" })
33+
"spring.cloud.kubernetes.client.namespace=default", "spring.cloud.kubernetes.secrets.enabled=true" })
3434
class ConfigServerAutoConfigurationKubernetesEnabledProfileIncludedSecretsApiEnabledTests {
3535

3636
@Autowired

‎spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/BootstrapConfigServerIntegrationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
2626
properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.namespace=default",
27-
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.secrets.enableApi=true",
27+
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.secrets.enabled=true",
2828
"spring.cloud.bootstrap.enabled=true", "test.first.config.enabled=true" },
2929
classes = { KubernetesConfigServerApplication.class })
3030
class BootstrapConfigServerIntegrationTests extends ConfigServerIntegration {

‎spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/CompositeKubernetesIntegrationTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class CompositeKubernetesIntegrationTests {
4848
@SpringBootTest(classes = { KubernetesConfigServerApplication.class },
4949
properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.namespace=default",
5050
"spring.cloud.config.server.composite[0].type=kubernetes",
51-
"spring.cloud.kubernetes.secrets.enableApi=true", "test.second.config.enabled=true",
51+
"spring.cloud.kubernetes.secrets.enabled=true", "test.second.config.enabled=true",
5252
"spring.cloud.kubernetes.secrets.enabled=true" },
5353
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
5454
@ActiveProfiles({ "test", "composite", "kubernetes" })
@@ -78,7 +78,7 @@ void contextLoads() {
7878
properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.namespace=default",
7979
"spring.cloud.config.server.composite[0].type=kubernetes",
8080
"spring.cloud.config.server.composite[1].type=native",
81-
"spring.cloud.kubernetes.secrets.enableApi=true",
81+
"spring.cloud.kubernetes.secrets.enabled=true",
8282
"spring.profiles.active=test, composite, kubernetes, native", "test.second.config.enabled=true",
8383
"spring.cloud.kubernetes.secrets.enabled=true" },
8484
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -119,7 +119,7 @@ void contextLoads() {
119119
properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.namespace=default",
120120
"spring.cloud.config.server.composite[0].type=kubernetes",
121121
"spring.cloud.config.server.composite[1].type=native",
122-
"spring.cloud.kubernetes.config.enableApi=false", "spring.cloud.kubernetes.secrets.enableApi=true",
122+
"spring.cloud.kubernetes.config.enabled=false", "spring.cloud.kubernetes.secrets.enabled=true",
123123
"spring.profiles.active=test ,composite, kubernetes, native", "test.second.config.enabled=true",
124124
"spring.cloud.kubernetes.secrets.enabled=true" },
125125
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -160,7 +160,7 @@ void contextLoads() {
160160
"spring.cloud.config.server.composite[0].type=kubernetes",
161161
"spring.cloud.config.server.composite[1].type=native",
162162
"spring.profiles.active=test, composite, kubernetes, native", "test.second.config.enabled=true",
163-
"spring.cloud.kubernetes.secrets.enabled=true" },
163+
"spring.cloud.kubernetes.secrets.enabled=false" },
164164
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
165165
class KubernetesSecretsDisabledCompositeConfigServerTest {
166166

@@ -198,7 +198,7 @@ void contextLoads() {
198198
@SpringBootTest(classes = { KubernetesConfigServerApplication.class },
199199
properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.namespace=default",
200200
"spring.cloud.config.server.native.order=1", "spring.cloud.kubernetes.configserver.order=2",
201-
"spring.cloud.kubernetes.secrets.enableApi=true", "test.second.config.enabled=true",
201+
"spring.cloud.kubernetes.secrets.enabled=true", "test.second.config.enabled=true",
202202
"spring.profiles.active=test, native, kubernetes", "spring.cloud.kubernetes.secrets.enabled=true" },
203203
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
204204
class NativeAndKubernetesConfigServerTest {

‎spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/src/test/java/org/springframework/cloud/kubernetes/configserver/it/ConfigDataConfigServerIntegrationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
2727
properties = { "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.client.namespace=default",
28-
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.secrets.enableApi=true",
28+
"spring.profiles.include=kubernetes", "spring.cloud.kubernetes.secrets.enabled=true",
2929
"test.first.config.enabled=true" },
3030
classes = { KubernetesConfigServerApplication.class, FirstConfig.class })
3131
class ConfigDataConfigServerIntegrationTests extends ConfigServerIntegration {

‎spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/config_maps_mixed/ConfigMapsMixed.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = TestApplication.class,
3333
properties = { "spring.application.name=" + ConfigMapsMixed.APPLICATION_NAME,
34-
"spring.cloud.kubernetes.config.enableApi=true", "spring.main.cloud-platform=KUBERNETES" })
34+
"spring.cloud.kubernetes.config.enabled=true", "spring.main.cloud-platform=KUBERNETES" })
3535
abstract class ConfigMapsMixed {
3636

3737
protected static final String APPLICATION_NAME = "configmap-mixed-example";

0 commit comments

Comments
 (0)