Bumping versions

Author: spring-builds

README.adoc

@@ -124,6 +124,10 @@ 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.
 
+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.
+
 == Kubernetes native service discovery
 
 Kubernetes itself is capable of (server side) service discovery (see: https://kubernetes.io/docs/concepts/services-networking/service/#discovering-services).
@@ -138,7 +142,7 @@ Additionally, you can use Hystrix for:
 
 == Kubernetes PropertySource implementations
 
-The most common approach to configuring your Spring Boot application is to create an `application.properties` or `applicaiton.yaml` or
+The most common approach to configuring your Spring Boot application is to create an `application.properties` or `application.yaml` or
 an `application-profile.properties` or `application-profile.yaml` file that contains key-value pairs that provide customization values to your
 application or Spring Boot starters. You can override these properties by specifying system properties or environment
 variables.
@@ -320,26 +324,89 @@ 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.
 
-
-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
-`DeploymentConfig` or Kubernetes `ReplicationConfig` resource file, as follows:
+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
-kind: DeploymentConfig
+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 `SPRING_PROFILES_ACTIVE` environment variable.
+ To do so, you can launch your Spring Boot application with an environment variable that you can define it in the PodSpec at the container specification.
+ Deployment resource file, as follows:
+
+====
+[source,yaml]
+----
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: deployment-name
+  labels:
+    app: deployment-name
 spec:
   replicas: 1
-  ...
-    spec:
-      containers:
-      - env:
-        - name: JAVA_APP_DIR
-          value: /deployments
-        - name: JAVA_OPTIONS
-          value: -Dspring.profiles.active=developer
+  selector:
+    matchLabels:
+      app: deployment-name
+  template:
+    metadata:
+      labels:
+        app: deployment-name
+	spec:
+		containers:
+		- name: container-name
+		  image: your-image
+		  env:
+		  - name: SPRING_PROFILES_ACTIVE
+			value: "development"
 ----
 ====
 
@@ -483,6 +550,36 @@ If you have all the secrets mapped to a common root, you can set them like:
 ----
 ====
 
+As the case with `ConfigMap`, more advanced configuration is also possible where you can use multiple `Secret`
+instances. The `spring.cloud.kubernetes.secrets.sources` list makes this possible.
+For example, you could define the following `Secret` instances:
+
+====
+[source,yaml]
+----
+spring:
+  application:
+    name: cloud-k8s-app
+  cloud:
+    kubernetes:
+      secrets:
+        name: default-name
+        namespace: default-namespace
+        sources:
+         # Spring Cloud Kubernetes looks up a Secret named s1 in namespace default-namespace
+         - name: s1
+         # Spring Cloud Kubernetes looks up a Secret named default-name in whatever namespace n2
+         - namespace: n2
+         # Spring Cloud Kubernetes looks up a Secret named s3 in namespace n3
+         - namespace: n3
+           name: s3
+----
+====
+
+In the preceding example, if `spring.cloud.kubernetes.secrets.namespace` had not been set,
+the `Secret` named `s1` would be looked up in the namespace that the application runs.
+
+
 .Properties:
 [options="header,footer"]
 |===
@@ -584,7 +681,7 @@ The reload feature supports two operating modes:
 Any event produces a re-check on the configuration and, in case of changes, a reload.
 The `view` role on the service account is required in order to listen for config map changes. A higher level role (such as `edit`) is required for secrets
 (by default, secrets are not monitored).
-* Polling: Oeriodically re-creates the configuration from config maps and secrets to see if it has changed.
+* Polling: Periodically re-creates the configuration from config maps and secrets to see if it has changed.
 You can configure the polling period by using the `spring.cloud.kubernetes.reload.period` property and defaults to 15 seconds.
 It requires the same role as the monitored property source.
 This means, for example, that using polling on file-mounted secret sources does not require particular privileges.
@@ -596,7 +693,7 @@ This means, for example, that using polling on file-mounted secret sources does
 | `spring.cloud.kubernetes.reload.enabled`                 | `Boolean` | `false`                      | Enables monitoring of property sources and configuration reload
 | `spring.cloud.kubernetes.reload.monitoring-config-maps`  | `Boolean` | `true`                       | Allow monitoring changes in config maps
 | `spring.cloud.kubernetes.reload.monitoring-secrets`      | `Boolean` | `false`                      | Allow monitoring changes in secrets
-| `spring.cloud.kubernetes.reload.strategy `               | `Enum`    | `refresh`                    | The strategy to use when firing a reload (`refresh`, `restart_context`, or `shutdown`)
+| `spring.cloud.kubernetes.reload.strategy`               | `Enum`    | `refresh`                    | The strategy to use when firing a reload (`refresh`, `restart_context`, or `shutdown`)
 | `spring.cloud.kubernetes.reload.mode`                    | `Enum`    | `event`                      | Specifies how to listen for changes in property sources (`event` or `polling`)
 | `spring.cloud.kubernetes.reload.period`                  | `Duration`| `15s`                        | The period for verifying changes when using the `polling` strategy
 |===
@@ -652,7 +749,6 @@ the `PortName` key. If you want to specify in which Kubernetes namespace the tar
 the `KubernetesNamespace` key, remembering in both instances to prefix these keys with your service name and
 `ribbon` prefix, as specified earlier.
 
-
 .Spring Cloud Kubernetes Ribbon Configuration
 |===
 |Property Key |Type |Default Value
@@ -679,7 +775,6 @@ the `SERVICE` mode uses load balancing of the Kubernetes service to support Isti
 
 * `spring.cloud.kubernetes.ribbon.cluster-domain` Set the custom Kubernetes cluster domain suffix. The default value is: 'cluster.local'
 
-
 The following examples use this module for ribbon discovery:
 
 * link:./spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example[Spring Cloud Circuitbreaker and Ribbon]
@@ -1011,6 +1106,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/
 ----
@@ -1055,4 +1151,4 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
 - `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
 - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
 
-IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
+IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.

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

@@ -99,16 +99,18 @@ private static Map<String, String> getData(KubernetesClient client, String name,
 			}
 
 			if (environment != null) {
-				for (String activeProfile:environment.getActiveProfiles()) {
+				for (String activeProfile : environment.getActiveProfiles()) {
 
 					String mapNameWithProfile = name + "-" + activeProfile;
 
 					ConfigMap mapWithProfile = StringUtils.isEmpty(namespace)
-						? client.configMaps().withName(mapNameWithProfile).get()
-						: client.configMaps().inNamespace(namespace).withName(mapNameWithProfile).get();
+							? client.configMaps().withName(mapNameWithProfile).get()
+							: client.configMaps().inNamespace(namespace)
+									.withName(mapNameWithProfile).get();
 
 					if (mapWithProfile != null) {
-						result.putAll(processAllEntries(mapWithProfile.getData(), environment));
+						result.putAll(
+								processAllEntries(mapWithProfile.getData(), environment));
 					}
 
 				}
@@ -125,7 +127,6 @@ private static Map<String, String> getData(KubernetesClient client, String name,
 		return new HashMap<>();
 	}
 
-
 	private static Map<String, String> processAllEntries(Map<String, String> input,
 			Environment environment) {
 

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

@@ -95,16 +95,16 @@ public List<SecretsConfigProperties.NormalizedSource> determineSources() {
 			return new ArrayList<SecretsConfigProperties.NormalizedSource>() {
 				{
 					add(new SecretsConfigProperties.NormalizedSource(
-						SecretsConfigProperties.this.name,
-						SecretsConfigProperties.this.namespace,
-						SecretsConfigProperties.this.labels));
+							SecretsConfigProperties.this.name,
+							SecretsConfigProperties.this.namespace,
+							SecretsConfigProperties.this.labels));
 				}
 			};
 		}
 
 		return this.sources.stream()
-			.map(s -> s.normalize(this.name, this.namespace, this.labels))
-			.collect(Collectors.toList());
+				.map(s -> s.normalize(this.name, this.namespace, this.labels))
+				.collect(Collectors.toList());
 	}
 
 	public static class Source {
@@ -162,16 +162,16 @@ public boolean isEmpty() {
 		}
 
 		public SecretsConfigProperties.NormalizedSource normalize(String defaultName,
-			String defaultNamespace, Map<String, String> defaultLabels) {
+				String defaultNamespace, Map<String, String> defaultLabels) {
 			final String normalizedName = StringUtils.isEmpty(this.name) ? defaultName
-				: this.name;
+					: this.name;
 			final String normalizedNamespace = StringUtils.isEmpty(this.namespace)
-				? defaultNamespace : this.namespace;
+					? defaultNamespace : this.namespace;
 			final Map<String, String> normalizedLabels = this.labels.isEmpty()
-				? defaultLabels : this.labels;
+					? defaultLabels : this.labels;
 
 			return new SecretsConfigProperties.NormalizedSource(normalizedName,
-				normalizedNamespace, normalizedLabels);
+					normalizedNamespace, normalizedLabels);
 		}
 
 	}

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

@@ -42,21 +42,21 @@ public class SecretsPropertySource extends MapPropertySource {
 	private static final String PREFIX = "secrets";
 
 	public SecretsPropertySource(KubernetesClient client, Environment env, String name,
-		String namespace, Map<String, String> labels) {
+			String namespace, Map<String, String> labels) {
 		super(getSourceName(client, env, name, namespace),
-			getSourceData(client, env, name, namespace, labels));
+				getSourceData(client, env, name, namespace, labels));
 	}
 
 	private static String getSourceName(KubernetesClient client, Environment env,
-		String name, String namespace) {
+			String name, String namespace) {
 		return new StringBuilder().append(PREFIX)
-			.append(Constants.PROPERTY_SOURCE_NAME_SEPARATOR).append(name)
-			.append(Constants.PROPERTY_SOURCE_NAME_SEPARATOR).append(namespace)
-			.toString();
+				.append(Constants.PROPERTY_SOURCE_NAME_SEPARATOR).append(name)
+				.append(Constants.PROPERTY_SOURCE_NAME_SEPARATOR).append(namespace)
+				.toString();
 	}
 
 	private static Map<String, Object> getSourceData(KubernetesClient client,
-		Environment env, String name, String namespace, Map<String, String> labels) {
+			Environment env, String name, String namespace, Map<String, String> labels) {
 		Map<String, Object> result = new HashMap<>();
 
 		try {
@@ -74,18 +74,18 @@ private static Map<String, Object> getSourceData(KubernetesClient client,
 			if (!labels.isEmpty()) {
 				if (StringUtils.isEmpty(namespace)) {
 					client.secrets().withLabels(labels).list().getItems()
-						.forEach(s -> putAll(s, result));
+							.forEach(s -> putAll(s, result));
 				}
 				else {
 					client.secrets().inNamespace(namespace).withLabels(labels).list()
-						.getItems().forEach(s -> putAll(s, result));
+							.getItems().forEach(s -> putAll(s, result));
 				}
 			}
 		}
 		catch (Exception e) {
 			LOG.warn("Can't read secret with name: [" + name + "] or labels [" + labels
-				+ "] in namespace:[" + namespace + "] (cause: " + e.getMessage()
-				+ "). Ignoring");
+					+ "] in namespace:[" + namespace + "] (cause: " + e.getMessage()
+					+ "). Ignoring");
 		}
 
 		return result;
@@ -97,7 +97,7 @@ private static Map<String, Object> getSourceData(KubernetesClient client,
 	private static void putAll(Secret secret, Map<String, Object> result) {
 		if (secret != null && secret.getData() != null) {
 			secret.getData().forEach((k, v) -> result.put(k,
-				new String(Base64.getDecoder().decode(v)).trim()));
+					new String(Base64.getDecoder().decode(v)).trim()));
 		}
 	}