You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@submarine.apache.org by by...@apache.org on 2021/06/28 10:10:31 UTC

[submarine] branch master updated: SUBMARINE-860. Replace hard-coded IP address with DNS in Mlflow and minio service

This is an automated email from the ASF dual-hosted git repository.

byronhsu 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 6c04b81  SUBMARINE-860. Replace hard-coded IP address with DNS in Mlflow and minio service
6c04b81 is described below

commit 6c04b814e526a9a5da243fc05122d63df741cd4a
Author: jeff-901 <b0...@ntu.edu.com>
AuthorDate: Fri Jun 25 13:54:28 2021 +0800

    SUBMARINE-860. Replace hard-coded IP address with DNS in Mlflow and minio service
    
    ### What is this PR for?
    Remove hard-coded IP address in helm chart mlflow and minio service.
    Replace hard-coded IP address with DNS for every hard-code IP address reference.
    
    ### What type of PR is it?
    Improvement
    
    ### Todos
    
    ### What is the Jira issue?
    https://issues.apache.org/jira/browse/SUBMARINE-860
    
    ### How should this be tested?
    
    ### 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: jeff-901 <b0...@ntu.edu.com>
    
    Signed-off-by: byronhsu <by...@apache.org>
    
    Closes #611 from jeff-901/SUBMARINE-860 and squashes the following commits:
    
    35f1e945 [jeff-901] for travis
    e0293dea [jeff-901] for travis
    eb0adac5 [jeff-901] edit remain url
    85650f0c [jeff-901] edit mlflow dockerfile s3 url
    ed1cfe28 [jeff-901] delete fix ip
---
 dev-support/docker-images/jupyter-gpu/Dockerfile       | 2 +-
 dev-support/docker-images/jupyter/Dockerfile           | 4 ++--
 dev-support/docker-images/mlflow/Dockerfile            | 4 ++--
 dev-support/docker-images/mlflow/start.sh              | 2 +-
 helm-charts/submarine/templates/submarine-minio.yaml   | 2 +-
 helm-charts/submarine/templates/submarine-mlflow.yaml  | 2 +-
 submarine-sdk/pysubmarine/submarine/models/constant.py | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-support/docker-images/jupyter-gpu/Dockerfile b/dev-support/docker-images/jupyter-gpu/Dockerfile
index 0071d65..ca58f5a 100644
--- a/dev-support/docker-images/jupyter-gpu/Dockerfile
+++ b/dev-support/docker-images/jupyter-gpu/Dockerfile
@@ -19,7 +19,7 @@ ARG NB_USER="jovyan"
 ARG NB_UID="1000"
 ARG NB_PREFIX="/"
 ARG NB_PORT=8888
-ARG MLFLOW_TRACKING_URI="http://10.96.0.3:8080"
+ARG MLFLOW_TRACKING_URI="http://submarine-mlflow-service:5000"
 
 USER root
 
diff --git a/dev-support/docker-images/jupyter/Dockerfile b/dev-support/docker-images/jupyter/Dockerfile
index 6815d1d..f66e4cf 100644
--- a/dev-support/docker-images/jupyter/Dockerfile
+++ b/dev-support/docker-images/jupyter/Dockerfile
@@ -19,7 +19,7 @@ ARG NB_USER="jovyan"
 ARG NB_UID="1000"
 ARG NB_PREFIX="/"
 ARG NB_PORT=8888
-ARG MLFLOW_TRACKING_URI="http://10.96.0.3:5000"
+ARG MLFLOW_TRACKING_URI="http://submarine-mlflow-service:5000"
 
 USER root
 
@@ -116,7 +116,7 @@ RUN pip install numpy==1.19.5 pyqlib==0.6.1
 RUN wget https://raw.githubusercontent.com/microsoft/qlib/main/examples/workflow_by_code.ipynb -P $HOME
 
 
-ENV MLFLOW_S3_ENDPOINT_URL http://10.96.0.4:9000
+ENV MLFLOW_S3_ENDPOINT_URL http://submarine-minio-service:9000
 ENV AWS_ACCESS_KEY_ID submarine_minio
 ENV AWS_SECRET_ACCESS_KEY submarine_minio
 
