diff --git a/README.adoc b/README.adoc
index 163e9f75..f15641a2 100644
--- a/README.adoc
+++ b/README.adoc
@@ -112,6 +112,15 @@ private DiscoveryClient discoveryClient;
----
====
+You can choose to enable `DiscoveryClient` from all namespaces by setting the following property in `application.properties`:
+
+====
+[source]
+----
+spring.cloud.kubernetes.discovery.all-namespaces=true
+----
+====
+
If, for any reason, you need to disable the `DiscoveryClient`, you can set the following property in `application.properties`:
====
@@ -124,6 +133,8 @@ spring.cloud.kubernetes.discovery.enabled=false
Some Spring Cloud components use the `DiscoveryClient` in order to obtain information about the local service instance. For
this to work, you need to align the Kubernetes service name with the `spring.application.name` property.
+NOTE: `spring.application.name` has no effect as far as the name registered for the application within Kubernetes
+
Spring Cloud Kubernetes can also watch the Kubernetes service catalog for changes and update the
`DiscoveryClient` implementation accordingly. In order to enable this functionality you need to add
`@EnableScheduling` on a configuration class in your application.
@@ -324,6 +335,59 @@ However, if the `production` profile is active, the configuration becomes:
If both profiles are active, the property that appears last within the `ConfigMap` overwrites any preceding values.
+Another option is to create a different config map per profile and spring boot will automatically fetch it based
+on active profiles
+
+====
+[source,yaml]
+----
+kind: ConfigMap
+apiVersion: v1
+metadata:
+ name: demo
+data:
+ application.yml: |-
+ greeting:
+ message: Say Hello to the World
+ farewell:
+ message: Say Goodbye
+----
+====
+====
+[source,yaml]
+----
+kind: ConfigMap
+apiVersion: v1
+metadata:
+ name: demo-development
+data:
+ application.yml: |-
+ spring:
+ profiles: development
+ greeting:
+ message: Say Hello to the Developers
+ farewell:
+ message: Say Goodbye to the Developers
+----
+====
+====
+[source,yaml]
+----
+kind: ConfigMap
+apiVersion: v1
+metadata:
+ name: demo-production
+data:
+ application.yml: |-
+ spring:
+ profiles: production
+ greeting:
+ message: Say Hello to the Ops
+ farewell:
+ message: Say Goodbye
+----
+====
+
To tell Spring Boot which `profile` should be enabled at bootstrap, you can pass a system property to the Java
command. To do so, you can launch your Spring Boot application with an environment variable that you can define with the OpenShift
@@ -362,7 +426,7 @@ NOTE: You have to provide the full exact path to each property file, because dir
[options="header,footer"]
|===
| Name | Type | Default | Description
-| `spring.cloud.kubernetes.config.enabled` | `Boolean` | `true` | Enable Secrets `PropertySource`
+| `spring.cloud.kubernetes.config.enabled` | `Boolean` | `true` | Enable ConfigMaps `PropertySource`
| `spring.cloud.kubernetes.config.name` | `String` | `${spring.application.name}` | Sets the name of `ConfigMap` to look up
| `spring.cloud.kubernetes.config.namespace` | `String` | Client namespace | Sets the Kubernetes namespace where to lookup
| `spring.cloud.kubernetes.config.paths` | `List` | `null` | Sets the paths where `ConfigMap` instances are mounted
@@ -381,10 +445,13 @@ When enabled, the `SecretsPropertySource` looks up Kubernetes for `Secrets` from
. Named after the application (as defined by `spring.application.name`)
. Matching some labels
-Note that, by default, consuming Secrets through the API (points 2 and 3 above) *is not enabled* for security reasons.
+*Note:*
+
+By default, consuming Secrets through the API (points 2 and 3 above) *is not enabled* for security reasons. The permission 'list' on secrets allows clients to inspect secrets values in the specified namespace.
Further, we recommend that containers share secrets through mounted volumes.
-If you enable consuming Secrets through the API, we recommend that you limit access to Secrets by using an
-[authorization policy, such as RBAC](https://kubernetes.io/docs/concepts/configuration/secret/#best-practices).
+
+If you enable consuming Secrets through the API, we recommend that you limit access to Secrets by using an authorization policy, such as RBAC.
+For more information about risks and best practices when consuming Secrets through the API refer to https://kubernetes.io/docs/concepts/configuration/secret/#best-practices[this doc].
If the secrets are found, their data is made available to the application.
@@ -500,6 +567,7 @@ If you have all the secrets mapped to a common root, you can set them like:
|===
Notes:
+
* The `spring.cloud.kubernetes.secrets.labels` property behaves as defined by
https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-Configuration-Binding#map-based-binding[Map-based binding].
* The `spring.cloud.kubernetes.secrets.paths` property behaves as defined by
@@ -987,6 +1055,7 @@ $ touch .springformat
==== Intellij IDEA
In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
+The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project.
.spring-cloud-build-tools/
----
diff --git a/docs/pom.xml b/docs/pom.xml
index 08f9deed..cdb9c9e2 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -8,7 +8,7 @@
org.springframework.cloud
spring-cloud-kubernetes
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
pom
Spring Cloud Kubernetes Docs
diff --git a/pom.xml b/pom.xml
index faa6bb00..9c52191b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,13 +24,13 @@
org.springframework.cloud
spring-cloud-build
- 2.1.7.BUILD-SNAPSHOT
+ 2.1.7.RELEASE
org.springframework.cloud
spring-cloud-kubernetes
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
pom
Spring Cloud Kubernetes
@@ -63,9 +63,9 @@
- 2.1.3.BUILD-SNAPSHOT
- 2.1.3.BUILD-SNAPSHOT
- 2.1.4.BUILD-SNAPSHOT
+ 2.1.3.RELEASE
+ 2.1.3.RELEASE
+ 2.1.4.RELEASE
3.5
diff --git a/spring-cloud-kubernetes-config/pom.xml b/spring-cloud-kubernetes-config/pom.xml
index 7fe6b061..b4d9c9e1 100644
--- a/spring-cloud-kubernetes-config/pom.xml
+++ b/spring-cloud-kubernetes-config/pom.xml
@@ -5,7 +5,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
4.0.0
diff --git a/spring-cloud-kubernetes-core/pom.xml b/spring-cloud-kubernetes-core/pom.xml
index fe4ed733..cf882039 100644
--- a/spring-cloud-kubernetes-core/pom.xml
+++ b/spring-cloud-kubernetes-core/pom.xml
@@ -22,7 +22,7 @@
org.springframework.cloud
spring-cloud-kubernetes
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
4.0.0
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 8c79a2a2..26e09541 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -23,11 +23,11 @@
spring-cloud-dependencies-parent
org.springframework.cloud
- 2.1.7.BUILD-SNAPSHOT
+ 2.1.7.RELEASE
spring-cloud-kubernetes-dependencies
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
pom
Spring Cloud Kubernetes :: Dependencies
Spring Cloud Kubernetes Dependencies
diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml
index 87ed9db8..a45856df 100644
--- a/spring-cloud-kubernetes-discovery/pom.xml
+++ b/spring-cloud-kubernetes-discovery/pom.xml
@@ -22,7 +22,7 @@
org.springframework.cloud
spring-cloud-kubernetes
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
4.0.0
diff --git a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml
index 928d735a..a6fd0b77 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml
@@ -23,7 +23,7 @@
org.springframework.cloud
kubernetes-circuitbreaker-ribbon-example
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
greeting-service
diff --git a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml
index 09a1e445..71672128 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml
@@ -23,7 +23,7 @@
org.springframework.cloud
kubernetes-circuitbreaker-ribbon-example
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
name-service
diff --git a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml
index 71026b5b..85794851 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml
@@ -23,7 +23,7 @@
spring-cloud-kubernetes-examples
org.springframework.cloud
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
org.springframework.cloud
diff --git a/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml
index 765469c9..67fdda41 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml
@@ -5,7 +5,7 @@
spring-cloud-kubernetes-examples
org.springframework.cloud
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
4.0.0
diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
index 66e03e11..9c8f5ae6 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
@@ -6,7 +6,7 @@
org.springframework.cloud
spring-cloud-kubernetes-examples
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
kubernetes-leader-election-example
diff --git a/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
index 64b6d97a..6c4aea93 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
@@ -22,7 +22,7 @@
spring-cloud-kubernetes-examples
org.springframework.cloud
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
4.0.0
diff --git a/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml
index 46af3d78..b0782ca2 100644
--- a/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml
+++ b/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml
@@ -22,7 +22,7 @@
spring-cloud-kubernetes-examples
org.springframework.cloud
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
4.0.0
diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml
index 2519e0f5..fb5a8a64 100644
--- a/spring-cloud-kubernetes-examples/pom.xml
+++ b/spring-cloud-kubernetes-examples/pom.xml
@@ -23,7 +23,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
spring-cloud-kubernetes-examples
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml
index 0c9f1d0c..86509e5a 100644
--- a/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml
@@ -7,7 +7,7 @@
org.springframework.cloud
discovery-parent
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
discovery-client
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml
index 29906f03..16a1ea00 100644
--- a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml
@@ -7,7 +7,7 @@
org.springframework.cloud
discovery-parent
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
discovery-service-a
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml
index a19299b6..0496d4cc 100644
--- a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml
@@ -7,7 +7,7 @@
org.springframework.cloud
discovery-parent
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
discovery-service-b
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/pom.xml
index 61292998..b529569e 100644
--- a/spring-cloud-kubernetes-integration-tests/discovery/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/discovery/pom.xml
@@ -7,7 +7,7 @@
org.springframework.cloud
spring-cloud-kubernetes-integration-tests
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
Spring Cloud Kubernetes :: Integration Tests :: Discovery Parent
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml
index 7c8bfd5b..d8dfedab 100644
--- a/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml
@@ -7,7 +7,7 @@
org.springframework.cloud
discovery-parent
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
tests
diff --git a/spring-cloud-kubernetes-integration-tests/istio/pom.xml b/spring-cloud-kubernetes-integration-tests/istio/pom.xml
index c4be2e1a..f0ddd828 100644
--- a/spring-cloud-kubernetes-integration-tests/istio/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/istio/pom.xml
@@ -7,7 +7,7 @@
org.springframework.cloud
spring-cloud-kubernetes-integration-tests
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
Spring Cloud Kubernetes :: Integration Tests :: Istio
diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml
index 9d11430b..d21beef5 100644
--- a/spring-cloud-kubernetes-integration-tests/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/pom.xml
@@ -6,7 +6,7 @@
org.springframework.cloud
spring-cloud-kubernetes
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
spring-cloud-kubernetes-integration-tests
diff --git a/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml b/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml
index b87b16d3..0456e224 100644
--- a/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml
@@ -7,7 +7,7 @@
org.springframework.cloud
spring-cloud-kubernetes-integration-tests
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
Spring Cloud Kubernetes :: Integration Tests :: Simple Configmap
diff --git a/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml b/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml
index 9ed704ad..c38e0b04 100644
--- a/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml
+++ b/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml
@@ -7,7 +7,7 @@
org.springframework.cloud
spring-cloud-kubernetes-integration-tests
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
Spring Cloud Kubernetes :: Integration Tests :: Simple Core
diff --git a/spring-cloud-kubernetes-istio/pom.xml b/spring-cloud-kubernetes-istio/pom.xml
index b4957a3e..243618cd 100644
--- a/spring-cloud-kubernetes-istio/pom.xml
+++ b/spring-cloud-kubernetes-istio/pom.xml
@@ -5,7 +5,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
4.0.0
diff --git a/spring-cloud-kubernetes-leader/pom.xml b/spring-cloud-kubernetes-leader/pom.xml
index 9b325610..471899ab 100644
--- a/spring-cloud-kubernetes-leader/pom.xml
+++ b/spring-cloud-kubernetes-leader/pom.xml
@@ -22,7 +22,7 @@
org.springframework.cloud
spring-cloud-kubernetes
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
spring-cloud-kubernetes-leader
diff --git a/spring-cloud-kubernetes-ribbon/pom.xml b/spring-cloud-kubernetes-ribbon/pom.xml
index e557960c..2550dfc9 100644
--- a/spring-cloud-kubernetes-ribbon/pom.xml
+++ b/spring-cloud-kubernetes-ribbon/pom.xml
@@ -22,7 +22,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
4.0.0
diff --git a/spring-cloud-starter-kubernetes-all/pom.xml b/spring-cloud-starter-kubernetes-all/pom.xml
index 2c3da7e7..c012cf3c 100644
--- a/spring-cloud-starter-kubernetes-all/pom.xml
+++ b/spring-cloud-starter-kubernetes-all/pom.xml
@@ -22,7 +22,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
4.0.0
diff --git a/spring-cloud-starter-kubernetes-config/pom.xml b/spring-cloud-starter-kubernetes-config/pom.xml
index 2a3cd4c7..bd4c7301 100644
--- a/spring-cloud-starter-kubernetes-config/pom.xml
+++ b/spring-cloud-starter-kubernetes-config/pom.xml
@@ -22,7 +22,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
4.0.0
diff --git a/spring-cloud-starter-kubernetes-ribbon/pom.xml b/spring-cloud-starter-kubernetes-ribbon/pom.xml
index 2bd15b9b..db60844b 100644
--- a/spring-cloud-starter-kubernetes-ribbon/pom.xml
+++ b/spring-cloud-starter-kubernetes-ribbon/pom.xml
@@ -22,7 +22,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
4.0.0
diff --git a/spring-cloud-starter-kubernetes/pom.xml b/spring-cloud-starter-kubernetes/pom.xml
index 0ba005b7..7a0798b2 100644
--- a/spring-cloud-starter-kubernetes/pom.xml
+++ b/spring-cloud-starter-kubernetes/pom.xml
@@ -22,7 +22,7 @@
spring-cloud-kubernetes
org.springframework.cloud
- 1.0.3.BUILD-SNAPSHOT
+ 1.0.3.RELEASE
4.0.0