Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d1a9ef8
feat(di-trainer/di-jobmonitor/di-lcm/di-cli):
renzhe-li Apr 6, 2022
7ef0b56
feat(appconns/dss-mlflow-appconn): Add MLFlow Appconn
James23Wang Apr 6, 2022
5898faf
"feat(appconns/dss-mlss-appconn): Add MLSS Appconn
hexudong111 Apr 6, 2022
cc5aa2a
feat(mf): Add Model Factory Module
bleachzk Apr 6, 2022
4ebbe3d
feat(isntall): Update install file
alexzyWu Apr 6, 2022
3e9746c
feat(isntall): Update install file
alexzyWu Apr 6, 2022
bd8b620
Merge pull request #46 from alexzyWu/master
alexzyWu Apr 6, 2022
c0b7652
docs(docs): Update docs module
alexzyWu Apr 6, 2022
444d2ce
feat(mllabis): Add resource modification and release
alexzyWu Apr 6, 2022
d691742
1.add
uuarttt Apr 6, 2022
e07d105
Merge pull request #48 from hanwutian/master
alexzyWu Apr 6, 2022
33b87f6
Merge pull request #47 from alexzyWu/mllabis-resource-control-feature
alexzyWu Apr 6, 2022
268f286
Merge pull request #45 from bleachzk/master
alexzyWu Apr 6, 2022
3119e8c
Merge pull request #44 from hexudong111/master
alexzyWu Apr 6, 2022
d42fd7e
Merge pull request #42 from James23Wang/dev
alexzyWu Apr 6, 2022
d0f5db6
Merge pull request #43 from renzhe-li/dev
alexzyWu Apr 6, 2022
f8ef67e
Merge branch 'WeBankFinTech:dev-0.3.0' into dev-0.3.0
alexzyWu Apr 7, 2022
a218e8c
fix(mllabis): Remove parameter limit in notebook creation
alexzyWu Apr 7, 2022
191b003
Merge pull request #50 from alexzyWu/mllabis-parameter-limit
alexzyWu Apr 7, 2022
f61b3e8
fix(ui): update ui
alexzyWu Apr 7, 2022
9263079
fix(ui): Remove output in UI
alexzyWu Apr 7, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(isntall): Update install file
1、Add Model Factory Deployment in prophecis helm chart.
2、Add Log Collector yaml and helm chart.
3、Add prophecis sql script.
  • Loading branch information
alexzyWu committed Apr 6, 2022
commit 4ebbe3dd3d12517ef05efefaa51775f4865600c9
94 changes: 94 additions & 0 deletions install/Prophecis/templates/mf/mf-configmap.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: mf-config
namespace: {{.Values.namespace}}
data:
config.yml: |
DBConfig:
server: {{.Values.db.server}}
database: {{.Values.db.name}}
username: {{.Values.db.user}}
password: {{.Values.db.pwd}}
port: {{.Values.db.port}}
ServerConfig:
CaCertPath: /etc/mlss/server.crt
CCAddress: {{.Values.mf.CCAddress}}
namespace: {{.Values.namespace}}
port: {{.Values.mf.service.targetPort}}
ResourceConfig:
containerEngineCpu: {{.Values.mf.containerEngineCpu}}
containerEngineMemory: {{.Values.mf.containerEngineMemory}}
containerEngineGpu: {{.Values.mf.containerEngineGpu}}
istioSideCarCpu: {{.Values.mf.istioSideCarCpu}}
istioSideCarMemory: {{.Values.mf.istioSideCarMemory}}
istioSideCarGpu: {{.Values.mf.istioSideCarGpu}}
StorerConfig:
platformNamespace: {{.Values.storage.platformNamespace}}
storerTls: {{.Values.storage.storageTls}}
storerServerEnvName: {{.Values.storage.storerEnvServerName}}
storerServerName: {{.Values.storage.storerServerName}}
storerCA: {{.Values.storage.storerCA}}
server.crt: |
-----BEGIN CERTIFICATE-----
MIICzDCCAbQCCQCVrtRO5rcr1DANBgkqhkiG9w0BAQUFADAoMQswCQYDVQQGEwJD
TjEZMBcGA1UEAwwQY29udHJvbGNlbnRlci1nbzAeFw0yMDA1MDcxMDUyMzlaFw0z
MDA1MDUxMDUyMzlaMCgxCzAJBgNVBAYTAkNOMRkwFwYDVQQDDBBjb250cm9sY2Vu
dGVyLWdvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy7p22tSPDmN7
a7tRndX7NiEDYv+6mhFwSw/liUCe4rECF6v457eqNlmd+qo1JHYxBMelakFZtSt/
TpcAuz8vRQFmK61qwPruEqg5/S5VtQQNzrGkuOEthOD6+Joepfo1aSiBHl8ec6Fr
vYJkRijaoL3g2w/91Vt1LncrfsaPZBCKZ2epgsCnLYVQogxu/0gKBng9ilsMcBVA
GeAeAPmxW/4I+mO1a342L53A8xZU2RaDXbZsBLucH1ONIhLb7Zja1fUCJi7HRmIL
LfUzgJ62v4tsvZtLRoaA2QA4mEZesIPHeJpgQRmgpD5BmLxX9SHekoLTWqDCAA3z
XnxjHjgkawIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAa3Q0ui/Jqy1h+2DG+yyDf
wtyemM0C9AjZFHiX10bG6EzdRlxX8lk1SJf1oQTnBhMR30FoI3ZyN+N9/uNvLHy+
9zarQT8GiaBJCV4otIZ6V27AeeKaWOFju3ZJUTZ3VlxPRn0qzeIQkNk2Z2HwEPXG
/ppDXqqSpChC7jWRr34ZClwdCiWVN3RL18c02giCJn/FBdLmxyia72Wjhox/zN+N
lnGyr00Jcoj26dwN8bxDmgrmkbJKeVgqUXgys9Hc2Vl1c9jv0NGbrI7YcAxCwHxj
NW/H5Z/FuR0A0ifTo5UgziamPGj0sB/OmZE/TPOSTFsaiM2IudAjwE8S32ihgJzo
-----END CERTIFICATE-----

