From d22502e2bb06834f649e55bdb648b8939e8e1c55 Mon Sep 17 00:00:00 2001
From: Attoumane <akuma8@hotmail.com>
Date: Mon, 13 Jan 2020 20:35:29 +0100
Subject: [PATCH 1/2] Clarify disabling Kubernetes features

---
 docs/src/main/asciidoc/kubernetes-awareness.adoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/src/main/asciidoc/kubernetes-awareness.adoc b/docs/src/main/asciidoc/kubernetes-awareness.adoc
index a8569487..c023e3ef 100644
--- a/docs/src/main/asciidoc/kubernetes-awareness.adoc
+++ b/docs/src/main/asciidoc/kubernetes-awareness.adoc
@@ -8,7 +8,9 @@ as the code of the project relies on the
 https://github.com/fabric8io/kubernetes-client[Fabric8 Kubernetes Java client], which is a fluent DSL that can
 communicate by using `http` protocol to the REST API of the Kubernetes Server.
 
-To disable the integration with Kubernetes you can set `spring.cloud.kubernetes.enabled` to `false`.
+To disable the integration with Kubernetes you can set `spring.cloud.kubernetes.enabled` to `false`. Please be aware that when `spring-cloud-kubernetes-config` is on the classpath,
+`spring.cloud.kubernetes.enabled` should be set in `bootstrap.{properties|yml}` (or the profile specific one)  otherwise it should be in `application.{properties|yml}` (or the profile specific one).
+Also note that these properties: `spring.cloud.kubernetes.config.enabled` and `spring.cloud.kubernetes.secrets.enabled` only take effect when set in `bootstrap.{properties|yml}`
 
 === Kubernetes Profile Autoconfiguration
 

From d6582dc6477792c7031ee5453e3dc079202cd2aa Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@pivotal.io>
Date: Wed, 29 Jan 2020 10:05:08 -0500
Subject: [PATCH 2/2] Add spring-cloud-kubernetes-leader to dependency
 management.  Fixes #500

---
 spring-cloud-kubernetes-dependencies/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 9185c684..441d58af 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -85,6 +85,12 @@
 				<version>${project.version}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-kubernetes-leader</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+
 			<!-- Own dependencies - Starters -->
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>