improvment: mysql connection string for sqlalchemy. (#175)

* improvment: mysql connection string for sqlalchemy. Using mysql+pymysql: scheme for SQLALCHEMY_DATABASE_URI. And then install mysqlclient is not needed for mishards. Signed-off-by: Ji Bin <[email protected]> * Upgrade version to 1.1.1 Signed-off-by: Ji Bin <[email protected]>
zilliztech · May 27, 2021 · 9168914 · 9168914
1 parent 022f469
commit 9168914
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/charts/milvus/Chart.yaml b/charts/milvus/Chart.yaml
@@ -3,7 +3,7 @@ name: milvus
 appVersion: "1.1.0"
 kubeVersion: "^1.10.0-0"
 description: Milvus is an open source similarity search engine for massive-scalefeature vectors.
-version: 1.1.0
+version: 1.1.1
 keywords:
   - milvus
   - elastic

diff --git a/charts/milvus/templates/_helpers.tpl b/charts/milvus/templates/_helpers.tpl
@@ -90,6 +90,7 @@ Create the name of the service account to use for the mishards component
 {{- end -}}
 {{- end -}}
 
+
 {{/* Milvus backend URL */}}
 {{- define "milvus.mysqlURI" -}}
 {{- if .Values.externalMysql.enabled -}}
@@ -99,6 +100,14 @@ mysql://root:{{ .Values.mysql.mysqlRootPassword }}@{{ .Release.Name }}-mysql:330
 {{- end -}}
 {{- end -}}
 
+{{- define "milvus.mysqlURISqlalchemy" -}}
+{{- if .Values.externalMysql.enabled -}}
+mysql+pymysql://{{ .Values.externalMysql.user }}:{{ .Values.externalMysql.password }}@{{ .Values.externalMysql.ip }}:{{ .Values.externalMysql.port }}/{{ .Values.externalMysql.database }}
+{{- else -}}
+mysql+pymysql://root:{{ .Values.mysql.mysqlRootPassword }}@{{ .Release.Name }}-mysql:3306/{{ .Values.mysql.mysqlDatabase }}
+{{- end -}}
+{{- end -}}
+
 {{- define "milvus.sqliteURI" -}}
 sqlite://:@:/
 {{- end -}}
diff --git a/charts/milvus/templates/_mishards_config.tpl b/charts/milvus/templates/_mishards_config.tpl
@@ -3,7 +3,7 @@
 MAX_WORKERS={{ .Values.mishards.maxWorkers }}
 
 {{- if or .Values.mysql.enabled .Values.externalMysql.enabled }}
-SQLALCHEMY_DATABASE_URI={{ template "milvus.mysqlURI" . }}
+SQLALCHEMY_DATABASE_URI={{ template "milvus.mysqlURISqlalchemy" . }}
 {{- else }}
 SQLALCHEMY_DATABASE_URI={{ template "milvus.sqliteURI" . }}
 {{- end }}
@@ -34,4 +34,4 @@ TRACING_REPORTING_HOST={{ .Values.mishards.trace.tracingReportingHost }}
 TRACING_REPORTING_PORT={{ .Values.mishards.trace.tracingReportingPort }}
 {{- end -}}
 
-{{- end -}}
+{{- end -}}
diff --git a/charts/milvus/templates/mishards-deployment.yaml b/charts/milvus/templates/mishards-deployment.yaml
@@ -52,7 +52,7 @@ spec:
         - 'sh'
         - '-c'
         - >
-            pip install mysqlclient && python mishards/main.py
+          python mishards/main.py
         ports:
           - name: mishards
             containerPort: 19530