Refactor k8s client reload

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

@@ -22,11 +22,12 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiConsumer;
@@ -123,12 +124,16 @@ protected abstract SecretsPropertySource getPropertySource(ConfigurableEnvironme
 
 	protected void putPathConfig(CompositePropertySource composite) {
 
-		if (!properties.paths().isEmpty()) {
+		Set<String> uniquePaths = new LinkedHashSet<>(properties.paths());
+
+		if (!uniquePaths.isEmpty()) {
 			LOG.warn(
 					"path support is deprecated and will be removed in a future release. Please use spring.config.import");
 		}
 
-		this.properties.paths().stream().map(Paths::get).filter(Files::exists).flatMap(x -> {
+		LOG.debug("paths property sources : " + uniquePaths);
+
+		uniquePaths.stream().map(Paths::get).filter(Files::exists).flatMap(x -> {
 			try {
 				return Files.walk(x);
 			}
@@ -189,7 +194,7 @@ private SecretsPropertySource property(Path filePath) {
 			try {
 				String content = new String(Files.readAllBytes(filePath)).trim();
 				String sourceName = fileName.toLowerCase(Locale.ROOT);
-				SourceData sourceData = new SourceData(sourceName, Collections.singletonMap(fileName, content));
+				SourceData sourceData = new SourceData(sourceName, Map.of(fileName, content));
 				return new SecretsPropertySource(sourceData);
 			}
 			catch (IOException e) {

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

@@ -27,6 +27,7 @@
 import org.springframework.cloud.bootstrap.config.BootstrapPropertySource;
 import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
 import org.springframework.cloud.kubernetes.commons.config.MountConfigMapPropertySource;
+import org.springframework.cloud.kubernetes.commons.config.SecretsPropertySource;
 import org.springframework.core.env.CompositePropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
@@ -120,6 +121,10 @@ else if (propertySource instanceof MountConfigMapPropertySource mountConfigMapPr
 					// we know that the type is correct here
 					managedSources.add((S) mountConfigMapPropertySource);
 				}
+				else if (propertySource instanceof SecretsPropertySource secretsPropertySource) {
+					// we know that the type is correct here
+					managedSources.add((S) secretsPropertySource);
+				}
 			}
 		}
 
@@ -179,6 +184,8 @@ static boolean changed(List<? extends MapPropertySource> k8sSources, List<? exte
 		for (int i = 0; i < k8sSources.size(); i++) {
 			MapPropertySource k8sSource = k8sSources.get(i);
 			MapPropertySource appSource = appSources.get(i);
+			System.out.println("k8sSource (abc): " + k8sSource.getSource());
+			System.out.println("appSource (abc): " + appSource.getSource());
 			if (changed(k8sSource, appSource)) {
 				LOG.debug(() -> "found change in : " + k8sSource);
 				return true;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@
 /**
  * @author wind57
  */
-class Fabric8ConfigMapMountMountPollingBootstrapIT {
+class Fabric8ConfigMapMountPollingBootstrapIT {
 
 	private static final String IMAGE_NAME = "spring-cloud-kubernetes-fabric8-client-reload";
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/main/java/org/springframework/cloud/kubernetes/k8s/client/reload/App.java

@@ -25,7 +25,7 @@
  */
 @SpringBootApplication
 @EnableConfigurationProperties({ LeftProperties.class, RightProperties.class, RightWithLabelsProperties.class,
-		ConfigMapProperties.class, SecretsProperties.class })
+		ConfigMapProperties.class, SecretProperties.class })
 public class App {
 
 	public static void main(String[] args) {

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

@@ -21,7 +21,7 @@
 /**
  * @author wind57
  */
-@ConfigurationProperties("from.properties")
+@ConfigurationProperties("from.properties.configmap")
 public class ConfigMapProperties {
 
 	private String key;

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/main/java/org/springframework/cloud/kubernetes/k8s/client/reload/Controller.java

@@ -25,40 +25,23 @@
 @RestController
 public class Controller {
 
-	private final LeftProperties leftProperties;
-
-	private final RightProperties rightProperties;
-
-	private final RightWithLabelsProperties rightWithLabelsProperties;
-
 	private final ConfigMapProperties configMapProperties;
 
-	public Controller(LeftProperties leftProperties, RightProperties rightProperties,
-			RightWithLabelsProperties rightWithLabelsProperties, ConfigMapProperties configMapProperties) {
-		this.leftProperties = leftProperties;
-		this.rightProperties = rightProperties;
-		this.rightWithLabelsProperties = rightWithLabelsProperties;
-		this.configMapProperties = configMapProperties;
-	}
-
-	@GetMapping("/left")
-	public String left() {
-		return leftProperties.getValue();
-	}
-
-	@GetMapping("/right")
-	public String right() {
-		return rightProperties.getValue();
-	}
+	private final SecretProperties secretsProperties;
 
-	@GetMapping("/with-label")
-	public String witLabel() {
-		return rightWithLabelsProperties.getValue();
+	public Controller(ConfigMapProperties configMapProperties, SecretProperties secretsProperties) {
+		this.configMapProperties = configMapProperties;
+		this.secretsProperties = secretsProperties;
 	}
 
-	@GetMapping("/mount")
+	@GetMapping("/configmap")
 	public String key() {
 		return configMapProperties.getKey();
 	}
 
+	@GetMapping("/secret")
+	public String secret() {
+		return secretsProperties.getKey();
+	}
+
 }

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/main/java/org/springframework/cloud/kubernetes/k8s/client/reload/SecretsProperties.java → spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/main/java/org/springframework/cloud/kubernetes/k8s/client/reload/SecretProperties.java

@@ -21,8 +21,8 @@
 /**
  * @author wind57
  */
-@ConfigurationProperties("from.properties")
-public class SecretsProperties {
+@ConfigurationProperties("from.properties.secret")
+public class SecretProperties {
 
 	private String key;
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/main/resources/application-mount.yaml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: poll-reload-mount
+    name: poll-reload
   cloud:
     kubernetes:
       reload:
@@ -12,6 +12,7 @@ spring:
       config:
         paths:
           - /tmp/application.properties
+
   config:
     import: "kubernetes:"
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/main/resources/application-three.yaml

@@ -1,15 +1,11 @@
-logging:
-  level:
-    root: DEBUG
-
 spring:
   application:
     name: event-reload
   cloud:
     kubernetes:
       reload:
         enabled: true
-        strategy: shutdown
+        strategy: refresh
         mode: event
         namespaces:
           - right

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/main/resources/application-two.yaml

@@ -1,15 +1,11 @@
-logging:
-  level:
-    root: DEBUG
-
 spring:
   application:
     name: event-reload
   cloud:
     kubernetes:
       reload:
         enabled: true
-        strategy: shutdown
+        strategy: refresh
         mode: event
         namespaces:
           - right

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

@@ -5,8 +5,7 @@ spring:
     kubernetes:
       reload:
         enabled: true
-        monitoring-config-maps: true
-        strategy: shutdown
+        strategy: refresh
         mode: polling
         period: 5000
-
+        monitoring-secrets: true

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/main/resources/bootstrap-three.yaml

@@ -1,15 +1,14 @@
-logging:
-  level:
-    root: DEBUG
-
 spring:
   cloud:
     kubernetes:
       config:
         sources:
-          - namespace: left
-            name: left-configmap
           - namespace: right
             name: right-configmap
           - namespace: right
             name: right-configmap-with-label
+
+  # otherwise on context refresh we lose this property
+  # and test fails, since beans are not wired.
+  main:
+    cloud-platform: kubernetes

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/main/resources/bootstrap-two.yaml

@@ -1,13 +1,12 @@
-logging:
-  level:
-    root: DEBUG
-
 spring:
   cloud:
     kubernetes:
       config:
         sources:
-          - namespace: left
-            name: left-configmap
           - namespace: right
             name: right-configmap
+
+  # otherwise on context refresh we lose this property
+  # and test fails, since beans are not wired.
+  main:
+    cloud-platform: kubernetes

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

@@ -1,6 +1,12 @@
 spring:
   cloud:
     kubernetes:
-      config:
+      secrets:
         paths:
-          - /tmp/application.properties
+          # at the moment, we do not support reading properties/yaml/yml
+          # files when mounting via 'paths'
+          - /tmp/from.properties.secret.key
+        enabled: true
+
+      config:
+        enabled: false