fix (#1847)

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8ConfigMapMountMountPollingBootstrapIT.java

@@ -44,7 +44,7 @@
 /**
  * @author wind57
  */
-class BootstrapEnabledPollingReloadConfigMapMountIT {
+class Fabric8ConfigMapMountMountPollingBootstrapIT {
 
 	private static final String IMAGE_NAME = "spring-cloud-kubernetes-fabric8-client-reload";
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/ConfigMapMountPollingReloadDelegateIT.java renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8ConfigMapMountPollingReloadIT.java

@@ -44,7 +44,7 @@
 /**
  * @author wind57
  */
-class ConfigMapMountPollingReloadDelegateIT {
+class Fabric8ConfigMapMountPollingReloadIT {
 
 	private static final String IMAGE_NAME = "spring-cloud-kubernetes-fabric8-client-reload";
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadInformIT.java renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadConfigMapBootstrapIT.java

@@ -48,7 +48,7 @@
 		"logging.level.org.springframework.cloud.kubernetes.fabric8.config.reload=debug",
 		"spring.cloud.bootstrap.enabled=true" })
 @ActiveProfiles("two")
-class Fabric8EventReloadInformIT extends Fabric8EventReloadBase {
+class Fabric8EventReloadConfigMapBootstrapIT extends Fabric8EventReloadBase {
 
 	private static final String LEFT_NAMESPACE = "left";
 
@@ -109,7 +109,27 @@ void test(CapturedOutput output) {
 		assertThat(leftProperties.getValue()).isEqualTo("left-initial");
 		assertThat(rightProperties.getValue()).isEqualTo("right-initial");
 
-		// then deploy a new version of right-configmap
+		// then deploy a new version of right-configmap, but without changing its data,
+		// only add a label, thus no refresh happens
+		ConfigMap configMap = new ConfigMapBuilder()
+			.withMetadata(new ObjectMetaBuilder().withLabels(Map.of("new-label", "abc"))
+				.withNamespace(RIGHT_NAMESPACE)
+				.withName("right-configmap")
+				.build())
+			.withData(Map.of("right.value", "right-initial"))
+			.build();
+
+		replaceConfigMap(kubernetesClient, configMap, RIGHT_NAMESPACE);
+
+		await().atMost(Duration.ofSeconds(60))
+			.pollDelay(Duration.ofSeconds(1))
+			.until(() -> output.getOut().contains("ConfigMap right-configmap was updated in namespace right"));
+
+		await().atMost(Duration.ofSeconds(60))
+			.pollDelay(Duration.ofSeconds(1))
+			.until(() -> output.getOut().contains("data in configmap has not changed, will not reload"));
+
+		// then deploy a new version of right-configmap, that actually changes some data
 		ConfigMap rightConfigMapAfterChange = new ConfigMapBuilder()
 			.withMetadata(new ObjectMetaBuilder().withNamespace(RIGHT_NAMESPACE).withName("right-configmap").build())
 			.withData(Map.of("right.value", "right-after-change"))

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadDataChangesInConfigMapIT.java

@@ -52,7 +52,7 @@
 		"logging.level.org.springframework.cloud.kubernetes.fabric8.config.reload=debug",
 		"spring.cloud.kubernetes.client.namespace=default" })
 @ActiveProfiles("with-secret")
-class Fabric8EventReloadSecretIT extends Fabric8EventReloadBase {
+class Fabric8EventReloadSecretConfigDataIT extends Fabric8EventReloadBase {
 
 	private static final String NAMESPACE = "default";