Preparing for 0.6.0 development

LICENSE-binary

@@ -271,7 +271,7 @@ org.apache.hadoop:hadoop-hdfs-client:2.9.2
 org.apache.htrace:htrace-core4:4.1.0-incubating
 org.apache.httpcomponents:httpclient:4.5.2
 org.apache.httpcomponents:httpcore:4.4.4
-org.apache.submarine:submarine-core:0.5.0
+org.apache.submarine:submarine-core:0.6.0-SNAPSHOT
 org.apache.zookeeper:zookeeper:3.4.6
 org.codehaus.jackson:jackson-core-asl:1.9.13
 org.codehaus.jackson:jackson-mapper-asl:1.9.13

dev-support/docker-images/database/build.sh

@@ -24,7 +24,7 @@ fi
 export CURRENT_PATH=$(cd "${PWD}">/dev/null; pwd)
 SUBMARINE_HOME=${CURRENT_PATH}/../../..
 
-SUBMARINE_VERSION="0.5.0"
+SUBMARINE_VERSION="0.6.0-SNAPSHOT"
 SUBMARINE_IMAGE_NAME="apache/submarine:database-${SUBMARINE_VERSION}"
 
 cp -rf "${SUBMARINE_HOME}/docs/database" "${CURRENT_PATH}"

dev-support/docker-images/jupyter/build.sh

@@ -16,7 +16,7 @@
 
 set -euxo pipefail
 
-JUPYTER_IMAGE="apache/submarine:jupyter-notebook-0.5.0"
+JUPYTER_IMAGE="apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT"
 
 if [ -L ${BASH_SOURCE-$0} ]; then
   PWD=$(dirname $(readlink "${BASH_SOURCE-$0}"))

dev-support/docker-images/operator/build.sh

@@ -16,7 +16,7 @@
 
 set -euxo pipefail
 
-SUBMARINE_VERSION=0.5.0
+SUBMARINE_VERSION=0.6.0-SNAPSHOT
 SUBMARINE_IMAGE_NAME="apache/submarine:operator-${SUBMARINE_VERSION}"
 
 if [ -L ${BASH_SOURCE-$0} ]; then

dev-support/docker-images/submarine/build.sh

@@ -16,7 +16,7 @@
 
 set -euxo pipefail
 
-SUBMARINE_VERSION=0.5.0
+SUBMARINE_VERSION=0.6.0-SNAPSHOT
 SUBMARINE_IMAGE_NAME="apache/submarine:server-${SUBMARINE_VERSION}"
 
 if [ -L ${BASH_SOURCE-$0} ]; then

dev-support/mini-submarine/README.md

@@ -57,24 +57,24 @@ In this scenario, we can do this:
 Put submarine candidate artifacts to a folder like "~/releases/submarine-release"
 ```
 $ ls $release_candidates_path
-submarine-dist-0.5.0-hadoop-2.9.tar.gz        submarine-dist-0.5.0-src.tar.gz.asc
-submarine-dist-0.5.0-hadoop-2.9.tar.gz.asc    submarine-dist-0.5.0-src.tar.gz.sha512
-submarine-dist-0.5.0-hadoop-2.9.tar.gz.sha512 submarine-dist-0.5.0-src.tar.gz
+submarine-dist-0.6.0-hadoop-2.9.tar.gz        submarine-dist-0.6.0-src.tar.gz.asc
+submarine-dist-0.6.0-hadoop-2.9.tar.gz.asc    submarine-dist-0.6.0-src.tar.gz.sha512
+submarine-dist-0.6.0-hadoop-2.9.tar.gz.sha512 submarine-dist-0.6.0-src.tar.gz
 ```
 ```
-export submarine_version=0.5.0
+export submarine_version=0.6.0
 export release_candidates_path=~/releases/submarine-release
 ./build_mini-submarine.sh
-#docker run -it -h submarine-dev --net=bridge --privileged -P local/mini-submarine:0.5.0 /bin/bash
-docker tag local/mini-submarine:0.5.0 apache/mini-submarine:0.5.0:RC0
-docker push apache/mini-submarine:0.5.0:RC0
+#docker run -it -h submarine-dev --net=bridge --privileged -P local/mini-submarine:0.6.0 /bin/bash
+docker tag local/mini-submarine:0.6.0 apache/mini-submarine:0.6.0:RC0
+docker push apache/mini-submarine:0.6.0:RC0
 ```
