SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolving merge conflicts

Browse Source
This commit is contained in:
Ryan Baxter
2021-04-07 16:12:55 -04:00
parent 3352b87d27
commit 183f33182d
4 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedConfigMapChangeDetector.java
View File

@@ -125,6 +125,7 @@ public class KubernetesClientEventBasedConfigMapChangeDetector extends Configura
}
private void onEvent(V1ConfigMap configMap) {
this.log.debug(String.format("onEvent configMap: %s", configMap.toString()));
boolean changed = changed(locateMapPropertySources(this.propertySourceLocator, this.environment),
findPropertySources(KubernetesClientConfigMapPropertySource.class));
if (changed) {

1
spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/reload/KubernetesClientEventBasedSecretsChangeDetector.java
View File

@@ -119,6 +119,7 @@ public class KubernetesClientEventBasedSecretsChangeDetector extends Configurati
}
private void onEvent(V1Secret secret) {
this.log.debug(String.format("onEvent configMap: %s", secret.toString()));
boolean changed = changed(locateMapPropertySources(this.propertySourceLocator, this.environment),
findPropertySources(KubernetesClientSecretsPropertySource.class));
if (changed) {

1
spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedConfigMapChangeDetector.java
View File

@@ -119,6 +119,7 @@ public class EventBasedConfigMapChangeDetector extends ConfigurationChangeDetect
}
protected void onEvent(ConfigMap configMap) {
this.log.debug(String.format("onEvent configMap: %s", configMap.toString()));
boolean changed = changed(
locateMapPropertySources(this.fabric8ConfigMapPropertySourceLocator, this.environment),
findPropertySources(Fabric8ConfigMapPropertySource.class));

1
spring-cloud-kubernetes-fabric8-config/src/main/java/org/springframework/cloud/kubernetes/fabric8/config/reload/EventBasedSecretsChangeDetector.java
View File

@@ -119,6 +119,7 @@ public class EventBasedSecretsChangeDetector extends ConfigurationChangeDetector
}
protected void onEvent(Secret secret) {
this.log.debug(String.format("onEvent configMap: %s", secret.toString()));
boolean changed = changed(locateMapPropertySources(this.fabric8SecretsPropertySourceLocator, this.environment),
findPropertySources(Fabric8SecretsPropertySource.class));
if (changed) {