Skip to content

Commit 17b4e3b

Browse files
wind57wind57
committed
fabric8 ready
Signed-off-by: wind57 <[email protected]>
1 parent 3ddaeb6 commit 17b4e3b

File tree

51 files changed

+183
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+183
-175
lines changed

‎docs/modules/ROOT/partials/_configprops.adoc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
|spring.cloud.kubernetes.client.watch-reconnect-limit | |
4747
|spring.cloud.kubernetes.client.watchReconnectInterval | `+++1s+++` | Reconnect Interval
4848
|spring.cloud.kubernetes.client.watchReconnectLimit | `+++-1+++` | Reconnect Interval limit retries
49-
|spring.cloud.kubernetes.config.enable-api | `+++true+++` |
5049
|spring.cloud.kubernetes.config.enabled | `+++true+++` | Enable the ConfigMap property source locator.
5150
|spring.cloud.kubernetes.config.fail-fast | `+++false+++` |
5251
|spring.cloud.kubernetes.config.include-profile-specific-sources | `+++true+++` |
@@ -100,7 +99,6 @@
10099
|spring.cloud.kubernetes.reload.namespaces | | namespaces where an informer will be set-up. this property is only relevant for event based reloading.
101100
|spring.cloud.kubernetes.reload.period | `+++15000ms+++` | Sets the polling period to use when the detection mode is POLLING.
102101
|spring.cloud.kubernetes.reload.strategy | `+++REFRESH+++` | Sets reload strategy for Kubernetes configuration reload on change.
103-
|spring.cloud.kubernetes.secrets.enable-api | `+++false+++` |
104102
|spring.cloud.kubernetes.secrets.enabled | `+++true+++` | Enable the Secrets property source locator.
105103
|spring.cloud.kubernetes.secrets.fail-fast | `+++false+++` |
106104
|spring.cloud.kubernetes.secrets.include-profile-specific-sources | `+++true+++` |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public void afterEach() {
125125
public void doesNotContainRetryableSecretsPropertySourceLocator() throws Exception {
126126
stubFor(get(API).willReturn(aResponse().withStatus(500).withBody("Internal Server Error")));
127127
setup("debug=true", "spring.main.cloud-platform=KUBERNETES", "spring.cloud.kubernetes.test.enable-retry=true",
128-
"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true");
128+
"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enabled=true");
129129
assertThat(context.containsBean("retryableSecretsPropertySourceLocator")).isFalse();
130130
}
131131

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
*/
5050
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
5151
properties = { "spring.cloud.kubernetes.client.namespace=default",
52-
"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true",
52+
"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enabled=true",
5353
"spring.main.cloud-platform=KUBERNETES", "spring.config.import=kubernetes:" },
5454
classes = SecretsRetryApplication.class)
5555
class SecretsFailFastDisabledTests {
@@ -74,7 +74,7 @@ static void setup() {
7474

7575
private static void stubConfigMapAndSecretsDefaults() {
7676
// return empty config map / secret list to not fail context creation
77-
stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(new V1SecretList()))));
77+
stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));
7878
}
7979

8080
@AfterAll

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsFailFastEnabledButRetryDisabled.java‎ renamed to ‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsFailFastEnabledButRetryDisabledTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
5555
properties = { "spring.cloud.kubernetes.secrets.fail-fast=true",
5656
"spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.secrets.name=my-secret",
57-
"spring.cloud.kubernetes.secrets.enable-api=true", "spring.main.cloud-platform=KUBERNETES",
57+
"spring.cloud.kubernetes.secrets.enabled=true", "spring.main.cloud-platform=KUBERNETES",
5858
"spring.config.import=kubernetes:" },
5959
classes = SecretsRetryApplication.class)
60-
class SecretsFailFastEnabledButRetryDisabled {
60+
class SecretsFailFastEnabledButRetryDisabledTests {
6161

6262
private static final String API = "/api/v1/namespaces/default/secrets";
6363

@@ -84,9 +84,9 @@ static void setup() {
8484

8585
private static void stubConfigMapAndSecretsDefaults() {
8686
// return empty config map / secret list to not fail context creation
87-
stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(new V1SecretList()))));
87+
stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));
8888
stubFor(get(CONFIG_MAPS_API)
89-
.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(new V1ConfigMapList()))));
89+
.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1ConfigMapList()))));
9090
}
9191

9292
@AfterAll

‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryDisabledButConfigRetryEnabled.java‎ renamed to ‎spring-cloud-kubernetes-client-config/src/test/java/org/springframework/cloud/kubernetes/client/config/secrets_retry/SecretsRetryDisabledButConfigRetryEnabledTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
5454
properties = { "spring.cloud.kubernetes.secrets.fail-fast=true",
5555
"spring.cloud.kubernetes.secrets.retry.enabled=false", "spring.cloud.kubernetes.config.fail-fast=true",
56-
"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true",
56+
"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enabled=true",
5757
"spring.main.cloud-platform=KUBERNETES", "spring.config.import=kubernetes:" },
5858
classes = SecretsRetryApplication.class)
59-
class SecretsRetryDisabledButConfigRetryEnabled {
59+
class SecretsRetryDisabledButConfigRetryEnabledTests {
6060

6161
private static final String API = "/api/v1/namespaces/default/secrets";
6262

@@ -83,9 +83,9 @@ static void setup() {
8383

8484
private static void stubConfigMapAndSecretsDefaults() {
8585
// return empty config map / secret list to not fail context creation
86-
stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(new V1SecretList()))));
86+
stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));
8787
stubFor(get(CONFIG_MAPS_API)
88-
.willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(new V1ConfigMapList()))));
88+
.willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1ConfigMapList()))));
8989
}
9090