-In the container, we can verify that the submarine jar version is the expected 0.5.0. Then we can upload this image with a "RC" tag for a vote.
+In the container, we can verify that the submarine jar version is the expected 0.6.0. Then we can upload this image with a "RC" tag for a vote.
 
 ### Run mini-submarine image
 
 ```
-docker run -it -h submarine-dev --name mini-submarine --net=bridge --privileged -P local/mini-submarine:0.5.0 /bin/bash
+docker run -it -h submarine-dev --name mini-submarine --net=bridge --privileged -P local/mini-submarine:0.6.0 /bin/bash
 
 # In the container, use root user to bootstrap hdfs and yarn
 /tmp/hadoop-config/bootstrap.sh
@@ -83,7 +83,7 @@ docker run -it -h submarine-dev --name mini-submarine --net=bridge --privileged
 yarn node -list -showDetails
 ```
 
-If you pull the image directly, please replace "local/mini-submarine:0.5.0" with "apache/submarine:mini-0.5.0".
+If you pull the image directly, please replace "local/mini-submarine:0.6.0" with "apache/submarine:mini-0.6.0".
 
 ### You should see info like this:
 

dev-support/mini-submarine/build_mini-submarine.sh

@@ -17,7 +17,7 @@ set -euo pipefail
 hadoop_v=2.9.2
 spark_v=2.3.4
 
-submarine_v=${submarine_version:-"0.5.0"}
+submarine_v=${submarine_version:-"0.6.0-SNAPSHOT"}
 echo "Using submarine version: $submarine_v"
 
 image_name="local/mini-submarine:${submarine_v}"

dev-support/mini-submarine/submarine/run_customized_submarine-all_mnist.sh

@@ -49,7 +49,7 @@ else
   WORKER_CMD="myvenv.zip/venv/bin/python mnist_distributed.py --steps 2 --data_dir /tmp/data --working_dir /tmp/mode"
 fi
 
-SUBMARINE_VERSION=${SUBMARINE_VER:-"0.5.0"}
+SUBMARINE_VERSION=${SUBMARINE_VER:-"0.6.0-SNAPSHOT"}
 
 HADOOP_VERSION=2.9
 

dev-support/mini-submarine/submarine/run_submarine_mnist_tf2_tony.sh

@@ -39,7 +39,7 @@ else
   JAVA_CMD="java"
 fi
 
-SUBMARINE_VERSION=0.5.0
+SUBMARINE_VERSION=0.6.0-SNAPSHOT
 HADOOP_VERSION=2.9
 SUBMARINE_PATH=/opt/submarine-current
 HADOOP_CONF_PATH=/usr/local/hadoop/etc/hadoop

dev-support/mini-submarine/submarine/run_submarine_mnist_tony.sh

@@ -17,7 +17,7 @@
 
 # Below are configurable variables, please adapt base on your local environment.
 # Version of submarine jar
-SUBMARINE_VERSION=${SUBMARINE_VER:-"0.5.0"}
+SUBMARINE_VERSION=${SUBMARINE_VER:-"0.6.0-SNAPSHOT"}
 
 # Version of affiliated Hadoop version for this Submarine jar.
 SUBMARINE_HADOOP_VERSION=2.9

dev-support/mini-submarine/submarine/run_submarine_mnist_tony_rpc.sh

@@ -47,7 +47,7 @@ else
   WORKER_CMD="myvenv.zip/venv/bin/python mnist_distributed.py --steps 2 --data_dir /tmp/data --working_dir /tmp/mode"
 fi
 
-SUBMARINE_VERSION=${SUBMARINE_VER:-"0.5.0"}
+SUBMARINE_VERSION=${SUBMARINE_VER:-"0.6.0-SNAPSHOT"}
 
 HADOOP_VERSION=2.9
 

dev-support/mini-submarine/submarine/run_submarine_mxnet_cifar10_tony.sh

@@ -39,7 +39,7 @@ else
   JAVA_CMD="java"
 fi
 
-SUBMARINE_VERSION=0.5.0
+SUBMARINE_VERSION=0.6.0-SNAPSHOT
 HADOOP_VERSION=2.9
 SUBMARINE_PATH=/opt/submarine-current
 HADOOP_CONF_PATH=/usr/local/hadoop/etc/hadoop

dev-support/mini-submarine/submarine/run_submarine_pytorch_mnist_tony.sh

@@ -39,7 +39,7 @@ else
   JAVA_CMD="java"
 fi
 
-SUBMARINE_VERSION=0.5.0
+SUBMARINE_VERSION=0.6.0-SNAPSHOT
 HADOOP_VERSION=2.9
 SUBMARINE_PATH=/opt/submarine-current
 HADOOP_CONF_PATH=/usr/local/hadoop/etc/hadoop