server.key: |
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEAy7p22tSPDmN7a7tRndX7NiEDYv+6mhFwSw/liUCe4rECF6v4
57eqNlmd+qo1JHYxBMelakFZtSt/TpcAuz8vRQFmK61qwPruEqg5/S5VtQQNzrGk
uOEthOD6+Joepfo1aSiBHl8ec6FrvYJkRijaoL3g2w/91Vt1LncrfsaPZBCKZ2ep
gsCnLYVQogxu/0gKBng9ilsMcBVAGeAeAPmxW/4I+mO1a342L53A8xZU2RaDXbZs
BLucH1ONIhLb7Zja1fUCJi7HRmILLfUzgJ62v4tsvZtLRoaA2QA4mEZesIPHeJpg
QRmgpD5BmLxX9SHekoLTWqDCAA3zXnxjHjgkawIDAQABAoIBAQC+f4gdzT5LZQiG
TyzdGraBAdOp4Zg58m5/MckfUzZ+oKdlPSBMg/f8REYtmrSAeKgTYR+ywJLCjn7H
HPnJHSb1Ln67/rdg5gJxna5DqOzpi3XhvUhau+wVYU4r4ekgqFsDDqXVoXnXA6y8
Es3ysMbmIUa9cDGZLKDhJvub2s0/8XA/bvb2HZUdQUBZMmx/Yw7R3mMDHFL813xr
gs3x/HwWDsqJC8AhOZNaAHHIynnSFSqQ1mjgYA0TVYZWGNASU9fncqKUcFYBFJq2
/O32drjTlTZQse3Mv2EQaVtVuxLrgGV4XTx3q1dsgG7+6IhVg046ffRtSX9o+jqY
fs1oJHzJAoGBAOtrxjjZoNe9tvNlImSU7jeZRJn0X+l2S9AQeKLqV2hjEB5LFscv
kDrR3stsUTuxKZe3ZfI8YUsbR5keCE6wuSdqtxuYtIhjxJq2zNcYrImI+xs7e3Sm
/WUgl5Wenxq0FKxRBMOp5o+sR7V1y2lxW3uxQpj8kc1bL0LTeyrc0fK3AoGBAN2J
edpHi2IxNIBCkkxYXVBAo8NUFHOkYnyeixzf6DySRLOMAx0kog/r0H89fM3xO+a/
3Sls8hptVmbBhtw2YNJQd1HllLQ1Ov1T2NBKs2eVcUSDNrMbjTYbLePK5sotQT7v
i3cdZ+pIGagzCOWZjbt9PLTrys0l7i1kaVxJVBftAoGATs4q8ojXMKDPBzbJhoXc
IDxsHGUTXiE9S47X8yEi1Uyj7qAQJekkDKyIOewuXR7231SDCc1wfCXLl9PX0A+U
Sz+Lv+8kL6vF+kxK0Y3u47M462rD7s6fcCSy2WDZvaSebvhH8f+DsIBpGLMvvkI1
73fs5S1W2Tk23tXQGw8EMI0CgYBbVHPBw0D5KCPmxIsfokZF8YAR5LXRvvFDQvFC
5CQP5JUiGBSojROq0KLR8f1jwZHaXTrF+z4MGwtFrX71hg2AZt/qCWW2rUM2cLyv
kjxH9doOTrHcQP2EUswmXt2qd+GwGn06jArtEPBS4UdHsHg31TeTtqmSzZJVcFHn
U+uxOQKBgQDBDilP5xsQeeeG8rdE8zudWhCf/6EDvYoDa+DzDfuDqxHCAmlufSYm
CB8vT/N7IEL9IjjmYo2JMNYiqMHmS9rTId8e9tdTgi8AAkYupkDGIqMkUeewgnxx
k+1+nsLxQD6MWoNiquRPPAL+bt/KV3FWMB4FsOK1cW3XrD/UrF1Dlg==
-----END RSA PRIVATE KEY-----


