Updated to Spring Cloud Deployer for OpenShift 1.1.0 release

Added documentation. Closes #1, closes #7
Moved configuration into ConfigMaps. Closes #3
Added OpenShift templates for infrastructure components. Closes #2
Updated README. Closes #6

Author: donovanmuller

README.md

@@ -4,49 +4,22 @@ This project provides a Spring Cloud Data Flow server for deployments to OpenShi
 [Spring Cloud Deployer OpenShift](https://github.com/donovanmuller/spring-cloud-deployer-openshift) 
 implementation of the [Spring Cloud Deployer](https://github.com/spring-cloud/spring-cloud-deployer) SPI.
 
+Please refer to the reference documentation on how to get started.
+
 ## Building
 
-You must clone and build the `spring-cloud-deployer-openshift` and
- `spring-cloud-dataflow-server-openshift` projects:
+Clone the repo and type 
 
-```
-$ git clone https://github.com/donovanmuller/spring-cloud-deployer-openshift.git && \
-  cd spring-cloud-deployer-openshift && \
-  ./mvnw install
-  
-$ git clone https://github.com/donovanmuller/spring-cloud-dataflow-server-openshift.git && \
-  cd spring-cloud-dataflow-server-openshift && \
-  ./mvnw package
+```console
+$ ./mvnw clean install 
 ```
 
-## Running
+To build the docker image for the Data Flow Server
 
-The Data Flow OpenShift server requires a running OpenShift 3 instance.
-To start the Spring Cloud Data Flow OpenShift server, provide the following properties at a minimum:
-
-```
-$ cd spring-cloud-deployer-openshift/target
-$ java -Dopenshift.url=https://172.28.128.4:8443 \
-  -Dkubernetes.master=https://172.28.128.4:8443 \
-  -Dkubernetes.trust.certificates=true \
-  -Dkubernetes.auth.basic.username=admin \
-  -Dkubernetes.auth.basic.password=admin \
-  -jar spring-cloud-dataflow-server-openshift-1.1.0.BUILD-SNAPSHOT.jar \
-  --spring.cloud.deployer.kubernetes.namespace=scdf-apps \
-  --maven.resolvePom=true \
-  --maven.remote-repositories.spring.url=http://repo.spring.io/snapshots
+```console
+$ ./mvnw package docker:build -pl :spring-cloud-dataflow-server-openshift
 ```
 
-where `https://172.28.128.4:8443` is the URL of your OpenShift master instance.
-The `--spring.cloud.deployer.kubernetes.namespace` property is optional and indicates the project to deploy applications too.
-The `default` project is used in this properties absence.
-
-## Deploying
-
-You can follow either the [Local](http://docs.spring.io/spring-cloud-dataflow/docs/current-SNAPSHOT/reference/htmlsingle/#spring-cloud-dataflow-register-apps) 
-or [Kubernetes](http://docs.spring.io/spring-cloud-dataflow-server-kubernetes/docs/current-SNAPSHOT/reference/htmlsingle/#_deploying_streams_on_kubernetes) 
-documentation on registering and app, creating a stream/task definition and deploying the apps.
-
 ## Further Reading
 
 Please see the following posts for more information:

pom.xml

@@ -17,16 +17,17 @@
 	<packaging>pom</packaging>
 
 	<name>Spring Cloud Data Flow Server for OpenShift</name>
-	<description>A Spring Cloud Data Flow Deployer Server for OpenShift 3</description>
+	<description>Spring Cloud Data Flow Server for OpenShift 3</description>
 
 	<modules>
 		<module>spring-cloud-dataflow-server-openshift-autoconfig</module>
 		<module>spring-cloud-dataflow-server-openshift</module>
+		<module>spring-cloud-dataflow-server-openshift-docs</module>
 	</modules>
 
 	<properties>
-		<spring-cloud-deployer-openshift.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-deployer-openshift.version>
-		<spring-cloud-dataflow.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+		<spring-cloud-deployer-openshift.version>1.1.0.RELEASE</spring-cloud-deployer-openshift.version>
+		<spring-cloud-dataflow.version>1.1.0.RELEASE</spring-cloud-dataflow.version>
 		<spring-cloud-deployer-spi.version>1.1.0.RC1</spring-cloud-deployer-spi.version>
 		<spring-cloud-kubernetes.version>0.1.3</spring-cloud-kubernetes.version>
 		<netflix-archaius.version>0.7.4</netflix-archaius.version>
@@ -49,15 +50,32 @@
 				<artifactId>spring-cloud-deployer-spi</artifactId>
 				<version>${spring-cloud-deployer-spi.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.squareup.okhttp3</groupId>
+				<artifactId>okhttp</artifactId>
+				<version>3.4.1</version>
+			</dependency>
 			<dependency>
 				<groupId>io.fabric8</groupId>
 				<artifactId>spring-cloud-starter-kubernetes</artifactId>
 				<version>${spring-cloud-kubernetes.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>io.fabric8</groupId>
+						<artifactId>kubernetes-client</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>io.fabric8</groupId>
 				<artifactId>spring-cloud-kubernetes-archaius</artifactId>
 				<version>${spring-cloud-kubernetes.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>io.fabric8</groupId>
+						<artifactId>kubernetes-client</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.netflix.archaius</groupId>
@@ -146,4 +164,11 @@
 			</build>
 		</profile>
 	</profiles>
+
+	<distributionManagement>
+		<repository>
+			<id>bintray-switchbit-public</id>
+			<url>https://api.bintray.com/maven/donovanmuller/switchbit-public/spring-cloud-dataflow-server-openshift/;publish=1</url>
+		</repository>
+	</distributionManagement>
 </project>

spring-cloud-dataflow-server-openshift-autoconfig/pom.xml

@@ -12,6 +12,8 @@
 
     <artifactId>spring-cloud-dataflow-server-openshift-autoconfig</artifactId>
 
+    <name>Spring Auto Configuration of Data Flow Server for OpenShift</name>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

spring-cloud-dataflow-server-openshift-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/openshift/OpenShiftDataFlowServerAutoConfiguration.java

@@ -27,6 +27,7 @@
 import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.core.Ordered;
 import org.springframework.core.io.ResourceLoader;
 

spring-cloud-dataflow-server-openshift-autoconfig/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
-org.sspringframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
     org.springframework.cloud.dataflow.server.openshift.OpenShiftDataFlowServerAutoConfiguration