9191
@AfterAll

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
6060
properties = { "spring.cloud.kubernetes.secrets.fail-fast=true",
6161
"spring.cloud.kubernetes.secrets.retry.max-attempts=5",
62-
"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enable-api=true",
62+
"spring.cloud.kubernetes.secrets.name=my-secret", "spring.cloud.kubernetes.secrets.enabled=true",
6363
"spring.main.cloud-platform=KUBERNETES", "spring.config.import=kubernetes:" },
6464
classes = SecretsRetryApplication.class)
6565
class SecretsRetryEnabledTests {
@@ -87,7 +87,7 @@ static void setup() {
8787

8888
private static void stubConfigMapAndSecretsDefaults() {
8989
// return empty config map / secret list to not fail context creation
90-
stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(new JSON().serialize(new V1SecretList()))));
90+
stubFor(get(API).willReturn(aResponse().withStatus(200).withBody(JSON.serialize(new V1SecretList()))));
9191
}
9292

9393
@AfterAll

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/ConditionalOnKubernetesSecretsEnabled.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
@Retention(RetentionPolicy.RUNTIME)
3737
@Documented
3838
@Inherited
39-
@ConditionalOnProperty(value = "spring.cloud.kubernetes.secrets.enabled", matchIfMissing = true)
39+
@ConditionalOnProperty(value = "spring.cloud.kubernetes.secrets.enabled", matchIfMissing = false)
4040
public @interface ConditionalOnKubernetesSecretsEnabled {
4141

4242
}

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapConfigProperties.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
* @author Isik Erhan
3636
*/
3737
@ConfigurationProperties(ConfigMapConfigProperties.PREFIX)
38-
public record ConfigMapConfigProperties(@DefaultValue("true") boolean enableApi, @DefaultValue List<Source> sources,
39-
@DefaultValue Map<String, String> labels, @DefaultValue("true") boolean enabled, String name, String namespace,
40-
boolean useNameAsPrefix, @DefaultValue("true") boolean includeProfileSpecificSources, boolean failFast,
38+
public record ConfigMapConfigProperties(@DefaultValue List<Source> sources, @DefaultValue Map<String, String> labels,
39+
@DefaultValue("true") boolean enabled, String name, String namespace, boolean useNameAsPrefix,
40+
@DefaultValue("true") boolean includeProfileSpecificSources, boolean failFast,
4141
@DefaultValue RetryProperties retry, @DefaultValue("BATCH") ReadType readType) {
4242

4343
/**

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigMapPropertySourceLocator.java‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,18 @@ public PropertySource<?> locate(Environment environment) {
5555
if (environment instanceof ConfigurableEnvironment env) {
5656

5757
CompositePropertySource composite = new CompositePropertySource("composite-configmap");
58-
if (this.properties.enableApi()) {
59-
Set<NormalizedSource> sources = new LinkedHashSet<>(this.properties.determineSources(environment));
60-
LOG.debug("Config Map normalized sources : " + sources);
61-
sources.forEach(configMapSource -> {
62-
MapPropertySource propertySource = getMapPropertySource(configMapSource, env,
63-
properties.readType());
64-
if ("true".equals(propertySource.getProperty(Constants.ERROR_PROPERTY))) {
65-
LOG.warn("Failed to load source: " + configMapSource);
66-
}
67-
else {
68-
LOG.debug("Adding config map property source " + propertySource.getName());
69-
composite.addFirstPropertySource(propertySource);
70-
}
71-
});
72-
}
58+
Set<NormalizedSource> sources = new LinkedHashSet<>(this.properties.determineSources(environment));
59+
LOG.debug("Config Map normalized sources : " + sources);
60+
sources.forEach(configMapSource -> {
61+
MapPropertySource propertySource = getMapPropertySource(configMapSource, env, properties.readType());
62+
if ("true".equals(propertySource.getProperty(Constants.ERROR_PROPERTY))) {
63+
LOG.warn("Failed to load source: " + configMapSource);
64+
}
65+
else {
66+
LOG.debug("Adding config map property source " + propertySource.getName());
67+
composite.addFirstPropertySource(propertySource);
68+
}
69+
});
7370

7471
return composite;
7572
}

‎spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/SecretsConfigProperties.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
* @author Isik Erhan
3737
*/
3838
@ConfigurationProperties(SecretsConfigProperties.PREFIX)
39-
public record SecretsConfigProperties(boolean enableApi, @DefaultValue Map<String, String> labels,
40-
@DefaultValue List<Source> sources, @DefaultValue("true") boolean enabled, String name, String namespace,
41-
boolean useNameAsPrefix, @DefaultValue("true") boolean includeProfileSpecificSources, boolean failFast,
39+
public record SecretsConfigProperties(@DefaultValue Map<String, String> labels, @DefaultValue List<Source> sources,
40+
@DefaultValue("false") boolean enabled, String name, String namespace, boolean useNameAsPrefix,
41+
@DefaultValue("true") boolean includeProfileSpecificSources, boolean failFast,
4242
@DefaultValue RetryProperties retry, @DefaultValue("BATCH") ReadType readType) {
4343

4444
/**

0 commit comments

Comments
 (0)