Dockerfile: |
FROM uat.sf.dockerhub.stgwebank/webank/mlss-mf:MLSS-MF_1.14.0_Docker-Base
COPY ./model/ /app
WORKDIR /app
#RUN pip install -i http://127.0.0.1:13141/root/pypi/+simple/ -r requirements.txt --trusted-host=127.0.0.1
EXPOSE 5000

# Define environment variable
ARG MODEL_NAME=${MODEL_NAME}
ENV MODEL_NAME ${MODEL_NAME}
ENV SERVICE_TYPE MODEL
ENV PERSISTENCE 0

CMD exec seldon-core-microservice $MODEL_NAME --service-type $SERVICE_TYPE --persistence $PERSISTENCE
109 changes: 109 additions & 0 deletions install/Prophecis/templates/mf/mf-deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: mf
namespace: {{.Values.namespace}}
labels:
environment: {{.Values.envir}}
app: mf
spec:
selector:
matchLabels:
app: mf
environment: {{.Values.envir}}
replicas: 1
template:
metadata:
labels:
app: mf
environment: {{.Values.envir}}
# version: {{.Values.mf.version}}
spec:
serviceAccountName: mf-sa
volumes:
- name: mf-config
configMap:
name: mf-config
- name: timezone-volume
hostPath:
path: /usr/share/zoneinfo/Asia/Shanghai
type: File
- name: oss-storage
hostPath:
path: {{.Values.storage.share_storage_dir}}
type: Directory
- name: storage-path
hostPath:
path: /data/bdap-ss/mlss-data/
type: Directory
- hostPath:
path: /var/run/docker.sock
type: File
name: dockersock
- name: jdk
hostPath:
path: /nemo/jdk1.8.0_141
type: Directory
- hostPath:
path: /bin/docker
type: File
name: dockerclient
- hostPath:
path: /root/.docker/config.json
type: File
name: dockerconfig
containers:
- name: mf-server
image: {{.Values.image.registry}}:{{.Values.mf.image.tag}}
{{ if .Values.image.pullPolicy }}
imagePullPolicy: {{.Values.image.pullPolicy}}
{{ end }}
ports:
- containerPort: 8080
volumeMounts:
- name: mf-config
mountPath: /etc/mlss
- name: timezone-volume
mountPath: /etc/localtime
- name: oss-storage
mountPath: /data/oss-storage/
- name: storage-path
mountPath: /data/bdap-ss/mlss-data/
- mountPath: /var/run/docker.sock
name: dockersock
- mountPath: /bin/docker
name: dockerclient
- mountPath: /root/.docker/config.json
name: dockerconfig
- mountPath: /nemo/jdk1.8.0_141
name: jdk
env:
- name: FLUENT_ELASTICSEARCH_HOST
value: "elasticsearch.prophecis.svc.cluster.local"
- name: FLUENT_ELASTICSEARCH_PORT
value: "9200"
- name: JAVA_HOME
value: "/nemo/jdk1.8.0_141"
- name: LANG
value: C.UTF-8
command:
- /bin/bash
- -c
- "/mf-server --host=0.0.0.0 --scheme=http --port=8080"
# - "dlv --listen=:40012 --headless=true --api-version=2 exec /mf-server -- --host=0.0.0.0 --scheme=http --port=8080"
# - --listen=:40000
# - --headless=true
# - --api-version=2
# - exec
# - "/mf-server --host=0.0.0.0 --scheme=http --port=8080"
resources:
limits:
cpu: {{.Values.mf.cpus}}
memory: {{.Values.mf.memory}}
imagePullSecrets:
- name: hubsecret
nodeSelector:
{{range $key,$val := .Values.platformNodeSelectors}}
{{$key}}: {{$val}}
{{end}}

Loading