Skip to content

Commit e0d2999

Browse files
wind57wind57
committed
Merge branch 'main' into move_blocking_bean_to_separate_configuration
2 parents b40050c + ae10e54 commit e0d2999

File tree

18 files changed

+78
-84
lines changed

18 files changed

+78
-84
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
|spring.cloud.kubernetes.client.proxy-username | |
3737
|spring.cloud.kubernetes.client.request-timeout | |
3838
|spring.cloud.kubernetes.client.requestTimeout | `+++10s+++` | Request timeout
39-
|spring.cloud.kubernetes.client.rolling-timeout | |
4039
|spring.cloud.kubernetes.client.rollingTimeout | `+++900s+++` | Rolling timeout
4140
|spring.cloud.kubernetes.client.service-account-namespace-path | `+++/var/run/secrets/kubernetes.io/serviceaccount/namespace+++` |
4241
|spring.cloud.kubernetes.client.trust-certs | |

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ public class KubernetesClientEventBasedConfigMapChangeDetector extends Configura
6767

6868
private final Set<String> namespaces;
6969

70+
private final ConfigurableEnvironment environment;
71+
7072
private final boolean enableReloadFiltering;
7173

7274
private final ResourceEventHandler<V1ConfigMap> handler = new ResourceEventHandler<>() {
@@ -102,7 +104,8 @@ public KubernetesClientEventBasedConfigMapChangeDetector(CoreV1Api coreV1Api, Co
102104
ConfigReloadProperties properties, ConfigurationUpdateStrategy strategy,
103105
KubernetesClientConfigMapPropertySourceLocator propertySourceLocator,
104106
KubernetesNamespaceProvider kubernetesNamespaceProvider) {
105-
super(environment, properties, strategy);
107+
super(strategy);
108+
this.environment = environment;
106109
this.propertySourceLocator = propertySourceLocator;
107110
this.coreV1Api = coreV1Api;
108111
this.apiClient = createApiClientForInformerClient();

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ public class KubernetesClientEventBasedSecretsChangeDetector extends Configurati
6969

7070
private final Set<String> namespaces;
7171

72+
private final ConfigurableEnvironment environment;
73+
7274
private final boolean enableReloadFiltering;
7375

7476
private final ResourceEventHandler<V1Secret> handler = new ResourceEventHandler<>() {
@@ -105,7 +107,8 @@ public KubernetesClientEventBasedSecretsChangeDetector(CoreV1Api coreV1Api, Conf
105107
ConfigReloadProperties properties, ConfigurationUpdateStrategy strategy,
106108
KubernetesClientSecretsPropertySourceLocator propertySourceLocator,
107109
KubernetesNamespaceProvider kubernetesNamespaceProvider) {
108-
super(environment, properties, strategy);
110+
super(strategy);
111+
this.environment = environment;
109112
this.propertySourceLocator = propertySourceLocator;
110113
this.coreV1Api = coreV1Api;
111114
this.apiClient = createApiClientForInformerClient();

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,8 +499,7 @@ static class LocalTestConfig {
499499
@Bean
500500
KubernetesClientProperties kubernetesClientProperties() {
501501
return new KubernetesClientProperties(null, null, null, "default", null, null, null, null, null, null, null,
502-
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
503-
null);
502+
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
504503
}
505504

506505
@Bean

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ public record KubernetesClientProperties(Boolean trustCerts, String masterUrl, S
3333
String caCertFile, String caCertData, String clientCertFile, String clientCertData, String clientKeyFile,
3434
String clientKeyData, String clientKeyAlgo, String clientKeyPassphrase, String username, String password,
3535
Duration watchReconnectInterval, Duration watchReconnectLimit, Duration connectionTimeout,
36-
Duration requestTimeout, @Deprecated(forRemoval = true) Duration rollingTimeout, Duration loggingInterval,
37-
String httpProxy, String httpsProxy, String proxyUsername, String proxyPassword, String oauthToken,
38-
String[] noProxy, @DefaultValue(SERVICE_ACCOUNT_NAMESPACE_PATH) String serviceAccountNamespacePath,
36+
Duration requestTimeout, Duration loggingInterval, String httpProxy, String httpsProxy, String proxyUsername,
37+
String proxyPassword, String oauthToken, String[] noProxy,
38+
@DefaultValue(SERVICE_ACCOUNT_NAMESPACE_PATH) String serviceAccountNamespacePath,
3939
@DefaultValue(DEFAULT_USER_AGENT) String userAgent) {
4040

4141
/**
@@ -61,9 +61,9 @@ public KubernetesClientProperties withNamespace(String namespace) {
6161
this.caCertFile(), this.caCertData(), this.clientCertFile(), this.clientCertData(),
6262
this.clientKeyFile(), this.clientKeyData(), this.clientKeyAlgo(), this.clientKeyPassphrase(),
6363
this.username(), this.password(), this.watchReconnectInterval(), this.watchReconnectLimit(),
64-
this.connectionTimeout(), this.requestTimeout(), this.rollingTimeout(), this.loggingInterval(),
65-
this.httpProxy(), this.httpsProxy(), this.proxyUsername(), this.proxyPassword(), this.oauthToken(),
66-
this.noProxy(), this.serviceAccountNamespacePath(), this.userAgent());
64+
this.connectionTimeout(), this.requestTimeout(), this.loggingInterval(), this.httpProxy(),
65+
this.httpsProxy(), this.proxyUsername(), this.proxyPassword(), this.oauthToken(), this.noProxy(),
66+
this.serviceAccountNamespacePath(), this.userAgent());
6767
}
6868

6969
}

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import org.apache.commons.logging.LogFactory;
2222

23-
import org.springframework.core.env.ConfigurableEnvironment;
2423
import org.springframework.core.log.LogAccessor;
2524

2625
/**
@@ -33,16 +32,9 @@ public abstract class ConfigurationChangeDetector {
3332

3433
private static final LogAccessor LOG = new LogAccessor(LogFactory.getLog(ConfigurationChangeDetector.class));
3534

36-
protected ConfigurableEnvironment environment;
37-
38-
protected ConfigReloadProperties properties;
39-
4035
protected ConfigurationUpdateStrategy strategy;
4136

42-
public ConfigurationChangeDetector(ConfigurableEnvironment environment, ConfigReloadProperties properties,
43-
ConfigurationUpdateStrategy strategy) {
44-
this.environment = Objects.requireNonNull(environment);
45-
this.properties = Objects.requireNonNull(properties);
37+
public ConfigurationChangeDetector(ConfigurationUpdateStrategy strategy) {
4638
this.strategy = Objects.requireNonNull(strategy);
4739
}
4840

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
2626
import org.springframework.core.env.AbstractEnvironment;
27+
import org.springframework.core.env.ConfigurableEnvironment;
2728
import org.springframework.core.env.MapPropertySource;
2829
import org.springframework.scheduling.TaskScheduler;
2930
import org.springframework.scheduling.support.PeriodicTrigger;
@@ -46,14 +47,17 @@ public class PollingConfigMapChangeDetector extends ConfigurationChangeDetector
4647

4748
private final TaskScheduler taskExecutor;
4849

50+
private final ConfigurableEnvironment environment;
51+
4952
private final long period;
5053

5154
private final boolean monitorConfigMaps;
5255

5356
public PollingConfigMapChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties,
5457
ConfigurationUpdateStrategy strategy, Class<? extends MapPropertySource> propertySourceClass,
5558
PropertySourceLocator propertySourceLocator, TaskScheduler taskExecutor) {
56-
super(environment, properties, strategy);
59+
super(strategy);
60+
this.environment = environment;
5761
this.propertySourceLocator = propertySourceLocator;
5862
this.propertySourceClass = propertySourceClass;
5963
this.taskExecutor = taskExecutor;

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
2626
import org.springframework.core.env.AbstractEnvironment;
27+
import org.springframework.core.env.ConfigurableEnvironment;
2728
import org.springframework.core.env.MapPropertySource;
2829
import org.springframework.scheduling.TaskScheduler;
2930
import org.springframework.scheduling.support.PeriodicTrigger;
@@ -46,14 +47,17 @@ public class PollingSecretsChangeDetector extends ConfigurationChangeDetector {
4647

4748
private final TaskScheduler taskExecutor;
4849

50+
private final ConfigurableEnvironment environment;
51+
4952
private final long period;
5053

5154
private final boolean monitorSecrets;
5255

5356
public PollingSecretsChangeDetector(AbstractEnvironment environment, ConfigReloadProperties properties,
5457
ConfigurationUpdateStrategy strategy, Class<? extends MapPropertySource> propertySourceClass,
5558
PropertySourceLocator propertySourceLocator, TaskScheduler taskExecutor) {
56-
super(environment, properties, strategy);
59+
super(strategy);
60+
this.environment = environment;
5761
this.propertySourceLocator = propertySourceLocator;
5862
this.propertySourceClass = propertySourceClass;
5963
this.taskExecutor = taskExecutor;

‎spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/KubernetesClientPropertiesTests.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ void testDefaults() {
5454
assertThat(properties.watchReconnectLimit()).isNull();
5555
assertThat(properties.connectionTimeout()).isNull();
5656
assertThat(properties.requestTimeout()).isNull();
57-
assertThat(properties.rollingTimeout()).isNull();
5857
assertThat(properties.loggingInterval()).isNull();
5958
assertThat(properties.httpProxy()).isNull();
6059
assertThat(properties.httpsProxy()).isNull();
@@ -89,7 +88,6 @@ void testNonDefaults() {
8988
"spring.cloud.kubernetes.client.watch-reconnect-limit=300ms",
9089
"spring.cloud.kubernetes.client.connection-timeout=400ms",
9190
"spring.cloud.kubernetes.client.request-timeout=500ms",
92-
"spring.cloud.kubernetes.client.rolling-timeout=600ms",
9391
"spring.cloud.kubernetes.client.logging-interval=700ms",
9492
"spring.cloud.kubernetes.client.http-proxy=http-proxy",
9593
"spring.cloud.kubernetes.client.https-proxy=https-proxy",
@@ -120,7 +118,6 @@ void testNonDefaults() {
120118
assertThat(properties.watchReconnectLimit()).isEqualTo(Duration.ofMillis(300));
121119
assertThat(properties.connectionTimeout()).isEqualTo(Duration.ofMillis(400));
122120
assertThat(properties.requestTimeout()).isEqualTo(Duration.ofMillis(500));
123-
assertThat(properties.rollingTimeout()).isEqualTo(Duration.ofMillis(600));
124121
assertThat(properties.loggingInterval()).isEqualTo(Duration.ofMillis(700));
125122
assertThat(properties.httpProxy()).isEqualTo("http-proxy");
126123
assertThat(properties.httpsProxy()).isEqualTo("https-proxy");
@@ -156,7 +153,6 @@ void testCopyWithNamespaceConstructor() {
156153
"spring.cloud.kubernetes.client.watch-reconnect-limit=300ms",
157154
"spring.cloud.kubernetes.client.connection-timeout=400ms",
158155
"spring.cloud.kubernetes.client.request-timeout=500ms",
159-
"spring.cloud.kubernetes.client.rolling-timeout=600ms",
160156
"spring.cloud.kubernetes.client.logging-interval=700ms",
161157
"spring.cloud.kubernetes.client.http-proxy=http-proxy",
162158
"spring.cloud.kubernetes.client.https-proxy=https-proxy",
@@ -188,7 +184,6 @@ void testCopyWithNamespaceConstructor() {
188184
assertThat(properties.watchReconnectLimit()).isEqualTo(Duration.ofMillis(300));
189185
assertThat(properties.connectionTimeout()).isEqualTo(Duration.ofMillis(400));
190186
assertThat(properties.requestTimeout()).isEqualTo(Duration.ofMillis(500));
191-
assertThat(properties.rollingTimeout()).isEqualTo(Duration.ofMillis(600));
192187
assertThat(properties.loggingInterval()).isEqualTo(Duration.ofMillis(700));
193188
assertThat(properties.httpProxy()).isEqualTo("http-proxy");
194189
assertThat(properties.httpsProxy()).isEqualTo("https-proxy");

‎spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/KubernetesConfigDataLocationResolverTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ void testResolveProfileSpecificTwo() {
156156
DefaultBootstrapContext context = new DefaultBootstrapContext();
157157
KubernetesClientProperties properties = new KubernetesClientProperties(null, null, null, null, null, null, null,
158158
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
159-
null, null, null, "user-agent");
159+
null, null, "user-agent");
160160
context.register(KubernetesClientProperties.class, BootstrapRegistry.InstanceSupplier.of(properties));
161161

162162
Mockito.when(RESOLVER_CONTEXT.getBinder()).thenReturn(binder);

0 commit comments

Comments
 (0)