This is an automated email from the ASF dual-hosted git repository. pingsutw pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push: new 6265879 Preparing for 0.6.0 release 6265879 is described below commit 6265879ed6482fafcbc278d82ef6416b61377407 Author: Kevin Su <pings...@apache.org> AuthorDate: Sun Sep 19 23:13:28 2021 +0800 Preparing for 0.6.0 release ### What is this PR for? <!-- A few sentences describing the overall goals of the pull request's commits. First time? Check out the contributing guide - https://submarine.apache.org/contribution/contributions.html --> Preparing for 0.6.0 release ### What type of PR is it? [Improvement] ### Todos No ### What is the Jira issue? <!-- * Open an issue on Jira https://issues.apache.org/jira/browse/SUBMARINE/ * Put link here, and add [SUBMARINE-*Jira number*] in PR title, eg. `SUBMARINE-23. PR title` --> ### How should this be tested? <!-- * First time? Setup Travis CI as described on https://submarine.apache.org/contribution/contributions.html#continuous-integration * Strongly recommended: add automated unit tests for any new or changed behavior * Outline any manual steps to test the PR here. --> ### Screenshots (if appropriate) ### Questions: * Do the license files need updating? No * Are there breaking changes for older versions? No * Does this need new documentation? No Author: Kevin Su <pings...@apache.org> Signed-off-by: Kevin <pings...@apache.org> Closes #757 from pingsutw/rc0 and squashes the following commits: 0d58a017 [Kevin Su] Preparing for 0.6.0 release --- .github/scripts/build-image-locally.sh | 2 +- .github/workflows/deploy_docker_images.yml | 2 +- .github/workflows/master.yml | 2 +- LICENSE-binary | 2 +- dev-support/database/submarine-data.sql | 4 ++-- dev-support/docker-images/database/build.sh | 2 +- dev-support/docker-images/jupyter-gpu/build.sh | 2 +- dev-support/docker-images/jupyter/build.sh | 2 +- dev-support/docker-images/mlflow/build.sh | 4 ++-- dev-support/docker-images/operator/build.sh | 4 ++-- dev-support/docker-images/serve/build.sh | 4 ++-- dev-support/docker-images/submarine/build.sh | 2 +- dev-support/examples/mnist-pytorch/DDP/build.sh | 2 +- dev-support/examples/mnist-pytorch/DDP/post.sh | 4 ++-- .../examples/mnist-tensorflow/MirroredStrategy/build.sh | 2 +- .../examples/mnist-tensorflow/MirroredStrategy/post.sh | 4 ++-- .../MultiWorkerMirroredStrategy/build.sh | 2 +- .../mnist-tensorflow/MultiWorkerMirroredStrategy/post.sh | 4 ++-- .../mnist-tensorflow/ParameterServerStrategy/build.sh | 2 +- .../mnist-tensorflow/ParameterServerStrategy/post.sh | 4 ++-- dev-support/examples/nn-pytorch/build.sh | 2 +- dev-support/examples/nn-pytorch/post.sh | 6 +++--- dev-support/examples/quickstart/build.sh | 2 +- dev-support/examples/quickstart/post.sh | 4 ++-- dev-support/examples/tracking/build.sh | 2 +- dev-support/examples/tracking/post.sh | 4 ++-- dev-support/mini-submarine/build_mini-submarine.sh | 2 +- .../submarine/run_customized_submarine-all_mnist.sh | 2 +- .../submarine/run_submarine_mnist_tf2_tony.sh | 2 +- .../mini-submarine/submarine/run_submarine_mnist_tony.sh | 2 +- .../submarine/run_submarine_mnist_tony_rpc.sh | 2 +- .../submarine/run_submarine_mxnet_cifar10_tony.sh | 2 +- .../submarine/run_submarine_pytorch_mnist_tony.sh | 2 +- dev-support/misc/flask/build.sh | 4 ++-- dev-support/misc/serve/serve.yaml | 6 +++--- dev-support/pysubmarine/openapi.json | 2 +- dev-support/pysubmarine/swagger_config.json | 2 +- helm-charts/submarine/Chart.yaml | 2 +- helm-charts/submarine/templates/submarine-mlflow.yaml | 8 ++++---- helm-charts/submarine/values.yaml | 4 ++-- pom.xml | 2 +- submarine-all/pom.xml | 4 ++-- submarine-client/pom.xml | 4 ++-- submarine-cloud-v2/Makefile | 2 +- .../artifacts/examples/example-submarine.yaml | 6 +++--- .../helm-charts/submarine-operator/values.yaml | 2 +- submarine-cloud-v2/pkg/controller/submarine_mlflow.go | 2 +- submarine-cloud-v2/test/e2e/framework/deployment.go | 2 +- submarine-cloud/Makefile | 2 +- submarine-cloud/hack/deploy-submarine.sh | 2 +- .../manifests/submarine-cluster/submarine-database.yaml | 2 +- .../manifests/submarine-cluster/submarine-server.yaml | 2 +- .../manifests/submarine-operator/deployment.yaml | 2 +- submarine-cloud/pom.xml | 4 ++-- submarine-commons/commons-cluster/pom.xml | 4 ++-- submarine-commons/commons-metastore/pom.xml | 4 ++-- submarine-commons/commons-rpc/pom.xml | 4 ++-- submarine-commons/commons-runtime/pom.xml | 4 ++-- submarine-commons/commons-unixusersync/pom.xml | 4 ++-- submarine-commons/commons-utils/pom.xml | 4 ++-- submarine-commons/pom.xml | 4 ++-- submarine-dist/pom.xml | 4 ++-- submarine-sdk/pysubmarine/example/pytorch/afm/run_afm.sh | 2 +- .../pysubmarine/example/pytorch/deepfm/run_deepfm.sh | 2 +- submarine-sdk/pysubmarine/setup.py | 2 +- .../pysubmarine/submarine/experiment/__init__.py | 4 ++-- .../submarine/experiment/api/experiment_api.py | 2 +- .../pysubmarine/submarine/experiment/api_client.py | 4 ++-- .../pysubmarine/submarine/experiment/configuration.py | 6 +++--- .../pysubmarine/submarine/experiment/exceptions.py | 2 +- .../pysubmarine/submarine/experiment/models/__init__.py | 2 +- .../pysubmarine/submarine/experiment/models/code_spec.py | 2 +- .../submarine/experiment/models/environment_spec.py | 2 +- .../submarine/experiment/models/experiment_meta.py | 2 +- .../submarine/experiment/models/experiment_spec.py | 2 +- .../submarine/experiment/models/experiment_task_spec.py | 2 +- .../submarine/experiment/models/json_response.py | 2 +- .../submarine/experiment/models/kernel_spec.py | 2 +- submarine-sdk/pysubmarine/submarine/experiment/rest.py | 2 +- submarine-security/spark-security/pom.xml | 2 +- submarine-server/pom.xml | 4 ++-- submarine-server/server-api/pom.xml | 2 +- submarine-server/server-core/pom.xml | 2 +- .../main/java/org/apache/submarine/server/Bootstrap.java | 2 +- submarine-server/server-rpc/pom.xml | 4 ++-- submarine-server/server-submitter/pom.xml | 4 ++-- submarine-server/server-submitter/submitter-k8s/pom.xml | 4 ++-- .../server/submitter/k8s/parser/ServeSpecParser.java | 16 ++++++++-------- submarine-server/server-submitter/submitter-yarn/pom.xml | 4 ++-- .../server-submitter/submitter-yarnservice/pom.xml | 4 ++-- submarine-test/pom.xml | 4 ++-- submarine-test/test-e2e/pom.xml | 4 ++-- submarine-test/test-k8s/pom.xml | 4 ++-- submarine-workbench/interpreter/interpreter-core/pom.xml | 4 ++-- submarine-workbench/interpreter/pom.xml | 4 ++-- .../interpreter/python-interpreter/pom.xml | 4 ++-- .../interpreter/spark-interpreter/pom.xml | 4 ++-- submarine-workbench/pom.xml | 4 ++-- submarine-workbench/workbench-web/pom.xml | 4 ++-- website/docs/userDocs/api/environment.md | 14 +++++++------- website/docs/userDocs/api/notebook.md | 8 ++++---- .../version-0.6.0/userDocs/api/environment.md | 14 +++++++------- .../version-0.6.0/userDocs/api/notebook.md | 8 ++++---- 103 files changed, 179 insertions(+), 179 deletions(-) diff --git a/.github/scripts/build-image-locally.sh b/.github/scripts/build-image-locally.sh index d935f53..dd9223f 100755 --- a/.github/scripts/build-image-locally.sh +++ b/.github/scripts/build-image-locally.sh @@ -16,7 +16,7 @@ # limitations under the License. # -SUBMARINE_VERSION="0.6.0-SNAPSHOT" +SUBMARINE_VERSION="0.6.0" FOLDER_LIST=("database" "mlflow" "submarine") IMAGE_LIST=("apache/submarine:database-${SUBMARINE_VERSION}" "apache/submarine:mlflow-${SUBMARINE_VERSION}" "apache/submarine:server-${SUBMARINE_VERSION}") diff --git a/.github/workflows/deploy_docker_images.yml b/.github/workflows/deploy_docker_images.yml index 93b55d6..ba09c2e 100644 --- a/.github/workflows/deploy_docker_images.yml +++ b/.github/workflows/deploy_docker_images.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 240 env: - SUBMARINE_VERSION: 0.6.0-SNAPSHOT + SUBMARINE_VERSION: 0.6.0 steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 1d0c588..69bbd89 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -19,7 +19,7 @@ name: Submarine on: [push, pull_request] env: - VERSION: "0.6.0-SNAPSHOT" + VERSION: "0.6.0" HADOOP_VERSION: "2.9" PROFILE: "-Phadoop-2.9" BUILD_FLAG: "clean install -ntp -DskipTests -am" diff --git a/LICENSE-binary b/LICENSE-binary index 4f97e67..519d7af 100644 --- a/LICENSE-binary +++ b/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.6.0-SNAPSHOT +org.apache.submarine:submarine-core:0.6.0 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 diff --git a/dev-support/database/submarine-data.sql b/dev-support/database/submarine-data.sql index a7a3743..2e30ab7 100644 --- a/dev-support/database/submarine-data.sql +++ b/dev-support/database/submarine-data.sql @@ -64,8 +64,8 @@ INSERT INTO `team` VALUES ('e9ca23d68d884d4ebb19d07889721234', 'admin', 'Submari -- Records of environment -- ---------------------------- INSERT INTO `environment` VALUES -('environment_1600862964725_0001', 'notebook-env', '{"name":"notebook-env","dockerImage":"apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT","kernelSpec":{"name":"submarine_jupyter_py3","channels":["defaults"],"condaDependencies":[],"pipDependencies":[]}}', 'admin', '2020-09-21 14:00:05', 'admin', '2020-09-21 14:00:14'), -('environment_1600862964725_0002', 'notebook-gpu-env', '{"name":"notebook-gpu-env","dockerImage":"apache/submarine:jupyter-notebook-gpu-0.6.0-SNAPSHOT","kernelSpec":{"name":"submarine_jupyter_py3","channels":["defaults"],"condaDependencies":[],"pipDependencies":[]}}', 'admin', '2021-03-28 17:00:00', 'admin', '2021-03-28 17:00:00'); +('environment_1600862964725_0001', 'notebook-env', '{"name":"notebook-env","dockerImage":"apache/submarine:jupyter-notebook-0.6.0","kernelSpec":{"name":"submarine_jupyter_py3","channels":["defaults"],"condaDependencies":[],"pipDependencies":[]}}', 'admin', '2020-09-21 14:00:05', 'admin', '2020-09-21 14:00:14'), +('environment_1600862964725_0002', 'notebook-gpu-env', '{"name":"notebook-gpu-env","dockerImage":"apache/submarine:jupyter-notebook-gpu-0.6.0","kernelSpec":{"name":"submarine_jupyter_py3","channels":["defaults"],"condaDependencies":[],"pipDependencies":[]}}', 'admin', '2021-03-28 17:00:00', 'admin', '2021-03-28 17:00:00'); -- ---------------------------- -- Records of experiment_templates diff --git a/dev-support/docker-images/database/build.sh b/dev-support/docker-images/database/build.sh index 1a145ce..2fe085c 100755 --- a/dev-support/docker-images/database/build.sh +++ b/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.6.0-SNAPSHOT" +SUBMARINE_VERSION="0.6.0" SUBMARINE_IMAGE_NAME="apache/submarine:database-${SUBMARINE_VERSION}" cp -rf "${SUBMARINE_HOME}/dev-support/database" "${CURRENT_PATH}" diff --git a/dev-support/docker-images/jupyter-gpu/build.sh b/dev-support/docker-images/jupyter-gpu/build.sh index 0349e45..b543cc5 100755 --- a/dev-support/docker-images/jupyter-gpu/build.sh +++ b/dev-support/docker-images/jupyter-gpu/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -JUPYTER_IMAGE="apache/submarine:jupyter-notebook-gpu-0.6.0-SNAPSHOT" +JUPYTER_IMAGE="apache/submarine:jupyter-notebook-gpu-0.6.0" if [ -L ${BASH_SOURCE-$0} ]; then PWD=$(dirname $(readlink "${BASH_SOURCE-$0}")) diff --git a/dev-support/docker-images/jupyter/build.sh b/dev-support/docker-images/jupyter/build.sh index b506f40..2b127e1 100755 --- a/dev-support/docker-images/jupyter/build.sh +++ b/dev-support/docker-images/jupyter/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -JUPYTER_IMAGE="apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT" +JUPYTER_IMAGE="apache/submarine:jupyter-notebook-0.6.0" if [ -L ${BASH_SOURCE-$0} ]; then PWD=$(dirname $(readlink "${BASH_SOURCE-$0}")) diff --git a/dev-support/docker-images/mlflow/build.sh b/dev-support/docker-images/mlflow/build.sh index 0a663dc..e8178d0 100755 --- a/dev-support/docker-images/mlflow/build.sh +++ b/dev-support/docker-images/mlflow/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -MLFLOW_IMAGE="apache/submarine:mlflow-0.6.0-SNAPSHOT" +MLFLOW_IMAGE="apache/submarine:mlflow-0.6.0" if [ -L ${BASH_SOURCE-$0} ]; then PWD=$(dirname $(readlink "${BASH_SOURCE-$0}")) @@ -29,4 +29,4 @@ export SUBMARINE_HOME=${CURRENT_PATH}/../../.. # build image echo "Start building the ${MLFLOW_IMAGE} docker image ..." cd ${CURRENT_PATH} -docker build -t ${MLFLOW_IMAGE} . \ No newline at end of file +docker build -t ${MLFLOW_IMAGE} . diff --git a/dev-support/docker-images/operator/build.sh b/dev-support/docker-images/operator/build.sh index 12c2123..728de21 100755 --- a/dev-support/docker-images/operator/build.sh +++ b/dev-support/docker-images/operator/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 SUBMARINE_IMAGE_NAME="apache/submarine:operator-${SUBMARINE_VERSION}" if [ -L ${BASH_SOURCE-$0} ]; then @@ -29,7 +29,7 @@ export SUBMARINE_HOME=${CURRENT_PATH}/../../.. mkdir -p "${CURRENT_PATH}/tmp" cp -r ${SUBMARINE_HOME}/submarine-cloud-v2/ "${CURRENT_PATH}/tmp/submarine-cloud-v2/" -cp -r ${SUBMARINE_HOME}/helm-charts/submarine/charts/ "${CURRENT_PATH}/tmp/charts" +cp -r ${SUBMARINE_HOME}/helm-charts/submarine/charts/ "${CURRENT_PATH}/tmp/charts" cd ${CURRENT_PATH} echo "Start building the ${SUBMARINE_IMAGE_NAME} docker image ..." diff --git a/dev-support/docker-images/serve/build.sh b/dev-support/docker-images/serve/build.sh index 42115c5..e4db4f4 100755 --- a/dev-support/docker-images/serve/build.sh +++ b/dev-support/docker-images/serve/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 SUBMARINE_IMAGE_NAME="apache/submarine:serve-${SUBMARINE_VERSION}" if [ -L ${BASH_SOURCE-$0} ]; then @@ -30,4 +30,4 @@ export SUBMARINE_HOME=${CURRENT_PATH}/../../.. # build image cd ${CURRENT_PATH} echo "Start building the ${SUBMARINE_IMAGE_NAME} docker image ..." -docker build -t ${SUBMARINE_IMAGE_NAME} . \ No newline at end of file +docker build -t ${SUBMARINE_IMAGE_NAME} . diff --git a/dev-support/docker-images/submarine/build.sh b/dev-support/docker-images/submarine/build.sh index 9e7ce66..74a874f 100755 --- a/dev-support/docker-images/submarine/build.sh +++ b/dev-support/docker-images/submarine/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 SUBMARINE_IMAGE_NAME="apache/submarine:server-${SUBMARINE_VERSION}" if [ -L ${BASH_SOURCE-$0} ]; then diff --git a/dev-support/examples/mnist-pytorch/DDP/build.sh b/dev-support/examples/mnist-pytorch/DDP/build.sh index 84ece8f..0ce08e4 100755 --- a/dev-support/examples/mnist-pytorch/DDP/build.sh +++ b/dev-support/examples/mnist-pytorch/DDP/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 SUBMARINE_IMAGE_NAME="ddp:${SUBMARINE_VERSION}" if [ -L ${BASH_SOURCE-$0} ]; then diff --git a/dev-support/examples/mnist-pytorch/DDP/post.sh b/dev-support/examples/mnist-pytorch/DDP/post.sh index ec2d0cf..20cf513 100755 --- a/dev-support/examples/mnist-pytorch/DDP/post.sh +++ b/dev-support/examples/mnist-pytorch/DDP/post.sh @@ -26,7 +26,7 @@ curl -X POST -H "Content-Type: application/json" -d ' } }, "environment": { - "image": "ddp:0.6.0-SNAPSHOT" + "image": "ddp:0.6.0" }, "spec": { "Master": { @@ -39,4 +39,4 @@ curl -X POST -H "Content-Type: application/json" -d ' } } } -' http://127.0.0.1:32080/api/v1/experiment \ No newline at end of file +' http://127.0.0.1:32080/api/v1/experiment diff --git a/dev-support/examples/mnist-tensorflow/MirroredStrategy/build.sh b/dev-support/examples/mnist-tensorflow/MirroredStrategy/build.sh index ab72b5b..3dc1f17 100755 --- a/dev-support/examples/mnist-tensorflow/MirroredStrategy/build.sh +++ b/dev-support/examples/mnist-tensorflow/MirroredStrategy/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 SUBMARINE_IMAGE_NAME="mirrored:${SUBMARINE_VERSION}" if [ -L ${BASH_SOURCE-$0} ]; then diff --git a/dev-support/examples/mnist-tensorflow/MirroredStrategy/post.sh b/dev-support/examples/mnist-tensorflow/MirroredStrategy/post.sh index 5926843..2cf842f 100755 --- a/dev-support/examples/mnist-tensorflow/MirroredStrategy/post.sh +++ b/dev-support/examples/mnist-tensorflow/MirroredStrategy/post.sh @@ -26,7 +26,7 @@ curl -X POST -H "Content-Type: application/json" -d ' } }, "environment": { - "image": "mirrored:0.6.0-SNAPSHOT" + "image": "mirrored:0.6.0" }, "spec": { "Worker": { @@ -35,4 +35,4 @@ curl -X POST -H "Content-Type: application/json" -d ' } } } -' http://127.0.0.1:32080/api/v1/experiment \ No newline at end of file +' http://127.0.0.1:32080/api/v1/experiment diff --git a/dev-support/examples/mnist-tensorflow/MultiWorkerMirroredStrategy/build.sh b/dev-support/examples/mnist-tensorflow/MultiWorkerMirroredStrategy/build.sh index a0fb21d..e4efd70 100755 --- a/dev-support/examples/mnist-tensorflow/MultiWorkerMirroredStrategy/build.sh +++ b/dev-support/examples/mnist-tensorflow/MultiWorkerMirroredStrategy/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 SUBMARINE_IMAGE_NAME="multi-worker-mirrored:${SUBMARINE_VERSION}" if [ -L ${BASH_SOURCE-$0} ]; then diff --git a/dev-support/examples/mnist-tensorflow/MultiWorkerMirroredStrategy/post.sh b/dev-support/examples/mnist-tensorflow/MultiWorkerMirroredStrategy/post.sh index 901b4a3..31f4dcd 100755 --- a/dev-support/examples/mnist-tensorflow/MultiWorkerMirroredStrategy/post.sh +++ b/dev-support/examples/mnist-tensorflow/MultiWorkerMirroredStrategy/post.sh @@ -26,7 +26,7 @@ curl -X POST -H "Content-Type: application/json" -d ' } }, "environment": { - "image": "multi-worker-mirrored:0.6.0-SNAPSHOT" + "image": "multi-worker-mirrored:0.6.0" }, "spec": { "Worker": { @@ -35,4 +35,4 @@ curl -X POST -H "Content-Type: application/json" -d ' } } } -' http://127.0.0.1:32080/api/v1/experiment \ No newline at end of file +' http://127.0.0.1:32080/api/v1/experiment diff --git a/dev-support/examples/mnist-tensorflow/ParameterServerStrategy/build.sh b/dev-support/examples/mnist-tensorflow/ParameterServerStrategy/build.sh index c4652ec..cff2622 100755 --- a/dev-support/examples/mnist-tensorflow/ParameterServerStrategy/build.sh +++ b/dev-support/examples/mnist-tensorflow/ParameterServerStrategy/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 SUBMARINE_IMAGE_NAME="parameter-server:${SUBMARINE_VERSION}" if [ -L ${BASH_SOURCE-$0} ]; then diff --git a/dev-support/examples/mnist-tensorflow/ParameterServerStrategy/post.sh b/dev-support/examples/mnist-tensorflow/ParameterServerStrategy/post.sh index d6709f8..36ab653 100755 --- a/dev-support/examples/mnist-tensorflow/ParameterServerStrategy/post.sh +++ b/dev-support/examples/mnist-tensorflow/ParameterServerStrategy/post.sh @@ -26,7 +26,7 @@ curl -X POST -H "Content-Type: application/json" -d ' } }, "environment": { - "image": "parameter-server:0.6.0-SNAPSHOT" + "image": "parameter-server:0.6.0" }, "spec": { "Ps": { @@ -39,4 +39,4 @@ curl -X POST -H "Content-Type: application/json" -d ' } } } -' http://127.0.0.1:32080/api/v1/experiment \ No newline at end of file +' http://127.0.0.1:32080/api/v1/experiment diff --git a/dev-support/examples/nn-pytorch/build.sh b/dev-support/examples/nn-pytorch/build.sh index 44b8292..1a33034 100755 --- a/dev-support/examples/nn-pytorch/build.sh +++ b/dev-support/examples/nn-pytorch/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 SUBMARINE_IMAGE_NAME="nn-pytorch:${SUBMARINE_VERSION}" if [ -L ${BASH_SOURCE-$0} ]; then diff --git a/dev-support/examples/nn-pytorch/post.sh b/dev-support/examples/nn-pytorch/post.sh index 1cdfa83..7dde725 100755 --- a/dev-support/examples/nn-pytorch/post.sh +++ b/dev-support/examples/nn-pytorch/post.sh @@ -24,10 +24,10 @@ curl -X POST -H "Content-Type: application/json" -d ' "envVars": { "ENV_1": "ENV1" } - + }, "environment": { - "image": "nn-pytorch:0.6.0-SNAPSHOT" + "image": "nn-pytorch:0.6.0" }, "spec": { "Worker": { @@ -36,4 +36,4 @@ curl -X POST -H "Content-Type: application/json" -d ' } } } -' http://127.0.0.1:32080/api/v1/experiment \ No newline at end of file +' http://127.0.0.1:32080/api/v1/experiment diff --git a/dev-support/examples/quickstart/build.sh b/dev-support/examples/quickstart/build.sh index 6865c39..02b3347 100755 --- a/dev-support/examples/quickstart/build.sh +++ b/dev-support/examples/quickstart/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 SUBMARINE_IMAGE_NAME="apache/submarine:quickstart-${SUBMARINE_VERSION}" if [ -L ${BASH_SOURCE-$0} ]; then diff --git a/dev-support/examples/quickstart/post.sh b/dev-support/examples/quickstart/post.sh index 8c23c52..8b0d688 100755 --- a/dev-support/examples/quickstart/post.sh +++ b/dev-support/examples/quickstart/post.sh @@ -26,7 +26,7 @@ curl -X POST -H "Content-Type: application/json" -d ' } }, "environment": { - "image": "quickstart:0.6.0-SNAPSHOT" + "image": "quickstart:0.6.0" }, "spec": { "Worker": { @@ -35,4 +35,4 @@ curl -X POST -H "Content-Type: application/json" -d ' } } } -' http://127.0.0.1:32080/api/v1/experiment \ No newline at end of file +' http://127.0.0.1:32080/api/v1/experiment diff --git a/dev-support/examples/tracking/build.sh b/dev-support/examples/tracking/build.sh index b83f0e8..b9a2466 100755 --- a/dev-support/examples/tracking/build.sh +++ b/dev-support/examples/tracking/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 SUBMARINE_IMAGE_NAME="tracking:${SUBMARINE_VERSION}" if [ -L ${BASH_SOURCE-$0} ]; then diff --git a/dev-support/examples/tracking/post.sh b/dev-support/examples/tracking/post.sh index 7adbd7d..3820783 100755 --- a/dev-support/examples/tracking/post.sh +++ b/dev-support/examples/tracking/post.sh @@ -26,7 +26,7 @@ curl -X POST -H "Content-Type: application/json" -d ' } }, "environment": { - "image": "tracking:0.6.0-SNAPSHOT" + "image": "tracking:0.6.0" }, "spec": { "Ps": { @@ -39,4 +39,4 @@ curl -X POST -H "Content-Type: application/json" -d ' } } } -' http://127.0.0.1:32080/api/v1/experiment \ No newline at end of file +' http://127.0.0.1:32080/api/v1/experiment diff --git a/dev-support/mini-submarine/build_mini-submarine.sh b/dev-support/mini-submarine/build_mini-submarine.sh index 1c7e3d0..9492dd9 100755 --- a/dev-support/mini-submarine/build_mini-submarine.sh +++ b/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.6.0-SNAPSHOT"} +submarine_v=${submarine_version:-"0.6.0"} echo "Using submarine version: $submarine_v" image_name="local/mini-submarine:${submarine_v}" diff --git a/dev-support/mini-submarine/submarine/run_customized_submarine-all_mnist.sh b/dev-support/mini-submarine/submarine/run_customized_submarine-all_mnist.sh index 4510896..ea6ee87 100755 --- a/dev-support/mini-submarine/submarine/run_customized_submarine-all_mnist.sh +++ b/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.6.0-SNAPSHOT"} +SUBMARINE_VERSION=${SUBMARINE_VER:-"0.6.0"} HADOOP_VERSION=2.9 diff --git a/dev-support/mini-submarine/submarine/run_submarine_mnist_tf2_tony.sh b/dev-support/mini-submarine/submarine/run_submarine_mnist_tf2_tony.sh index 7e9e795..182b2e6 100755 --- a/dev-support/mini-submarine/submarine/run_submarine_mnist_tf2_tony.sh +++ b/dev-support/mini-submarine/submarine/run_submarine_mnist_tf2_tony.sh @@ -39,7 +39,7 @@ else JAVA_CMD="java" fi -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 HADOOP_VERSION=2.9 SUBMARINE_PATH=/opt/submarine-current HADOOP_CONF_PATH=/usr/local/hadoop/etc/hadoop diff --git a/dev-support/mini-submarine/submarine/run_submarine_mnist_tony.sh b/dev-support/mini-submarine/submarine/run_submarine_mnist_tony.sh index 834cf5f..303a0d9 100755 --- a/dev-support/mini-submarine/submarine/run_submarine_mnist_tony.sh +++ b/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.6.0-SNAPSHOT"} +SUBMARINE_VERSION=${SUBMARINE_VER:-"0.6.0"} # Version of affiliated Hadoop version for this Submarine jar. SUBMARINE_HADOOP_VERSION=2.9 diff --git a/dev-support/mini-submarine/submarine/run_submarine_mnist_tony_rpc.sh b/dev-support/mini-submarine/submarine/run_submarine_mnist_tony_rpc.sh index cb442cb..447ee97 100644 --- a/dev-support/mini-submarine/submarine/run_submarine_mnist_tony_rpc.sh +++ b/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.6.0-SNAPSHOT"} +SUBMARINE_VERSION=${SUBMARINE_VER:-"0.6.0"} HADOOP_VERSION=2.9 diff --git a/dev-support/mini-submarine/submarine/run_submarine_mxnet_cifar10_tony.sh b/dev-support/mini-submarine/submarine/run_submarine_mxnet_cifar10_tony.sh index be41a4f..ddb1a13 100755 --- a/dev-support/mini-submarine/submarine/run_submarine_mxnet_cifar10_tony.sh +++ b/dev-support/mini-submarine/submarine/run_submarine_mxnet_cifar10_tony.sh @@ -39,7 +39,7 @@ else JAVA_CMD="java" fi -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 HADOOP_VERSION=2.9 SUBMARINE_PATH=/opt/submarine-current HADOOP_CONF_PATH=/usr/local/hadoop/etc/hadoop diff --git a/dev-support/mini-submarine/submarine/run_submarine_pytorch_mnist_tony.sh b/dev-support/mini-submarine/submarine/run_submarine_pytorch_mnist_tony.sh index 15d36cf..1138103 100755 --- a/dev-support/mini-submarine/submarine/run_submarine_pytorch_mnist_tony.sh +++ b/dev-support/mini-submarine/submarine/run_submarine_pytorch_mnist_tony.sh @@ -39,7 +39,7 @@ else JAVA_CMD="java" fi -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 HADOOP_VERSION=2.9 SUBMARINE_PATH=/opt/submarine-current HADOOP_CONF_PATH=/usr/local/hadoop/etc/hadoop diff --git a/dev-support/misc/flask/build.sh b/dev-support/misc/flask/build.sh index 079cfc1..d281960 100755 --- a/dev-support/misc/flask/build.sh +++ b/dev-support/misc/flask/build.sh @@ -16,7 +16,7 @@ set -euxo pipefail -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 SUBMARINE_IMAGE_NAME="flask:${SUBMARINE_VERSION}" if [ -L ${BASH_SOURCE-$0} ]; then @@ -30,4 +30,4 @@ export SUBMARINE_HOME=${CURRENT_PATH}/../../.. # build image cd ${CURRENT_PATH} echo "Start building the ${SUBMARINE_IMAGE_NAME} docker image ..." -docker build -t ${SUBMARINE_IMAGE_NAME} . \ No newline at end of file +docker build -t ${SUBMARINE_IMAGE_NAME} . diff --git a/dev-support/misc/serve/serve.yaml b/dev-support/misc/serve/serve.yaml index 0e4084c..f115cd3 100644 --- a/dev-support/misc/serve/serve.yaml +++ b/dev-support/misc/serve/serve.yaml @@ -22,7 +22,7 @@ metadata: spec: selector: matchLabels: - app: serve-example-pod # + app: serve-example-pod # template: metadata: labels: @@ -30,7 +30,7 @@ spec: spec: containers: - name: serve-example-container - image: apache/submarine:serve-0.6.0-SNAPSHOT + image: apache/submarine:serve-0.6.0 command: - "mlflow" - "models" @@ -88,4 +88,4 @@ metadata: spec: stripPrefix: prefixes: - - /serve/mymodel \ No newline at end of file + - /serve/mymodel diff --git a/dev-support/pysubmarine/openapi.json b/dev-support/pysubmarine/openapi.json index 0899dc9..f50514c 100644 --- a/dev-support/pysubmarine/openapi.json +++ b/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.6.0-SNAPSHOT" + "version" : "0.6.0" }, "servers" : [ { "url" : "/api" diff --git a/dev-support/pysubmarine/swagger_config.json b/dev-support/pysubmarine/swagger_config.json index abf9205..2260803 100644 --- a/dev-support/pysubmarine/swagger_config.json +++ b/dev-support/pysubmarine/swagger_config.json @@ -1,5 +1,5 @@ { "packageName" : "submarine.experiment", "projectName" : "submarine.experiment", - "packageVersion": "0.6.0-SNAPSHOT" + "packageVersion": "0.6.0" } diff --git a/helm-charts/submarine/Chart.yaml b/helm-charts/submarine/Chart.yaml index 9dc38dd..b4ee080 100644 --- a/helm-charts/submarine/Chart.yaml +++ b/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.6.0-SNAPSHOT +version: 0.6.0 icon: https://submarine.apache.org/assets/themes/submarine/img/submarine_white_logo.png dependencies: - name: tfjob diff --git a/helm-charts/submarine/templates/submarine-mlflow.yaml b/helm-charts/submarine/templates/submarine-mlflow.yaml index 4083466..af2422d 100644 --- a/helm-charts/submarine/templates/submarine-mlflow.yaml +++ b/helm-charts/submarine/templates/submarine-mlflow.yaml @@ -65,10 +65,10 @@ spec: initContainers: - name: submarine-mlflow-initcontainer image: "minio/mc" - command: ["/bin/bash", "-c", + command: ["/bin/bash", "-c", "cnt=0; - while ! /bin/bash -c 'mc config host add minio http://submarine-minio-service:9000 - submarine_minio submarine_minio' 2>&1; + while ! /bin/bash -c 'mc config host add minio http://submarine-minio-service:9000 + submarine_minio submarine_minio' 2>&1; do sleep 15; ((cnt=cnt+1)); @@ -84,7 +84,7 @@ spec: fi;"] containers: - name: submarine-mlflow-container - image: apache/submarine:mlflow-0.6.0-SNAPSHOT + image: apache/submarine:mlflow-0.6.0 imagePullPolicy: IfNotPresent ports: - containerPort: 5000 diff --git a/helm-charts/submarine/values.yaml b/helm-charts/submarine/values.yaml index 5d9952b..d03dc0d 100644 --- a/helm-charts/submarine/values.yaml +++ b/helm-charts/submarine/values.yaml @@ -20,14 +20,14 @@ submarine: imagePullPolicy: IfNotPresent replicas: 1 name: submarine-server - image: apache/submarine:server-0.6.0-SNAPSHOT + image: apache/submarine:server-0.6.0 servicePort: 8080 dev: false # if true, restart server pod every time at helm upgrade database: imagePullPolicy: IfNotPresent replicas: 1 name: submarine-database - image: apache/submarine:database-0.6.0-SNAPSHOT + image: apache/submarine:database-0.6.0 servicePort: 3306 mysqlRootPassword: password dev: false # if true, restart database pod every time at helm upgrade diff --git a/pom.xml b/pom.xml index 111c750..7e74a19 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <groupId>org.apache.submarine</groupId> <artifactId>submarine</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <packaging>pom</packaging> <name>Submarine</name> <description>Submarine project</description> diff --git a/submarine-all/pom.xml b/submarine-all/pom.xml index 75f5abd..bdcde16 100644 --- a/submarine-all/pom.xml +++ b/submarine-all/pom.xml @@ -25,11 +25,11 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>..</relativePath> </parent> <artifactId>submarine-all</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: All</name> <dependencyManagement> diff --git a/submarine-client/pom.xml b/submarine-client/pom.xml index 6ab0362..913bd45 100644 --- a/submarine-client/pom.xml +++ b/submarine-client/pom.xml @@ -24,12 +24,12 @@ <parent> <artifactId>submarine</artifactId> <groupId>org.apache.submarine</groupId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>submarine-client</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Client</name> <dependencies> diff --git a/submarine-cloud-v2/Makefile b/submarine-cloud-v2/Makefile index 3a4f3f5..d1fe4cd 100644 --- a/submarine-cloud-v2/Makefile +++ b/submarine-cloud-v2/Makefile @@ -28,7 +28,7 @@ api: .PHONY: image image: GOOS=linux go build -o submarine-operator - docker build -t "apache/submarine:operator-0.6.0-SNAPSHOT" -f dev.Dockerfile . + docker build -t "apache/submarine:operator-0.6.0" -f dev.Dockerfile . go build -o submarine-operator .PHONY: test-unit diff --git a/submarine-cloud-v2/artifacts/examples/example-submarine.yaml b/submarine-cloud-v2/artifacts/examples/example-submarine.yaml index 37145e8..163ce45 100644 --- a/submarine-cloud-v2/artifacts/examples/example-submarine.yaml +++ b/submarine-cloud-v2/artifacts/examples/example-submarine.yaml @@ -20,12 +20,12 @@ kind: Submarine metadata: name: example-submarine spec: - version: "0.6.0-SNAPSHOT" + version: "0.6.0" server: - # image: "apache/submarine:server-0.6.0-SNAPSHOT" # overwrite the image when development + # image: "apache/submarine:server-0.6.0" # overwrite the image when development replicas: 1 database: - # image: "apache/submarine:database-0.6.0-SNAPSHOT" # overwrite the image when development + # image: "apache/submarine:database-0.6.0" # overwrite the image when development replicas: 1 storageSize: "1Gi" mysqlRootPasswordSecret: "root-pass-secret" diff --git a/submarine-cloud-v2/helm-charts/submarine-operator/values.yaml b/submarine-cloud-v2/helm-charts/submarine-operator/values.yaml index 373b685..d4ff64f 100644 --- a/submarine-cloud-v2/helm-charts/submarine-operator/values.yaml +++ b/submarine-cloud-v2/helm-charts/submarine-operator/values.yaml @@ -17,7 +17,7 @@ name: submarine-operator-demo replicas: 1 -image: apache/submarine:operator-0.6.0-SNAPSHOT +image: apache/submarine:operator-0.6.0 # dev is to tell helm to install submarine-operator or not dev: false # storageClass is for dynamically creating persistent volumes diff --git a/submarine-cloud-v2/pkg/controller/submarine_mlflow.go b/submarine-cloud-v2/pkg/controller/submarine_mlflow.go index ee4ab7f..dc45b13 100644 --- a/submarine-cloud-v2/pkg/controller/submarine_mlflow.go +++ b/submarine-cloud-v2/pkg/controller/submarine_mlflow.go @@ -90,7 +90,7 @@ func newSubmarineMlflowDeployment(submarine *v1alpha1.Submarine) *appsv1.Deploym Containers: []corev1.Container{ { Name: mlflowName + "-container", - Image: "apache/submarine:mlflow-0.6.0-SNAPSHOT", + Image: "apache/submarine:mlflow-0.6.0", ImagePullPolicy: "IfNotPresent", Ports: []corev1.ContainerPort{ { diff --git a/submarine-cloud-v2/test/e2e/framework/deployment.go b/submarine-cloud-v2/test/e2e/framework/deployment.go index 1421b0f..0a02b09 100644 --- a/submarine-cloud-v2/test/e2e/framework/deployment.go +++ b/submarine-cloud-v2/test/e2e/framework/deployment.go @@ -49,7 +49,7 @@ func MakeDeployment(pathToYaml string) (*appsv1.Deployment, error) { func MakeOperatorDeployment() *appsv1.Deployment { name := "submarine-operator-demo" var replicas int32 = 1 - image := "apache/submarine:operator-0.6.0-SNAPSHOT" + image := "apache/submarine:operator-0.6.0" return &appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ Name: name, diff --git a/submarine-cloud/Makefile b/submarine-cloud/Makefile index 59ffc9a..ee3c5bb 100644 --- a/submarine-cloud/Makefile +++ b/submarine-cloud/Makefile @@ -20,7 +20,7 @@ GOCLEAN=$(GOCMD) clean GOTEST=$(GOCMD) test GOGET=$(GOCMD) get BINARY_NAME=submarine-operator -VERSION="0.6.0-SNAPSHOT" +VERSION="0.6.0" BuildGitBranch=$(git rev-parse --abbrev-ref HEAD) BuildGitRev=$(git rev-list --count HEAD) BuildGitCommit=$(git rev-parse HEAD) diff --git a/submarine-cloud/hack/deploy-submarine.sh b/submarine-cloud/hack/deploy-submarine.sh index 38728d8..dd47812 100755 --- a/submarine-cloud/hack/deploy-submarine.sh +++ b/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.6.0-SNAPSHOT" +SUBMARINE_VERSION="0.6.0" source $ROOT/hack/lib.sh diff --git a/submarine-cloud/manifests/submarine-cluster/submarine-database.yaml b/submarine-cloud/manifests/submarine-cluster/submarine-database.yaml index 69c7481..691fb2c 100644 --- a/submarine-cloud/manifests/submarine-cluster/submarine-database.yaml +++ b/submarine-cloud/manifests/submarine-cluster/submarine-database.yaml @@ -30,7 +30,7 @@ spec: spec: containers: - name: submarine-database - image: apache/submarine:database-0.6.0-SNAPSHOT + image: apache/submarine:database-0.6.0 ports: - containerPort: 3306 env: diff --git a/submarine-cloud/manifests/submarine-cluster/submarine-server.yaml b/submarine-cloud/manifests/submarine-cluster/submarine-server.yaml index 454c94c..49a6a00 100644 --- a/submarine-cloud/manifests/submarine-cluster/submarine-server.yaml +++ b/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.6.0-SNAPSHOT" + image: "apache/submarine:server-0.6.0" args: [] imagePullPolicy: IfNotPresent ports: diff --git a/submarine-cloud/manifests/submarine-operator/deployment.yaml b/submarine-cloud/manifests/submarine-operator/deployment.yaml index b909525..cb89851 100644 --- a/submarine-cloud/manifests/submarine-operator/deployment.yaml +++ b/submarine-cloud/manifests/submarine-operator/deployment.yaml @@ -34,7 +34,7 @@ spec: serviceAccountName: "submarine-operator" containers: - name: op - image: "apache/submarine:operator-0.6.0-SNAPSHOT" + image: "apache/submarine:operator-0.6.0" imagePullPolicy: IfNotPresent args: ["--v=7", "--logtostderr=true", "--alsologtostderr"] resources: diff --git a/submarine-cloud/pom.xml b/submarine-cloud/pom.xml index d2ad28d..a76885b 100644 --- a/submarine-cloud/pom.xml +++ b/submarine-cloud/pom.xml @@ -25,10 +25,10 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <artifactId>submarine-cloud</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Cloud</name> <packaging>pom</packaging> diff --git a/submarine-commons/commons-cluster/pom.xml b/submarine-commons/commons-cluster/pom.xml index 259b3b8..f0e7fb1 100644 --- a/submarine-commons/commons-cluster/pom.xml +++ b/submarine-commons/commons-cluster/pom.xml @@ -23,11 +23,11 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-commons</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>submarine-commons-cluster</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Commons Cluster</name> <dependencies> diff --git a/submarine-commons/commons-metastore/pom.xml b/submarine-commons/commons-metastore/pom.xml index 8e1b60d..adb84a8 100644 --- a/submarine-commons/commons-metastore/pom.xml +++ b/submarine-commons/commons-metastore/pom.xml @@ -25,13 +25,13 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-commons</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-commons-metastore</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Commons MetaStore</name> <dependencies> diff --git a/submarine-commons/commons-rpc/pom.xml b/submarine-commons/commons-rpc/pom.xml index c18597f..ace64e2 100644 --- a/submarine-commons/commons-rpc/pom.xml +++ b/submarine-commons/commons-rpc/pom.xml @@ -25,13 +25,13 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-commons</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-commons-rpc</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Commons RPC</name> <dependencies> diff --git a/submarine-commons/commons-runtime/pom.xml b/submarine-commons/commons-runtime/pom.xml index 7874b62..86e1343 100644 --- a/submarine-commons/commons-runtime/pom.xml +++ b/submarine-commons/commons-runtime/pom.xml @@ -24,13 +24,13 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-commons</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.submarine</groupId> <artifactId>submarine-commons-runtime</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Commons Runtime</name> <dependencies> diff --git a/submarine-commons/commons-unixusersync/pom.xml b/submarine-commons/commons-unixusersync/pom.xml index b1b9e0e..ac3b3a5 100644 --- a/submarine-commons/commons-unixusersync/pom.xml +++ b/submarine-commons/commons-unixusersync/pom.xml @@ -25,12 +25,12 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-commons</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>submarine-commons-unixusersync</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Commons Unixusersync</name> <dependencies> diff --git a/submarine-commons/commons-utils/pom.xml b/submarine-commons/commons-utils/pom.xml index 4b99d82..e862125 100644 --- a/submarine-commons/commons-utils/pom.xml +++ b/submarine-commons/commons-utils/pom.xml @@ -25,13 +25,13 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-commons</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-commons-utils</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Commons Utils</name> <dependencies> diff --git a/submarine-commons/pom.xml b/submarine-commons/pom.xml index d9211fa..f092b60 100644 --- a/submarine-commons/pom.xml +++ b/submarine-commons/pom.xml @@ -23,14 +23,14 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.submarine</groupId> <artifactId>submarine-commons</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <packaging>pom</packaging> <name>Submarine: Commons</name> diff --git a/submarine-dist/pom.xml b/submarine-dist/pom.xml index 2996cfe..e8c0156 100644 --- a/submarine-dist/pom.xml +++ b/submarine-dist/pom.xml @@ -25,11 +25,11 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>..</relativePath> </parent> <artifactId>submarine-dist</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Dist</name> <packaging>pom</packaging> diff --git a/submarine-sdk/pysubmarine/example/pytorch/afm/run_afm.sh b/submarine-sdk/pysubmarine/example/pytorch/afm/run_afm.sh index e893fae..920c371 100644 --- a/submarine-sdk/pysubmarine/example/pytorch/afm/run_afm.sh +++ b/submarine-sdk/pysubmarine/example/pytorch/afm/run_afm.sh @@ -24,7 +24,7 @@ PYTHONPATH=$HOME/workspace/submarine/submarine-sdk/pysubmarine HADOOP_CONF_PATH=${HADOOP_CONF_PATH:-$HADOOP_CONF_DIR} -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 SUBMARINE_HADOOP_VERSION=2.9 SUBMARINE_JAR=/opt/submarine-dist-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}/submarine-dist-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}/submarine-all-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}.jar diff --git a/submarine-sdk/pysubmarine/example/pytorch/deepfm/run_deepfm.sh b/submarine-sdk/pysubmarine/example/pytorch/deepfm/run_deepfm.sh index 02079f2..75c6bee 100644 --- a/submarine-sdk/pysubmarine/example/pytorch/deepfm/run_deepfm.sh +++ b/submarine-sdk/pysubmarine/example/pytorch/deepfm/run_deepfm.sh @@ -24,7 +24,7 @@ PYTHONPATH=$HOME/workspace/submarine/submarine-sdk/pysubmarine HADOOP_CONF_PATH=${HADOOP_CONF_PATH:-$HADOOP_CONF_DIR} -SUBMARINE_VERSION=0.6.0-SNAPSHOT +SUBMARINE_VERSION=0.6.0 SUBMARINE_HADOOP_VERSION=2.9 SUBMARINE_JAR=/opt/submarine-dist-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}/submarine-dist-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}/submarine-all-${SUBMARINE_VERSION}-hadoop-${SUBMARINE_HADOOP_VERSION}.jar diff --git a/submarine-sdk/pysubmarine/setup.py b/submarine-sdk/pysubmarine/setup.py index deaa521..d10855b 100644 --- a/submarine-sdk/pysubmarine/setup.py +++ b/submarine-sdk/pysubmarine/setup.py @@ -20,7 +20,7 @@ with open("README.md") as f: setup( name="apache-submarine", - version="0.6.0-SNAPSHOT", + version="0.6.0", description="A python SDK for submarine", long_description=long_description, long_description_content_type="text/markdown", diff --git a/submarine-sdk/pysubmarine/submarine/experiment/__init__.py b/submarine-sdk/pysubmarine/submarine/experiment/__init__.py index 618170f..8460541 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/__init__.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/__init__.py @@ -21,7 +21,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ @@ -51,4 +51,4 @@ from submarine.experiment.models.experiment_task_spec import ExperimentTaskSpec from submarine.experiment.models.json_response import JsonResponse from submarine.experiment.models.kernel_spec import KernelSpec -__version__ = "0.6.0-SNAPSHOT" +__version__ = "0.6.0" diff --git a/submarine-sdk/pysubmarine/submarine/experiment/api/experiment_api.py b/submarine-sdk/pysubmarine/submarine/experiment/api/experiment_api.py index e2a9fb8..9f76434 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/api/experiment_api.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/api/experiment_api.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/api_client.py b/submarine-sdk/pysubmarine/submarine/experiment/api_client.py index 2414243..6c4bda0 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/api_client.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/api_client.py @@ -19,7 +19,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ @@ -95,7 +95,7 @@ class ApiClient(object): self.default_headers[header_name] = header_value self.cookie = cookie # Set default User-Agent. - self.user_agent = "OpenAPI-Generator/0.6.0-SNAPSHOT/python" + self.user_agent = "OpenAPI-Generator/0.6.0/python" self.client_side_validation = configuration.client_side_validation def __enter__(self): diff --git a/submarine-sdk/pysubmarine/submarine/experiment/configuration.py b/submarine-sdk/pysubmarine/submarine/experiment/configuration.py index 0987494..e76207e 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/configuration.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/configuration.py @@ -19,7 +19,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ @@ -340,8 +340,8 @@ class Configuration(object): "Python SDK Debug Report:\n" "OS: {env}\n" "Python Version: {pyversion}\n" - "Version of the API: 0.6.0-SNAPSHOT\n" - "SDK Package Version: 0.6.0-SNAPSHOT".format(env=sys.platform, pyversion=sys.version) + "Version of the API: 0.6.0\n" + "SDK Package Version: 0.6.0".format(env=sys.platform, pyversion=sys.version) ) def get_host_settings(self): diff --git a/submarine-sdk/pysubmarine/submarine/experiment/exceptions.py b/submarine-sdk/pysubmarine/submarine/experiment/exceptions.py index 48df324..21ea9f6 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/exceptions.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/exceptions.py @@ -19,7 +19,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/__init__.py b/submarine-sdk/pysubmarine/submarine/experiment/models/__init__.py index d445552..2942a7d 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/__init__.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/__init__.py @@ -21,7 +21,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/code_spec.py b/submarine-sdk/pysubmarine/submarine/experiment/models/code_spec.py index b394a79..7588024 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/code_spec.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/code_spec.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/environment_spec.py b/submarine-sdk/pysubmarine/submarine/experiment/models/environment_spec.py index 68f151f..5cb693c 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/environment_spec.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/environment_spec.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_meta.py b/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_meta.py index 8e91a6f..3ba840e 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_meta.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_meta.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_spec.py b/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_spec.py index de480a8..756469e 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_spec.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_spec.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_task_spec.py b/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_task_spec.py index 2b89813..3e9d5e4 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_task_spec.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/experiment_task_spec.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/json_response.py b/submarine-sdk/pysubmarine/submarine/experiment/models/json_response.py index 625b508..488083e 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/json_response.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/json_response.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/models/kernel_spec.py b/submarine-sdk/pysubmarine/submarine/experiment/models/kernel_spec.py index 79124b8..7f0737a 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/models/kernel_spec.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/models/kernel_spec.py @@ -20,7 +20,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-sdk/pysubmarine/submarine/experiment/rest.py b/submarine-sdk/pysubmarine/submarine/experiment/rest.py index 09aefd6..c80f2eb 100644 --- a/submarine-sdk/pysubmarine/submarine/experiment/rest.py +++ b/submarine-sdk/pysubmarine/submarine/experiment/rest.py @@ -19,7 +19,7 @@ The Submarine REST API allows you to create, list, and get experiments. The API is hosted under the /v1/experiment route on the Submarine server. For example, to list experiments on a server hosted at http://localhost:8080, access http://localhost:8080/api/v1/experiment/ # noqa: E501 - The version of the OpenAPI document: 0.6.0-SNAPSHOT + The version of the OpenAPI document: 0.6.0 Contact: dev@submarine.apache.org Generated by: https://openapi-generator.tech """ diff --git a/submarine-security/spark-security/pom.xml b/submarine-security/spark-security/pom.xml index 0a335d0..25b744b 100644 --- a/submarine-security/spark-security/pom.xml +++ b/submarine-security/spark-security/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>submarine</artifactId> <groupId>org.apache.submarine</groupId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/submarine-server/pom.xml b/submarine-server/pom.xml index b17dfc2..8fe83be 100644 --- a/submarine-server/pom.xml +++ b/submarine-server/pom.xml @@ -24,12 +24,12 @@ <parent> <artifactId>submarine</artifactId> <groupId>org.apache.submarine</groupId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>submarine-server</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <packaging>pom</packaging> <name>Submarine: Server</name> diff --git a/submarine-server/server-api/pom.xml b/submarine-server/server-api/pom.xml index 933ff02..34a9c31 100644 --- a/submarine-server/server-api/pom.xml +++ b/submarine-server/server-api/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>submarine-server</artifactId> <groupId>org.apache.submarine</groupId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/submarine-server/server-core/pom.xml b/submarine-server/server-core/pom.xml index 70863d7..7be01e8 100644 --- a/submarine-server/server-core/pom.xml +++ b/submarine-server/server-core/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>submarine-server</artifactId> <groupId>org.apache.submarine</groupId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/Bootstrap.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/Bootstrap.java index 85d6e1d..c20af90 100644 --- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/Bootstrap.java +++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/Bootstrap.java @@ -50,7 +50,7 @@ public class Bootstrap extends HttpServlet { .termsOfService("http://swagger.io/terms/") .contact(new Contact() .email("dev@submarine.apache.org")) - .version("0.6.0-SNAPSHOT") + .version("0.6.0") .license(new License() .name("Apache 2.0") .url("http://www.apache.org/licenses/LICENSE-2.0.html")); diff --git a/submarine-server/server-rpc/pom.xml b/submarine-server/server-rpc/pom.xml index a7ce5ad..0c1c80e 100644 --- a/submarine-server/server-rpc/pom.xml +++ b/submarine-server/server-rpc/pom.xml @@ -24,12 +24,12 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-server</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>submarine-server-rpc</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Server RPC</name> <dependencies> diff --git a/submarine-server/server-submitter/pom.xml b/submarine-server/server-submitter/pom.xml index 0673ec1..f1f28cc 100644 --- a/submarine-server/server-submitter/pom.xml +++ b/submarine-server/server-submitter/pom.xml @@ -24,12 +24,12 @@ <parent> <artifactId>submarine-server</artifactId> <groupId>org.apache.submarine</groupId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>submarine-server-submitter</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <packaging>pom</packaging> <name>Submarine: Submitter</name> diff --git a/submarine-server/server-submitter/submitter-k8s/pom.xml b/submarine-server/server-submitter/submitter-k8s/pom.xml index 47997b3..7910527 100644 --- a/submarine-server/server-submitter/submitter-k8s/pom.xml +++ b/submarine-server/server-submitter/submitter-k8s/pom.xml @@ -24,12 +24,12 @@ <parent> <artifactId>submarine-server-submitter</artifactId> <groupId>org.apache.submarine</groupId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>submarine-submitter-k8s</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Kubernetes Submitter</name> <dependencies> diff --git a/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/parser/ServeSpecParser.java b/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/parser/ServeSpecParser.java index 875aaff..f9aa048 100644 --- a/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/parser/ServeSpecParser.java +++ b/submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/parser/ServeSpecParser.java @@ -88,11 +88,11 @@ public class ServeSpecParser { public V1Deployment getDeployment() { // Container related // TODO(byronhsu) This should not be hard-coded. - final String serveImage = - "apache/submarine:serve-0.6.0-SNAPSHOT"; + final String serveImage = + "apache/submarine:serve-0.6.0"; ArrayList<String> cmds = new ArrayList<>( - Arrays.asList("mlflow", "models", "serve", + Arrays.asList("mlflow", "models", "serve", "--model-uri", modelURI, "--host", "0.0.0.0") ); @@ -101,7 +101,7 @@ public class ServeSpecParser { V1ObjectMeta deploymentMetedata = new V1ObjectMeta(); deploymentMetedata.setName(generalName); deployment.setMetadata(deploymentMetedata); - + V1DeploymentSpec deploymentSpec = new V1DeploymentSpec(); deploymentSpec.setSelector( new V1LabelSelector().matchLabels(Collections.singletonMap("app", podName)) // match the template @@ -124,7 +124,7 @@ public class ServeSpecParser { new V1Probe().httpGet(new V1HTTPGetAction().path("/ping").port(new IntOrString(PORT))) ); - + deploymentTemplatePodSpec.addContainersItem(container); deploymentTemplateSpec.setSpec(deploymentTemplatePodSpec); deploymentSpec.setTemplate(deploymentTemplateSpec); @@ -166,11 +166,11 @@ public class ServeSpecParser { specRoute.setServices(new HashSet<Map<String, Object>>() {{ add(service); }}); - + Map<String, String> middleware = new HashMap<String, String>() {{ put("name", middlewareName); }}; - + specRoute.setMiddlewares(new HashSet<Map<String, String>>() {{ add(middleware); }}); @@ -186,7 +186,7 @@ public class ServeSpecParser { public Middlewares getMiddlewares() { Middlewares middleware = new Middlewares(); middleware.setMetadata(new V1ObjectMeta().name(middlewareName).namespace(namespace)); - + MiddlewaresSpec middlewareSpec = new MiddlewaresSpec().stripPrefix( new StripPrefix().prefixes(Arrays.asList(routePath)) ); diff --git a/submarine-server/server-submitter/submitter-yarn/pom.xml b/submarine-server/server-submitter/submitter-yarn/pom.xml index 7c2ff49..b9602de 100644 --- a/submarine-server/server-submitter/submitter-yarn/pom.xml +++ b/submarine-server/server-submitter/submitter-yarn/pom.xml @@ -20,12 +20,12 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-server-submitter</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>submarine-submitter-yarn</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: YARN Submitter</name> <dependencies> <dependency> diff --git a/submarine-server/server-submitter/submitter-yarnservice/pom.xml b/submarine-server/server-submitter/submitter-yarnservice/pom.xml index 1f9b2ea..fe31ca9 100644 --- a/submarine-server/server-submitter/submitter-yarnservice/pom.xml +++ b/submarine-server/server-submitter/submitter-yarnservice/pom.xml @@ -25,11 +25,11 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-server-submitter</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <artifactId>submarine-submitter-yarnservice</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: YARN Service Submitter</name> <properties> diff --git a/submarine-test/pom.xml b/submarine-test/pom.xml index 590a2ee..29f8821 100644 --- a/submarine-test/pom.xml +++ b/submarine-test/pom.xml @@ -25,10 +25,10 @@ <parent> <artifactId>submarine</artifactId> <groupId>org.apache.submarine</groupId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <artifactId>submarine-test</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Test</name> <packaging>pom</packaging> diff --git a/submarine-test/test-e2e/pom.xml b/submarine-test/test-e2e/pom.xml index e154195..bc14fbe 100644 --- a/submarine-test/test-e2e/pom.xml +++ b/submarine-test/test-e2e/pom.xml @@ -25,11 +25,11 @@ <parent> <artifactId>submarine-test</artifactId> <groupId>org.apache.submarine</groupId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <artifactId>submarine-test-e2e</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: E2E Test</name> <properties> diff --git a/submarine-test/test-k8s/pom.xml b/submarine-test/test-k8s/pom.xml index 96a2db5..6489b79 100644 --- a/submarine-test/test-k8s/pom.xml +++ b/submarine-test/test-k8s/pom.xml @@ -25,11 +25,11 @@ <parent> <artifactId>submarine-test</artifactId> <groupId>org.apache.submarine</groupId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> </parent> <artifactId>submarine-test-k8s</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Kubernetes Test</name> <properties> diff --git a/submarine-workbench/interpreter/interpreter-core/pom.xml b/submarine-workbench/interpreter/interpreter-core/pom.xml index c4f53c0..ba92697 100644 --- a/submarine-workbench/interpreter/interpreter-core/pom.xml +++ b/submarine-workbench/interpreter/interpreter-core/pom.xml @@ -26,12 +26,12 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-interpreter</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>submarine-interpreter-core</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Interpreter Core</name> <description>Submarine Interpreter Core</description> diff --git a/submarine-workbench/interpreter/pom.xml b/submarine-workbench/interpreter/pom.xml index e05ec7d..758deb3 100644 --- a/submarine-workbench/interpreter/pom.xml +++ b/submarine-workbench/interpreter/pom.xml @@ -26,12 +26,12 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-workbench</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>submarine-interpreter</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <packaging>pom</packaging> <name>Submarine: Interpreter</name> <description>Submarine Interpreter Parent</description> diff --git a/submarine-workbench/interpreter/python-interpreter/pom.xml b/submarine-workbench/interpreter/python-interpreter/pom.xml index 48ceee4..c4649f9 100644 --- a/submarine-workbench/interpreter/python-interpreter/pom.xml +++ b/submarine-workbench/interpreter/python-interpreter/pom.xml @@ -26,12 +26,12 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-interpreter</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>submarine-python-interpreter</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Interpreter Python</name> <description>Submarine Python Interpreter</description> diff --git a/submarine-workbench/interpreter/spark-interpreter/pom.xml b/submarine-workbench/interpreter/spark-interpreter/pom.xml index 3bbd5fa..8716668 100644 --- a/submarine-workbench/interpreter/spark-interpreter/pom.xml +++ b/submarine-workbench/interpreter/spark-interpreter/pom.xml @@ -26,12 +26,12 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-interpreter</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>submarine-spark-interpreter</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Interpreter Spark</name> <description>Submarine spark Interpreter</description> diff --git a/submarine-workbench/pom.xml b/submarine-workbench/pom.xml index a17a472..c850baa 100644 --- a/submarine-workbench/pom.xml +++ b/submarine-workbench/pom.xml @@ -26,12 +26,12 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>submarine-workbench</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <packaging>pom</packaging> <name>Submarine: Workbench</name> <description>Submarine Workbench</description> diff --git a/submarine-workbench/workbench-web/pom.xml b/submarine-workbench/workbench-web/pom.xml index b18a809..1cd4086 100644 --- a/submarine-workbench/workbench-web/pom.xml +++ b/submarine-workbench/workbench-web/pom.xml @@ -25,14 +25,14 @@ <parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-workbench</artifactId> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.apache.submarine</groupId> <artifactId>submarine-workbench-web</artifactId> <packaging>war</packaging> - <version>0.6.0-SNAPSHOT</version> + <version>0.6.0</version> <name>Submarine: Workbench Web Angular</name> <!-- See https://github.com/eirslett/frontend-maven-plugin/issues/229 --> diff --git a/website/docs/userDocs/api/environment.md b/website/docs/userDocs/api/environment.md index 851024b..1e07905 100644 --- a/website/docs/userDocs/api/environment.md +++ b/website/docs/userDocs/api/environment.md @@ -61,13 +61,13 @@ curl -X POST -H "Content-Type: application/json" -d ' "kernelSpec" : { "name" : "team_default_python_3.7", "channels" : ["defaults"], - "condaDependencies" : + "condaDependencies" : ["_ipyw_jlab_nb_ext_conf=0.1.0=py37_0", "alabaster=0.7.12=py37_0", "anaconda=2020.02=py37_0", "anaconda-client=1.7.2=py37_0", "anaconda-navigator=1.9.12=py37_0"], - "pipDependencies" : + "pipDependencies" : ["apache-submarine==0.5.0", "pyarrow==0.17.0"] } @@ -136,7 +136,7 @@ curl -X GET http://127.0.0.1:32080/api/v1/environment "environmentId":"environment_1600862964725_0002", "environmentSpec":{ "name":"notebook-gpu-env", - "dockerImage":"apache/submarine:jupyter-notebook-gpu-0.6.0-SNAPSHOT", + "dockerImage":"apache/submarine:jupyter-notebook-gpu-0.6.0", "kernelSpec":{ "name":"submarine_jupyter_py3", "channels":["defaults"], @@ -173,7 +173,7 @@ curl -X GET http://127.0.0.1:32080/api/v1/environment "environmentId":"environment_1600862964725_0001", "environmentSpec":{ "name":"notebook-env", - "dockerImage":"apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT", + "dockerImage":"apache/submarine:jupyter-notebook-0.6.0", "kernelSpec":{ "name":"submarine_jupyter_py3", "channels":["defaults"], @@ -184,7 +184,7 @@ curl -X GET http://127.0.0.1:32080/api/v1/environment "image":null } } - ], + ], "attributes":{} } ``` @@ -270,10 +270,10 @@ curl -X PATCH -H "Content-Type: application/json" -d ' "kernelSpec" : { "name" : "team_default_python_3.7_updated", "channels" : ["defaults"], - "condaDependencies" : + "condaDependencies" : ["_ipyw_jlab_nb_ext_conf=0.1.0=py37_0", "alabaster=0.7.12=py37_0"], - "pipDependencies" : + "pipDependencies" : [] } } diff --git a/website/docs/userDocs/api/notebook.md b/website/docs/userDocs/api/notebook.md index 1c9eb43..f132af2 100644 --- a/website/docs/userDocs/api/notebook.md +++ b/website/docs/userDocs/api/notebook.md @@ -108,7 +108,7 @@ curl -X POST -H "Content-Type: application/json" -d ' }, "environment":{ "name":"notebook-env", - "dockerImage":"apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT", + "dockerImage":"apache/submarine:jupyter-notebook-0.6.0", "kernelSpec":{ "name":"submarine_jupyter_py3", "channels":["defaults"], @@ -174,7 +174,7 @@ curl -X GET http://127.0.0.1:32080/api/v1/notebook?id=e9ca23d68d884d4ebb19d07889 }, "environment":{ "name":"notebook-env", - "dockerImage":"apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT", + "dockerImage":"apache/submarine:jupyter-notebook-0.6.0", "kernelSpec":{ "name":"submarine_jupyter_py3", "channels":["defaults"], @@ -239,7 +239,7 @@ curl -X GET http://127.0.0.1:32080/api/v1/notebook/notebook_1626160071451_0001 }, "environment":{ "name":"notebook-env", - "dockerImage":"apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT", + "dockerImage":"apache/submarine:jupyter-notebook-0.6.0", "kernelSpec":{ "name":"submarine_jupyter_py3", "channels":["defaults"], @@ -304,7 +304,7 @@ curl -X DELETE http://127.0.0.1:32080/api/v1/notebook/notebook_1626160071451_000 }, "environment":{ "name":"notebook-env", - "dockerImage":"apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT", + "dockerImage":"apache/submarine:jupyter-notebook-0.6.0", "kernelSpec":{ "name":"submarine_jupyter_py3", "channels":["defaults"], diff --git a/website/versioned_docs/version-0.6.0/userDocs/api/environment.md b/website/versioned_docs/version-0.6.0/userDocs/api/environment.md index 851024b..1e07905 100644 --- a/website/versioned_docs/version-0.6.0/userDocs/api/environment.md +++ b/website/versioned_docs/version-0.6.0/userDocs/api/environment.md @@ -61,13 +61,13 @@ curl -X POST -H "Content-Type: application/json" -d ' "kernelSpec" : { "name" : "team_default_python_3.7", "channels" : ["defaults"], - "condaDependencies" : + "condaDependencies" : ["_ipyw_jlab_nb_ext_conf=0.1.0=py37_0", "alabaster=0.7.12=py37_0", "anaconda=2020.02=py37_0", "anaconda-client=1.7.2=py37_0", "anaconda-navigator=1.9.12=py37_0"], - "pipDependencies" : + "pipDependencies" : ["apache-submarine==0.5.0", "pyarrow==0.17.0"] } @@ -136,7 +136,7 @@ curl -X GET http://127.0.0.1:32080/api/v1/environment "environmentId":"environment_1600862964725_0002", "environmentSpec":{ "name":"notebook-gpu-env", - "dockerImage":"apache/submarine:jupyter-notebook-gpu-0.6.0-SNAPSHOT", + "dockerImage":"apache/submarine:jupyter-notebook-gpu-0.6.0", "kernelSpec":{ "name":"submarine_jupyter_py3", "channels":["defaults"], @@ -173,7 +173,7 @@ curl -X GET http://127.0.0.1:32080/api/v1/environment "environmentId":"environment_1600862964725_0001", "environmentSpec":{ "name":"notebook-env", - "dockerImage":"apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT", + "dockerImage":"apache/submarine:jupyter-notebook-0.6.0", "kernelSpec":{ "name":"submarine_jupyter_py3", "channels":["defaults"], @@ -184,7 +184,7 @@ curl -X GET http://127.0.0.1:32080/api/v1/environment "image":null } } - ], + ], "attributes":{} } ``` @@ -270,10 +270,10 @@ curl -X PATCH -H "Content-Type: application/json" -d ' "kernelSpec" : { "name" : "team_default_python_3.7_updated", "channels" : ["defaults"], - "condaDependencies" : + "condaDependencies" : ["_ipyw_jlab_nb_ext_conf=0.1.0=py37_0", "alabaster=0.7.12=py37_0"], - "pipDependencies" : + "pipDependencies" : [] } } diff --git a/website/versioned_docs/version-0.6.0/userDocs/api/notebook.md b/website/versioned_docs/version-0.6.0/userDocs/api/notebook.md index 1c9eb43..f132af2 100644 --- a/website/versioned_docs/version-0.6.0/userDocs/api/notebook.md +++ b/website/versioned_docs/version-0.6.0/userDocs/api/notebook.md @@ -108,7 +108,7 @@ curl -X POST -H "Content-Type: application/json" -d ' }, "environment":{ "name":"notebook-env", - "dockerImage":"apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT", + "dockerImage":"apache/submarine:jupyter-notebook-0.6.0", "kernelSpec":{ "name":"submarine_jupyter_py3", "channels":["defaults"], @@ -174,7 +174,7 @@ curl -X GET http://127.0.0.1:32080/api/v1/notebook?id=e9ca23d68d884d4ebb19d07889 }, "environment":{ "name":"notebook-env", - "dockerImage":"apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT", + "dockerImage":"apache/submarine:jupyter-notebook-0.6.0", "kernelSpec":{ "name":"submarine_jupyter_py3", "channels":["defaults"], @@ -239,7 +239,7 @@ curl -X GET http://127.0.0.1:32080/api/v1/notebook/notebook_1626160071451_0001 }, "environment":{ "name":"notebook-env", - "dockerImage":"apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT", + "dockerImage":"apache/submarine:jupyter-notebook-0.6.0", "kernelSpec":{ "name":"submarine_jupyter_py3", "channels":["defaults"], @@ -304,7 +304,7 @@ curl -X DELETE http://127.0.0.1:32080/api/v1/notebook/notebook_1626160071451_000 }, "environment":{ "name":"notebook-env", - "dockerImage":"apache/submarine:jupyter-notebook-0.6.0-SNAPSHOT", + "dockerImage":"apache/submarine:jupyter-notebook-0.6.0", "kernelSpec":{ "name":"submarine_jupyter_py3", "channels":["defaults"], --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@submarine.apache.org For additional commands, e-mail: dev-h...@submarine.apache.org