dev-support/pysubmarine/openapi.json

@@ -11,7 +11,7 @@
       "name" : "Apache 2.0",
       "url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "version" : "0.5.0"
+    "version" : "0.6.0-SNAPSHOT"
   },
   "servers" : [ {
     "url" : "/api"

dev-support/pysubmarine/swagger_config.json

@@ -1,5 +1,5 @@
 {
   "packageName" : "submarine.experiment",
   "projectName" : "submarine.experiment",
-  "packageVersion": "0.5.0"
+  "packageVersion": "0.6.0-SNAPSHOT"
 }

docs/development/QuickDevTips.md

@@ -10,7 +10,7 @@ You can run each module individually and only need to re-package the submarine-s
 1. Run db docker
 
 ```
-docker run -it -p 3306:3306 -d --name submarine-database -e MYSQL_ROOT_PASSWORD=password apache/submarine:database-0.5.0-SNAPSHOT
+docker run -it -p 3306:3306 -d --name submarine-database -e MYSQL_ROOT_PASSWORD=password apache/submarine:database-0.6.0-SNAPSHOT
 ```
 
 2. Run k8s
@@ -20,7 +20,7 @@ minikube start # or other alternatives, such as kind
 kubectl apply -f ./dev-support/k8s/tfjob/crd.yaml
 kubectl kustomize ./dev-support/k8s/tfjob/operator | kubectl apply -f -
 kubectl apply -f ./dev-support/k8s/pytorchjob/
-export KUBECONFIG=/home/<user_name>/.kube/config # (in ~/.bashrc) 
+export KUBECONFIG=/home/<user_name>/.kube/config # (in ~/.bashrc)
 ```
 3. Package server
 
@@ -30,7 +30,7 @@ mvn clean package -DskipTests
 
 4. Start server
 
-cd submarine-dist/target/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/submarine-dist-0.5.0-SNAPSHOT-hadoop-2.9/
+cd submarine-dist/target/submarine-dist-0.6.0-SNAPSHOT-hadoop-2.9/submarine-dist-0.6.0-SNAPSHOT-hadoop-2.9/
 ./bin/submarine-daemon.sh start getMysqlJar
 ```
-```
+```

helm-charts/submarine/Chart.yaml

@@ -19,7 +19,7 @@ apiVersion: v2
 appVersion: "0.5.0"
 description: Submarine is Cloud Native Machine Learning Platform.
 name: submarine
-version: 0.5.0
+version: 0.6.0-SNAPSHOT
 icon: https://submarine.apache.org/assets/themes/submarine/img/submarine_white_logo.png
 dependencies:
 - name: tfjob

helm-charts/submarine/values.yaml

@@ -20,13 +20,13 @@ submarine:
     imagePullPolicy: IfNotPresent
     replicas: 1
     name: submarine-server
-    image: apache/submarine:server-0.5.0
+    image: apache/submarine:server-0.6.0-SNAPSHOT
     servicePort: 8080
   database:
     imagePullPolicy: IfNotPresent
     replicas: 1
     name: submarine-database
-    image: apache/submarine:database-0.5.0
+    image: apache/submarine:database-0.6.0-SNAPSHOT
     servicePort: 3306
     mysqlRootPassword: password
   traefik:

pom.xml

@@ -26,7 +26,7 @@
 
   <groupId>org.apache.submarine</groupId>
   <artifactId>submarine</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Submarine</name>
   <description>Submarine project</description>

submarine-all/pom.xml

@@ -25,11 +25,11 @@
   <parent>
     <groupId>org.apache.submarine</groupId>
     <artifactId>submarine</artifactId>
-    <version>0.5.0</version>
+    <version>0.6.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>submarine-all</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0-SNAPSHOT</version>
   <name>Submarine: All</name>
 
   <dependencyManagement>

submarine-client/pom.xml

@@ -24,12 +24,12 @@
   <parent>
     <artifactId>submarine</artifactId>
     <groupId>org.apache.submarine</groupId>
-    <version>0.5.0</version>
+    <version>0.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>submarine-client</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0-SNAPSHOT</version>
   <name>Submarine: Client</name>
 
   <dependencies>

submarine-cloud/Makefile

@@ -20,7 +20,7 @@ GOCLEAN=$(GOCMD) clean
 GOTEST=$(GOCMD) test
 GOGET=$(GOCMD) get
 BINARY_NAME=submarine-operator
-VERSION="0.5.0"
+VERSION="0.6.0-SNAPSHOT"
 BuildGitBranch=$(git rev-parse --abbrev-ref HEAD)
 BuildGitRev=$(git rev-list --count HEAD)
 BuildGitCommit=$(git rev-parse HEAD)

submarine-cloud/hack/deploy-submarine.sh

@@ -20,7 +20,7 @@ set -euo pipefail
 ROOT=$(unset CDPATH && cd $(dirname "${BASH_SOURCE[0]}")/.. && pwd)
 cd $ROOT
 SUBMARINE_HOME=${ROOT}/..
-SUBMARINE_VERSION="0.5.0"
+SUBMARINE_VERSION="0.6.0-SNAPSHOT"
 
 source $ROOT/hack/lib.sh
 

submarine-cloud/manifests/submarine-cluster/submarine-database.yaml

@@ -30,7 +30,7 @@ spec:
     spec:
       containers:
         - name: submarine-database
-          image: apache/submarine:database-0.5.0
+          image: apache/submarine:database-0.6.0-SNAPSHOT
           ports:
             - containerPort: 3306
           env:

submarine-cloud/manifests/submarine-cluster/submarine-server.yaml

@@ -31,7 +31,7 @@ spec:
       serviceAccountName: "submarine-node"
       containers:
         - name: submarine-node
-          image: "apache/submarine:server-0.5.0"
+          image: "apache/submarine:server-0.6.0-SNAPSHOT"
           args: []
           imagePullPolicy: IfNotPresent
           ports:

submarine-cloud/manifests/submarine-operator/deployment.yaml

@@ -31,7 +31,7 @@ spec:
       serviceAccountName: "submarine-operator"
       containers:
         - name: op
-          image: "apache/submarine:operator-0.5.0"
+          image: "apache/submarine:operator-0.6.0-SNAPSHOT"
           imagePullPolicy: IfNotPresent
           args: ["--v=7", "--logtostderr=true", "--alsologtostderr"]
           resources:

submarine-cloud/pom.xml

@@ -25,10 +25,10 @@
   <parent>
     <groupId>org.apache.submarine</groupId>
     <artifactId>submarine</artifactId>
-    <version>0.5.0</version>
+    <version>0.6.0-SNAPSHOT</version>
   </parent>
   <artifactId>submarine-cloud</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0-SNAPSHOT</version>
   <name>Submarine: Cloud</name>
   <packaging>pom</packaging>
 

submarine-commons/commons-cluster/pom.xml

@@ -23,11 +23,11 @@
   <parent>
     <groupId>org.apache.submarine</groupId>
     <artifactId>submarine-commons</artifactId>
-    <version>0.5.0</version>
+    <version>0.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>submarine-commons-cluster</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0-SNAPSHOT</version>
   <name>Submarine: Commons Cluster</name>
 
   <dependencies>

submarine-commons/commons-metastore/pom.xml

@@ -25,13 +25,13 @@
   <parent>
     <groupId>org.apache.submarine</groupId>
     <artifactId>submarine-commons</artifactId>
-    <version>0.5.0</version>
+    <version>0.6.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>org.apache.submarine</groupId>
   <artifactId>submarine-commons-metastore</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0-SNAPSHOT</version>
   <name>Submarine: Commons MetaStore</name>
 
   <dependencies>

submarine-commons/commons-rpc/pom.xml

@@ -25,13 +25,13 @@
   <parent>
     <groupId>org.apache.submarine</groupId>
     <artifactId>submarine-commons</artifactId>
-    <version>0.5.0</version>
+    <version>0.6.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>org.apache.submarine</groupId>
   <artifactId>submarine-commons-rpc</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0-SNAPSHOT</version>
   <name>Submarine: Commons RPC</name>
 
   <dependencies>

submarine-commons/commons-runtime/pom.xml

@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.submarine</groupId>
     <artifactId>submarine-commons</artifactId>
-    <version>0.5.0</version>
+    <version>0.6.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.submarine</groupId>
   <artifactId>submarine-commons-runtime</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0-SNAPSHOT</version>
   <name>Submarine: Commons Runtime</name>
 
   <dependencies>

submarine-commons/commons-unixusersync/pom.xml

@@ -25,12 +25,12 @@
   <parent>
     <groupId>org.apache.submarine</groupId>
     <artifactId>submarine-commons</artifactId>
-    <version>0.5.0</version>
+    <version>0.6.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>submarine-commons-unixusersync</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0-SNAPSHOT</version>
   <name>Submarine: Commons Unixusersync</name>
 
   <dependencies>