Fix profile specific configuration not loaded (#351)

Fixes: #347

Author: geoand

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

@@ -62,7 +62,8 @@ public ConfigMapPropertySource(KubernetesClient client, String name, String name
 		this(client, name, null, createEnvironmentWithActiveProfiles(profiles));
 	}
 
-	private static Environment createEnvironmentWithActiveProfiles(String[] activeProfiles) {
+	private static Environment createEnvironmentWithActiveProfiles(
+			String[] activeProfiles) {
 		StandardEnvironment environment = new StandardEnvironment();
 		environment.setActiveProfiles(activeProfiles);
 		return environment;

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

@@ -120,9 +120,9 @@ private void addPropertySourcesFromPaths(Environment environment,
 							content, filename, composite);
 				}
 				else if (filename.endsWith(".yml") || filename.endsWith(".yaml")) {
-					addPropertySourceIfNeeded(c -> PROPERTIES_TO_MAP
-							.apply(yamlParserGenerator(environment)
-									.apply(c)),
+					addPropertySourceIfNeeded(
+							c -> PROPERTIES_TO_MAP
+									.apply(yamlParserGenerator(environment).apply(c)),
 							content, filename, composite);
 				}
 			}

spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesApplicationContextInitializer.java

@@ -16,47 +16,35 @@
 
 package org.springframework.cloud.kubernetes.profile;
 
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
-import org.springframework.cloud.kubernetes.PodUtils;
-import org.springframework.context.ApplicationListener;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.context.config.ConfigFileApplicationListener;
+import org.springframework.boot.env.EnvironmentPostProcessor;
+import org.springframework.cloud.kubernetes.StandardPodUtils;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
 
-/**
- * Adds Kubernetes profiles.
- *
- * @author Ioannis Canellos
- */
-public class KubernetesProfileApplicationListener
-		implements ApplicationListener<ApplicationEnvironmentPreparedEvent>, Ordered {
+public class KubernetesProfileEnvironmentPostProcessor
+		implements EnvironmentPostProcessor, Ordered {
 
 	private static final Log LOG = LogFactory
-			.getLog(KubernetesProfileApplicationListener.class);
-
-	private static final String KUBERNETES_PROFILE = "kubernetes";
-
-	private static final int OFFSET = 1;
+			.getLog(KubernetesProfileEnvironmentPostProcessor.class);
 
-	private static final int ORDER = Ordered.HIGHEST_PRECEDENCE + OFFSET;
+	// Before ConfigFileApplicationListener so values there can use these ones
+	private static final int ORDER = ConfigFileApplicationListener.DEFAULT_ORDER - 1;
 
-	private final PodUtils utils;
-
-	public KubernetesProfileApplicationListener(PodUtils utils) {
-		this.utils = utils;
-	}
+	private static final String KUBERNETES_PROFILE = "kubernetes";
 
 	@Override
-	public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
-		ConfigurableEnvironment environment = event.getEnvironment();
-		addKubernetesProfile(environment);
-	}
-
-	void addKubernetesProfile(ConfigurableEnvironment environment) {
-		if (this.utils.isInsideKubernetes()) {
+	public void postProcessEnvironment(ConfigurableEnvironment environment,
+			SpringApplication application) {
+		final StandardPodUtils podUtils = new StandardPodUtils(
+				new DefaultKubernetesClient());
+		if (podUtils.isInsideKubernetes()) {
 			if (hasKubernetesProfile(environment)) {
 				if (LOG.isDebugEnabled()) {
 					LOG.debug("'kubernetes' already in list of active profiles");

spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesProfileApplicationListener.java renamed to spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/profile/KubernetesProfileEnvironmentPostProcessor.java

@@ -1,5 +1,6 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.cloud.kubernetes.KubernetesAutoConfiguration\
 
-org.springframework.context.ApplicationContextInitializer=\
-org.springframework.cloud.kubernetes.profile.KubernetesApplicationContextInitializer
+
+org.springframework.boot.env.EnvironmentPostProcessor=\
+org.springframework.cloud.kubernetes.profile.KubernetesProfileEnvironmentPostProcessor  

spring-cloud-kubernetes-core/src/main/resources/META-INF/spring.factories

@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.kubernetes.it;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,9 +30,12 @@ public static void main(String[] args) {
 		SpringApplication.run(SimpleCoreApplication.class, args);
 	}
 
+	@Value("${greeting.message}")
+	private String message;
+
 	@GetMapping("/greeting")
 	public Greeting home() {
-		return new Greeting("Hello Spring Boot");
+		return new Greeting(message);
 	}
 
 	public static class Greeting {

spring-cloud-kubernetes-core/src/test/java/org/springframework/cloud/kubernetes/profile/KubernetesProfileApplicationListenerTest.java

@@ -0,0 +1,2 @@
+greeting:
+  message: Hello from k8s

spring-cloud-kubernetes-integration-tests/simple-core/src/main/java/org/springframework/cloud/kubernetes/it/SimpleCoreApplication.java

@@ -1,6 +1,9 @@
 server:
   port: 8080
 
+greeting:
+  message: Hello sb
+
 # we enable some of the management endpoints to make it possible to restart the application
 management:
   endpoint:

spring-cloud-kubernetes-integration-tests/simple-core/src/main/resources/application-kubernetes.yml

@@ -36,7 +36,7 @@ public class GreetingAndHealthIT {
 	@Test
 	public void testGreetingEndpoint() {
 		given().baseUri(String.format("http://%s:%d", HOST, PORT)).get("greeting").then()
-				.statusCode(200).body("message", is("Hello Spring Boot"));
+				.statusCode(200).body("message", is("Hello from k8s"));
 	}
 
 	@Test