diff --git a/dev-support/docker-images/mlflow/Dockerfile b/dev-support/docker-images/mlflow/Dockerfile
index b20b8b5..ea000f2 100644
--- a/dev-support/docker-images/mlflow/Dockerfile
+++ b/dev-support/docker-images/mlflow/Dockerfile
@@ -18,7 +18,7 @@ FROM python:3.7.0-slim
 RUN pip install mlflow
 
 RUN apt-get update && apt-get -y install --no-install-recommends default-libmysqlclient-dev libpq-dev build-essential sqlite3 wget
-    
+
 RUN pip install mlflow==1.15.0 sqlalchemy==1.4.11 boto3==1.17.58
 
 COPY start.sh /usr/local/bin
@@ -27,7 +27,7 @@ WORKDIR /usr/local/bin
 
 RUN wget https://dl.min.io/client/mc/release/linux-amd64/mc && chmod +x mc
 
-ENV MLFLOW_S3_ENDPOINT_URL http://10.96.0.4:9000
+ENV MLFLOW_S3_ENDPOINT_URL http://submarine-minio-service:9000
 ENV AWS_ACCESS_KEY_ID submarine_minio
 ENV AWS_SECRET_ACCESS_KEY submarine_minio
 ENV BACKEND_URI sqlite:///store.db
diff --git a/dev-support/docker-images/mlflow/start.sh b/dev-support/docker-images/mlflow/start.sh
index 9849052..4e9e8c3 100755
--- a/dev-support/docker-images/mlflow/start.sh
+++ b/dev-support/docker-images/mlflow/start.sh
@@ -30,7 +30,7 @@ check_minio_mlflow_bucket_exists() {
     fi
 }
 
-MLFLOW_S3_ENDPOINT_URL="http://10.96.0.4:9000"
+MLFLOW_S3_ENDPOINT_URL="http://submarine-minio-service:9000"
 AWS_ACCESS_KEY_ID="submarine_minio"
 AWS_SECRET_ACCESS_KEY="submarine_minio"
 BACKEND_URI="sqlite:///store.db"
diff --git a/helm-charts/submarine/templates/submarine-minio.yaml b/helm-charts/submarine/templates/submarine-minio.yaml
index 8490919..d61da3a 100644
--- a/helm-charts/submarine/templates/submarine-minio.yaml
+++ b/helm-charts/submarine/templates/submarine-minio.yaml
@@ -90,7 +90,7 @@ kind: Service
 metadata:
   name: submarine-minio-service
 spec:
-  clusterIP: 10.96.0.4
+  type: ClusterIP
   selector:
     app: submarine-minio-pod
   ports:
diff --git a/helm-charts/submarine/templates/submarine-mlflow.yaml b/helm-charts/submarine/templates/submarine-mlflow.yaml
index bd90a60..8dd4868 100644
--- a/helm-charts/submarine/templates/submarine-mlflow.yaml
+++ b/helm-charts/submarine/templates/submarine-mlflow.yaml
@@ -82,7 +82,7 @@ kind: Service
 metadata:
   name: submarine-mlflow-service
 spec:
-  clusterIP: 10.96.0.3
+  type: ClusterIP
   selector:
     app: submarine-mlflow-pod
   ports:
diff --git a/submarine-sdk/pysubmarine/submarine/models/constant.py b/submarine-sdk/pysubmarine/submarine/models/constant.py
index d0d7843..a9c876e 100644
--- a/submarine-sdk/pysubmarine/submarine/models/constant.py
+++ b/submarine-sdk/pysubmarine/submarine/models/constant.py
@@ -15,7 +15,7 @@
  under the License.
 """
 
-MLFLOW_S3_ENDPOINT_URL = "http://10.96.0.4:9000"
+MLFLOW_S3_ENDPOINT_URL = "http://submarine-minio-service:9000"
 AWS_ACCESS_KEY_ID = "submarine_minio"
 AWS_SECRET_ACCESS_KEY = "submarine_minio"
-MLFLOW_TRACKING_URI = "http://10.96.0.3:5000"
+MLFLOW_TRACKING_URI = "http://submarine-mlflow-service:5000"

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@submarine.apache.org
For additional commands, e-mail: dev-help@submarine.apache.org