Merge branch 'apache:master' into SUBMARINE-1207

dev-support/mini-submarine/README.md

@@ -23,7 +23,7 @@ This is a docker image built for submarine development and quick start test.
 ### Use the image we provide
 
 ```
-docker pull apache/submarine:mini-0.5.0
+docker pull apache/submarine:mini-0.6.0
 ```
 
 ### Create image by yourself
@@ -66,8 +66,8 @@ export submarine_version=0.7.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.7.0 /bin/bash
-docker tag local/mini-submarine:0.7.0 apache/mini-submarine:0.7.0:RC0
-docker push apache/mini-submarine:0.7.0:RC0
+docker tag local/mini-submarine:0.7.0 apache/mini-submarine:0.7.0-RC0
+docker push apache/mini-submarine:0.7.0-RC0
 ```
 In the container, we can verify that the submarine jar version is the expected 0.7.0. Then we can upload this image with a "RC" tag for a vote.
 

helm-charts/submarine/Chart.yaml

@@ -16,7 +16,7 @@
 #
 
 apiVersion: v2
-appVersion: "0.5.0"
+appVersion: "0.7.0"
 description: Submarine is Cloud Native Machine Learning Platform.
 name: submarine
 version: 0.7.0

helm-charts/submarine/charts/notebook-controller/Chart.yaml

@@ -34,4 +34,4 @@ version: 0.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 1.0.0
+appVersion: 1.1.0

helm-charts/submarine/charts/pytorchjob/Chart.yaml

@@ -35,4 +35,4 @@ version: 0.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 1.0.0
+appVersion: 1.1.0

helm-charts/submarine/charts/tfjob/Chart.yaml

@@ -35,4 +35,4 @@ version: 0.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 1.0.0
+appVersion: 1.1.0

submarine-server/server-submitter/submitter-k8s/src/main/java/org/apache/submarine/server/submitter/k8s/K8sSubmitter.java

@@ -25,6 +25,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 
@@ -263,11 +264,11 @@ public Experiment createExperiment(ExperimentSpec spec) throws SubmarineRuntimeE
       mlJob.getMetadata().setNamespace(getServerNamespace());
       mlJob.getMetadata().setOwnerReferences(OwnerReferenceUtils.getOwnerReference());
       AgentPod agentPod = new AgentPod(getServerNamespace(), spec.getMeta().getName(),
-              mlJob.getPlural().equals(TFJob.CRD_TF_PLURAL_V1) 
+              mlJob.getPlural().equals(TFJob.CRD_TF_PLURAL_V1)
               ? CustomResourceType.TFJob : CustomResourceType.PyTorchJob,
               spec.getMeta().getExperimentId());
-            
-      
+
+
       Object object = mlJob.getPlural().equals(TFJob.CRD_TF_PLURAL_V1)
               ? tfJobClient.create(getServerNamespace(), (TFJob) mlJob,
                       new CreateOptions()).throwsApiException().getObject()
@@ -440,9 +441,10 @@ public MlflowInfo getMlflowInfo() throws SubmarineRuntimeException {
     }
   }
 
-  public Info getInfo(String name, String ingressRouteName) throws ApiException{
+  public Info getInfo(String name, String ingressRouteName) throws ApiException {
     V1Deployment deploy = appsV1Api.readNamespacedDeploymentStatus(name, getServerNamespace(), "true");
-    boolean available = deploy.getStatus().getAvailableReplicas() > 0; // at least one replica is running
+    boolean available = Optional.ofNullable(deploy.getStatus().getAvailableReplicas())
+            .map(ar -> ar > 0).orElse(false); // at least one replica is running
 
     IngressRoute ingressRoute = new IngressRoute();
     V1ObjectMeta meta = new V1ObjectMeta();

website/docs/gettingStarted/notebook.md

@@ -33,7 +33,7 @@ We recommend using Web UI to manage notebooks.
 Notebooks can be started from the Web UI. You can click the “Notebook” tab in the
 left-hand panel to manage your notebooks.
 
-![](/img/notebook-list.png)
+![](/img/notebook-list-0-7-0.png)
 
 To create a new notebook server, click “New Notebook”. You should see a form for entering
 details of your new notebook server.
@@ -59,11 +59,11 @@ The list of prerequisites for running the NVIDIA device plugin is described belo
 **If you’re not sure which environment you need, please choose the environment “notebook-env”
 for the new notebook.**
 
-![](/img/notebook-form.png)
+![](/img/notebook-form-0-7-0.png)
 
 You should see your new notebook server. Click the name of your notebook server to connect to it.
 
-![](/img/created-notebook.png)
+![](/img/created-notebook-0-7-0.png)
 
 ## Experiment with your notebook
 

website/docs/gettingStarted/quickstart.md

@@ -187,23 +187,23 @@ eval $(minikube docker-env)
 ### 3. Submit the experiment
 
 1. Open submarine workbench and click `+ New Experiment`
-2. Fill the form accordingly. Here we set 3 workers.
+2. Choose `Define your experiment`
+3. Fill the form accordingly. Here we set 3 workers.
 
     1. Step 1
-    ![](/img/quickstart-submit-1.png)
+    ![](/img/quickstart-submit-1-0-7-0.png)
     2. Step 2
-    ![](/img/quickstart-submit-2.png)
+    ![](/img/quickstart-submit-2-0-7-0.png)
     3. Step 3
-    ![](/img/quickstart-submit-3.png)
+    ![](/img/quickstart-submit-3-0-7-0.png)
     4. The experiment is successfully submitted
-    ![](/img/quickstart-submit-4.png)
+    ![](/img/quickstart-submit-4-0-7-0.png)
 
 ### 4. Monitor the process
 
-1. In our code, we use `submarine` from `submarine-sdk` to record the metrics. To see the result, click corresponding experiment with name `quickstart` in the workbench.
+1. In our code, we use `submarine` from `submarine-sdk` to record the metrics. To see the result, click corresponding experiment with name `mnist-example` in the workbench.
 2. To see the metrics of each worker, you can select a worker from the left top list.
 
-![](/img/quickstart-ui-1.png)
-![](/img/quickstart-ui-2.png)
+![](/img/quickstart-ui-0-7-0.png)
 
 ### 5. Serve the model (In development)