fix test

Author: wind57

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/reload/ConfigMapProperties.java

@@ -22,16 +22,16 @@
  * @author wind57
  */
 @ConfigurationProperties("from.properties")
-class ConfigMapProperties {
+public class ConfigMapProperties {
 
 	private String key;
 
-	String getKey() {
+	public String getKey() {
 		return key;
 	}
 
-	void setKey(String key1) {
-		this.key = key1;
+	public void setKey(String key) {
+		this.key = key;
 	}
 
 }

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-configtree.yaml

@@ -1,15 +1,15 @@
 spring:
   application:
-    name: poll-reload-mount
+    name: poll-reload
   config:
     import: "kubernetes:,configtree:/tmp/"
 
 management:
   endpoint:
     refresh:
-      enabled: true
+      access: unrestricted
     restart:
-      enabled: true
+      access: unrestricted
   endpoints:
     web:
       exposure:

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-with-bootstrap.yaml

@@ -44,10 +44,12 @@
 /**
  * @author wind57
  */
-class ConfigMapMountPollingReloadDelegateIT {
+class Fabric8ConfigMapConfigTreeIT {
 
 	private static final String IMAGE_NAME = "spring-cloud-kubernetes-fabric8-client-reload";
 
+	private static final String CONFIGURATION_WATCHER_IMAGE_NAME = "spring-cloud-kubernetes-configuration-watcher";
+
 	private static final String NAMESPACE = "default";
 
 	private static final K3sContainer K3S = Commons.container();
@@ -60,14 +62,19 @@ static void beforeAll() throws Exception {
 		Commons.validateImage(IMAGE_NAME, K3S);
 		Commons.loadSpringCloudKubernetesImage(IMAGE_NAME, K3S);
 
+		Commons.validateImage(CONFIGURATION_WATCHER_IMAGE_NAME, K3S);
+		Commons.loadSpringCloudKubernetesImage(CONFIGURATION_WATCHER_IMAGE_NAME, K3S);
+
 		util = new Util(K3S);
 		util.setUp(NAMESPACE);
 		manifests(Phase.CREATE, util, NAMESPACE);
+		util.configWatcher(Phase.CREATE);
 	}
 
 	@AfterAll
 	static void afterAll() {
 		manifests(Phase.DELETE, util, NAMESPACE);
+		util.configWatcher(Phase.DELETE);
 	}
 
 	/**
@@ -85,12 +92,6 @@ static void afterAll() {
 	 */
 	@Test
 	void test() {
-		// (1)
-		Commons.waitForLogStatement("paths property sources : [/tmp/application.properties]", K3S, IMAGE_NAME);
-		// (2)
-		Commons.waitForLogStatement("will add file-based property source : /tmp/application.properties", K3S,
-				IMAGE_NAME);
-		// (3)
 		WebClient webClient = builder().baseUrl("http://localhost/key").build();
 		String result = webClient.method(HttpMethod.GET)
 			.retrieve()
@@ -103,14 +104,16 @@ void test() {
 
 		// replace data in configmap and wait for k8s to pick it up
 		// our polling will detect that and restart the app
-		InputStream configMapMountStream = util.inputStream("configmap-configtree.yaml");
-		ConfigMap configMapMount = Serialization.unmarshal(configMapMountStream, ConfigMap.class);
-		configMapMount.setData(Map.of("from.properties", "as-mount-changed"));
+		InputStream configMapConfigTreeStream = util.inputStream("manifests/configmap-configtree.yaml");
+		ConfigMap configMapConfigTree = Serialization.unmarshal(configMapConfigTreeStream, ConfigMap.class);
+		configMapConfigTree.setData(Map.of("from.properties.key", "as-mount-changed"));
 		// add label so that configuration-watcher picks this up
 		Map<String, String> existingLabels = new HashMap<>(
-				Optional.ofNullable(configMapMount.getMetadata().getLabels()).orElse(Map.of()));
+				Optional.ofNullable(configMapConfigTree.getMetadata().getLabels()).orElse(Map.of()));
 		existingLabels.put("spring.cloud.kubernetes.config", "true");
-		configMapMount.getMetadata().setLabels(existingLabels);
+		configMapConfigTree.getMetadata().setLabels(existingLabels);
+
+		util.client().configMaps().resource(configMapConfigTree).createOrReplace();
 
 		await().timeout(Duration.ofSeconds(180))
 			.until(() -> webClient.method(HttpMethod.GET)

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/Fabric8ConfigMapConfigTreeIT.java

@@ -97,7 +97,7 @@ static void manifests(Phase phase, Util util, String namespace) {
 		InputStream deploymentStream = util.inputStream("manifests/deployment.yaml");
 		InputStream serviceStream = util.inputStream("manifests/service.yaml");
 		InputStream ingressStream = util.inputStream("manifests/ingress.yaml");
-		InputStream configMapAsStream = util.inputStream("manifests/configmap.yaml");
+		InputStream configMapAsStream = util.inputStream("manifests/configmap-configtree.yaml");
 
 		Deployment deployment = Serialization.unmarshal(deploymentStream, Deployment.class);
 

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

@@ -4,4 +4,4 @@ metadata:
   name: poll-reload-configtree
   namespace: default
 data:
-  from.properties: "as-mount-initial"
+  from.properties.key: "as-mount-initial"

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/resources/configmap-configtree.yaml renamed to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/resources/manifests/configmap-configtree.yaml

@@ -30,9 +30,7 @@ spec:
             - name: LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_FABRIC8_CONFIG_RELOAD
               value: "DEBUG"
             - name: SPRING_PROFILES_ACTIVE
-              value: "with-bootstrap"
-            - name: SPRING_CLOUD_BOOTSTRAP_ENABLED
-              value: "TRUE"
+              value: "configtree"
             - name: LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_CONFIG
               value: "DEBUG"
 
@@ -44,4 +42,4 @@ spec:
         - name: "config-map-volume"
           configMap:
             defaultMode: 420
-            name: "poll-reload"
+            name: "poll-reload-configtree"

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/resources/manifests/deployment.yaml

@@ -33,5 +33,5 @@ spec:
               value: DEBUG
             - name: LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_COMMONS_CONFIG_RELOAD
               value: DEBUG
-#            - name: SPRING_CLOUD_KUBERNETES_CONFIGURATION_WATCHER_REFRESHDELAY
-#              value: "10000"
+            - name: SPRING_CLOUD_KUBERNETES_CONFIGURATION_WATCHER_REFRESHDELAY
+              value: "30000"