Skip to content
This repository has been archived by the owner on Jul 10, 2024. It is now read-only.

Commit

Permalink
migrate create bucket to init container
Browse files Browse the repository at this point in the history
  • Loading branch information
jeff-901 committed Sep 15, 2021
1 parent d65f9de commit 57fdeb6
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 69 deletions.
6 changes: 0 additions & 6 deletions bin/submarine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,4 @@ if [[ ! -d "${SUBMARINE_LOG_DIR}" ]]; then
$(mkdir -p "${SUBMARINE_LOG_DIR}")
fi

/usr/local/bin/create_bucket.sh
if [ $? -ne 0 ];then
echo "Create submarine bucket fail"
exit 1
fi

exec $JAVA_RUNNER $JAVA_OPTS -cp ${SUBMARINE_SERVER_CLASSPATH} ${SUBMARINE_SERVER_MAIN} "$@" | tee -a "${SUBMARINE_SERVER_LOGFILE}" 2>&1
2 changes: 0 additions & 2 deletions dev-support/docker-images/mlflow/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ COPY start.sh /usr/local/bin

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://submarine-minio-service:9000
ENV AWS_ACCESS_KEY_ID submarine_minio
ENV AWS_SECRET_ACCESS_KEY submarine_minio
Expand Down
20 changes: 0 additions & 20 deletions dev-support/docker-images/mlflow/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,8 @@

set -euo pipefail

# Check if the bucket "minio/mlflow" already exists
check_minio_mlflow_bucket_exists() {
if /bin/bash -c "./mc ls minio/mlflow" >/dev/null 2>&1; then
true
else
false
fi
}

MLFLOW_S3_ENDPOINT_URL="http://submarine-minio-service:9000"
AWS_ACCESS_KEY_ID="submarine_minio"
AWS_SECRET_ACCESS_KEY="submarine_minio"
BACKEND_URI="mysql+pymysql://mlflow:password@submarine-database:3306/mlflowdb"
DEFAULT_ARTIFACT_ROOT="s3://mlflow"
STATIC_PREFIX="/mlflow"

/bin/bash -c "sleep 60; ./mc config host add minio ${MLFLOW_S3_ENDPOINT_URL} ${AWS_ACCESS_KEY_ID} ${AWS_SECRET_ACCESS_KEY}"

if ! check_minio_mlflow_bucket_exists; then
/bin/bash -c "./mc mb minio/mlflow"
else
echo "Bucket minio/mlflow already exists, skipping creation."
fi

/bin/bash -c "mlflow server --host 0.0.0.0 --backend-store-uri ${BACKEND_URI} --default-artifact-root ${DEFAULT_ARTIFACT_ROOT} --static-prefix ${STATIC_PREFIX}"
6 changes: 0 additions & 6 deletions dev-support/docker-images/submarine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@ ADD ./tmp/submarine-site.xml "/opt/submarine-current/conf/"
ADD ./tmp/submarine.sh "/opt/submarine-current/bin/"
ADD ./tmp/mysql-connector-java-5.1.39.jar "/opt/submarine-current/lib/"

# Create submarine Bucket
WORKDIR /usr/local/bin
RUN wget https://dl.min.io/client/mc/release/linux-amd64/mc && chmod +x mc
RUN wget https://dl.k8s.io/release/v1.15.11/bin/linux/amd64/kubectl && chmod +x kubectl
COPY create_bucket.sh /usr/local/bin

WORKDIR /opt/submarine-current

# Submarine port
Expand Down
35 changes: 0 additions & 35 deletions dev-support/docker-images/submarine/create_bucket.sh

This file was deleted.

13 changes: 13 additions & 0 deletions helm-charts/submarine/templates/submarine-mlflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,19 @@ spec:
labels:
app: submarine-mlflow-pod
spec:
initContainers:
- name: submarine-mlflow-initcontainer
image: "minio/mc"
command: ["sh", "-c",
"if ! /bin/bash -c 'mc config host add minio http://submarine-minio-service:9000
submarine_minio submarine_minio' 2>&1; then
exit 1;
fi;
if /bin/bash -c 'mc ls minio/mlflow' >/dev/null 2>&1; then
echo 'Bucket minio/mlflow already exists, skipping creation.';
else
/bin/bash -c 'mc mb minio/mlflow';
fi;"]
containers:
- name: submarine-mlflow-container
image: apache/submarine:mlflow-0.6.0-SNAPSHOT
Expand Down
13 changes: 13 additions & 0 deletions helm-charts/submarine/templates/submarine-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,19 @@ spec:
{{ end }}
spec:
serviceAccountName: "{{ .Values.submarine.server.name }}"
initContainers:
- name: submarine-server-initcontainer
image: "minio/mc"
command: ["sh", "-c",
"if ! /bin/bash -c 'mc config host add minio http://submarine-minio-service:9000
submarine_minio submarine_minio' 2>&1; then
exit 1;
fi;
if /bin/bash -c 'mc ls minio/submarine' >/dev/null 2>&1; then
echo 'Bucket minio/submarine already exists, skipping creation.';
else
/bin/bash -c 'mc mb minio/submarine';
fi;"]
containers:
- name: "{{ .Values.submarine.server.name }}"
env:
Expand Down

0 comments on commit 57fdeb6

Please sign in to comment.