Add support for accessing ConfigMap and Secrets for the Server

Resolves #111

Author: trisberg

pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-dataflow-parent</artifactId>
-		<version>1.1.0.BUILD-SNAPSHOT</version>
+		<version>1.1.0.M2</version>
 		<relativePath />  <!-- lookup parent from repository -->
 	</parent>
 
@@ -19,8 +19,10 @@
 	</modules>
 
 	<properties>
-		<spring-cloud-dataflow.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+		<spring-cloud-dataflow.version>1.1.0.M2</spring-cloud-dataflow.version>
 		<spring-cloud-deployer-kubernetes.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-deployer-kubernetes.version>
+		<spring-cloud-kubernetes.version>0.1.1</spring-cloud-kubernetes.version>
+		<netflix-archaius.version>0.7.4</netflix-archaius.version>
 	</properties>
 
 	<dependencyManagement>
@@ -35,6 +37,21 @@
 				<artifactId>spring-cloud-dataflow-server-core</artifactId>
 				<version>${spring-cloud-dataflow.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>io.fabric8</groupId>
+				<artifactId>spring-cloud-starter-kubernetes</artifactId>
+				<version>${spring-cloud-kubernetes.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.fabric8</groupId>
+				<artifactId>spring-cloud-kubernetes-archaius</artifactId>
+				<version>${spring-cloud-kubernetes.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.archaius</groupId>
+				<artifactId>archaius-core</artifactId>
+				<version>${netflix-archaius.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

spring-cloud-dataflow-server-kubernetes-docs/src/main/asciidoc/getting-started.adoc

@@ -47,15 +47,18 @@ CREATE DATABASE test;
 ```
 . Update configuration files with values needed to connect to Kubernetes and MySQL.
 +
-The Data Flow Server uses the https://github.com/fabric8io/kubernetes-client[fabric8 Java client library] to connect to the Kubernetes cluster.  We are using environment variables to set the values needed when deploying the Data Flow server to Kubernetes. The settings are specified in the `src/etc/kubernetes/scdf-controller.yml` file. Modify `\<<mysql-username>>`,  `\<<mysql-password>>` and DB schema name to match what you used when creating the service.
+The Data Flow Server uses the https://github.com/fabric8io/kubernetes-client[Fabric8 Java client library] to connect to the Kubernetes cluster.  We are using environment variables to set the values needed when deploying the Data Flow server to Kubernetes. We are also using the https://github.com/fabric8io/spring-cloud-kubernetes[Fabric8 Spring Cloud integration with Kubernetes library] to access Kubernetes http://kubernetes.io/docs/user-guide/configmap/[ConfigMap] and http://kubernetes.io/docs/user-guide/secrets/[Secrets] settings.
+The ConfigMap settings are specified in the `src/etc/kubernetes/scdf-config.yml` file and the Secrets in the `src/etc/kubernetes/scdf-secrets.yml` file. Modify the password for MySQL in the latter if you changed it. It has to be provided encoded as base64.
 +
 This approach supports using one Data Flow Server instance per Kubernetes namespace.
 +
 . Deploy the Spring Cloud Data Flow Server for Kubernetes using the Docker image and the configuration settings you just modified.
 +
 ```
-$ kubectl create -f src/etc/kubernetes/scdf-controller.yml
+$ kubectl create -f src/etc/kubernetes/scdf-config.yml
+$ kubectl create -f src/etc/kubernetes/scdf-secrets.yml
 $ kubectl create -f src/etc/kubernetes/scdf-service.yml
+$ kubectl create -f src/etc/kubernetes/scdf-controller.yml
 ```
 +
 NOTE: We haven't tuned the memory use of the OOTB apps yet, so to be on the safe side we are increasing the memory for the pods by providing the following property: `spring.cloud.deployer.kubernetes.memory=640Mi`

spring-cloud-dataflow-server-kubernetes/pom.xml

@@ -28,6 +28,19 @@
 			<artifactId>postgresql</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+		<!-- Fabric8 spring-cloud-kubernetes dependencies -->
+		<dependency>
+			<groupId>io.fabric8</groupId>
+			<artifactId>spring-cloud-starter-kubernetes</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.fabric8</groupId>
+			<artifactId>spring-cloud-kubernetes-archaius</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.archaius</groupId>
+			<artifactId>archaius-core</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<resources>

src/etc/kubernetes/scdf-config.yml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: scdf-config
+data:
+  application.yaml: |-
+    spring:
+      datasource:
+        url: jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT}/test
+        driverClassName: org.mariadb.jdbc.Driver
+        testOnBorrow": true
+        validationQuery: "SELECT 1"

src/etc/kubernetes/scdf-controller.yml

@@ -23,4 +23,10 @@ spec:
             fieldRef:
               fieldPath: "metadata.namespace"
         - name: SPRING_APPLICATION_JSON
-          value: '{"spring.datasource.url":"jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT}/test","spring.datasource.driverClassName":"org.mariadb.jdbc.Driver","spring.datasource.username":"<<mysql-username>>","spring.datasource.password":"<<mysql-password>>","spring.datasource.testOnBorrow":true,"spring.datasource.validationQuery":"SELECT 1","spring.cloud.deployer.kubernetes.memory":"640Mi"}'
+          value: '{"spring.cloud.deployer.kubernetes.memory":"640Mi"}'
+        - name: SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API
+          value: 'true'
+        - name: SPRING_CLOUD_KUBERNETES_SECRETS_NAME
+          value: scdf-secrets
+        - name: SPRING_CLOUD_KUBERNETES_CONFIG_NAME
+          value: scdf-config

src/etc/kubernetes/scdf-secrets.yml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: scdf-secrets
+data:
+  spring.datasource.username: cm9vdA==
+  spring.datasource.password: eW91cnBhc3N3b3Jk