Merge pull request #59 from wallyell/configfix

Fix some mistakes of config files for deployment

Author: alexzyWu

docs/zh_CN/QuickStartGuide.md

@@ -20,43 +20,82 @@
 |Seldon Core|1.13.0|[https://github.com/SeldonIO/seldon-core](https://github.com/SeldonIO/seldon-core)|
 |nfs-utils|1.3.0|    |
 
-* 验证Helm
-```powershell
-$ helm version
-version.BuildInfo{Version:"v3.2.1", GitCommit:"fe51cd1e31e6a202cba7dead9552a6d418ded79a", GitTreeState:"clean", GoVersion:"go1.13.10"}
-```
-* 验证Kubernertes
-```powershell
-$ kubectl version
-Client Version: version.Info{Major:"1", Minor:"19", GitVersion:"v1.19.3", GitCommit:"1e11e4a2108024935ecfcb2912226cedeafd99df", GitTreeState:"clean", BuildDate:"2020-10-14T12:50:19Z", GoVersion:"go1.15.2", Compiler:"gc", Platform:"linux/amd64"}
-Server Version: version.Info{Major:"1", Minor:"18", GitVersion:"v1.18.6", GitCommit:"dff82dc0de47299ab66c83c626e08b245ab19037", GitTreeState:"clean", BuildDate:"2020-07-15T16:51:04Z", GoVersion:"go1.13.9", Compiler:"gc", Platform:"linux/amd64"}
+* 安装helm-3.2.1
+```shell
+#下载
+wget https://get.helm.sh/helm-v3.2.1-linux-amd64.tar.gz
+
+#安装
+tar -xzvf helm-v3.2.1-linux-amd64.tar.gz
+cd linux-amd64/
+mv helm /usr/bin/
+
+#验证helm版本
+helm version
+
+#修改库源
+helm repo add aliyuncs https://apphub.aliyuncs.com
+helm repo list
 ```
-* 验证Docker
-```powershell
-$ docker version
-...
-Client: Docker Engine - Community
- Version:           19.03.9
-...
-Server: Docker Engine - Community
- Engine:
-  Version:          19.03.9
+* 修改Kubernertes配置
+```shell
+#修改k8s配置
+vim /etc/kubernetes/manifests/kube-apiserver.yaml
+#spec:
+# containers:
+# - command:
+# 中，增加如下配置项
+- --service-node-port-range=30000-40000
 ```
-* Seldon Core相关：
-```powershell
-#部署
-kubeclt create namespace seldon-system
-helm install seldon-core seldon-core-operator . \ --set usageMetrics.enabled=true \ --namespace seldon-system \ --set istio.enabled=true
-#验证
-kubectl -n seldon-system get pods
+* 修改Docker配置
+```shell
+vim /root/.docker/config.json
+#增加如下配置
+{
+        "auths": {
+                "": {
+                        "auth": ""
+                }
+        },
+        "HttpHeaders": {
+                "User-Agent": "Docker-Client/20.10.8-ce (linux)"
+        }
+}
 ```
+
+
 * Istio相关：
-```powershell
+```shell
+#下载
+wget https://github.com/istio/istio/releases/download/1.8.2/istio-1.8.2-linux-amd64.tar.gz
+
+#设置istioctl环境变量
+export PATH=$PATH:/opt/istio-1.8.2/bin
+
 #部署
 istioctl install
+
 #验证，查看相关Pod是否正常Running
 kubectl -n istio-system get pods 
 ```
+
+
+* Seldon Core相关：
+
+```shell
+#下载
+wget https://github.com/SeldonIO/seldon-core/archive/refs/tags/v1.13.0.tar.gz
+
+#部署
+kubeclt create namespace seldon-system
+cd seldon-core-1.13.0/helm-charts
+helm install seldon-core seldon-core-operator --set usageMetrics.enabled=true --namespace seldon-system --set istio.enabled=true
+#验证
+kubectl -n seldon-system get pods
+```
+
+
+
 ### 2.3 目录挂载(若不需共享目录可先跳过)
 
 Prophecis使用nfs来存储容器运行数据，需要挂载nfs
@@ -93,7 +132,7 @@ mount ${NFS_SERVER_IP}:${NFS_PATH_LOG} ${NFS_PATH_LOG}
 # MySQL数据库名  DATABASE_DB='mlss_db'
 # MySQL用户名    DATABASE_USERNAME='mlss'
 # MySQL用户密码  DATABASE_PASSWORD='123'
-database:
+db:
     server: ${DATABASE_IP}
     port: ${DATABASE_PORT}
     name: ${DATABASE_DB}
@@ -103,11 +142,9 @@ database:
 ## 配置UI的URL访问路径
 # 网页访问地址  SERVER_IP='127.0.0.1'
 # 网页访问端口  SERVER_PORT='30803'
-server_ui_gateway: ${SERVER_IP}:30778
-ui:
-    service:
-        bdap:
-            nodePost: ${SERVER_PORT}
+gateway:
+  address: ${SERVER_IP}
+  port: ${SERVER_PORT}
 
 ## Prophecis使用LDAP来负责统一认证
 # LDAP的服务地址  LDAP_ADDRESS='ldap://127.0.0.1:1389/' 
@@ -116,6 +153,11 @@ cc:
     ldap:
         address: ${LDAP_ADDRESS}
         baseDN: ${LDAP_BASE_DN}
+        
+#超级管理员的用户名密码，可以改成自己需要的，需对应数据库表t_superadmin
+admin:
+    user: ${SUPER_USER}
+    password: ${SUPER_USER_PASSWORD}
 ```
 ## 4. 操作序列
 
@@ -148,7 +190,7 @@ helm install notebook-controller ./notebook-controller
 ## 安装MinIO组件
 helm install minio-prophecis --namespace prophecis ./MinioDeployment
 ## 安装prophecis组件
-helm install prophecis ./prophecis
+helm install prophecis ./Prophecis
 ```
 ### 4.3 MLFlow实验工作流相关(mlflow appconn安装)
 

install/Prophecis/templates/di/storage-deployment.yaml

@@ -29,7 +29,7 @@ spec:
           type: File
       - name: oss-storage
         hostPath:
-          path: {{.Values.ceph_path}}/{{.Values.storage.share_storage_dir}}
+          path: {{.Values.storage.share_storage_dir}}
           type: Directory
 #      - name: ceph
 #        hostPath:

install/Prophecis/templates/mf/mf-configmap.yml

@@ -79,7 +79,7 @@ data:
 
   
   Dockerfile: |
-    FROM uat.sf.dockerhub.stgwebank/webank/mlss-mf:MLSS-MF_1.14.0_Docker-Base
+    FROM wedatasphere/prophecis: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

install/Prophecis/values.yaml

@@ -11,7 +11,7 @@ db:
   user: prophecis
   pwd: password
 image:
-  registry: uat.sf.dockerhub.stgwebank/webank/prophecis
+  registry: wedatasphere/prophecis
   pullPolicy: Always
 gateway:
   address: 127.0.0.1
@@ -79,12 +79,13 @@ storage:
   cpus: 500m
   memory: 5000Mi
   uploadContainerPath: /uploaded-models
-  share_storage_dir: tmp
-  storageEnvServerName: prophecis
-  storageServerName: dlaas.ibm.com
-  storageTls: true
+  share_storage_dir: /data/oss-storage
+  storerServerEnvName: prophecis
+  storerServerName: dlaas.ibm.com
+  storerTls: true
   platformNamespace: prophecis
   storageCA: MIIFdTCCA12gAwIBAgIJAMpWS0cTdN/xMA0GCSqGSIb3DQEBCwUAMFExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJOWTEPMA0GA1UEBwwGQXJtb25rMQwwCgYDVQQKDANJQk0xFjAUBgNVBAMMDWRsYWFzLmlibS5jb20wHhcNMTkwODAxMDk0MDE1WhcNMjkwNzI5MDk0MDE1WjBRMQswCQYDVQQGEwJVUzELMAkGA1UECAwCTlkxDzANBgNVBAcMBkFybW9uazEMMAoGA1UECgwDSUJNMRYwFAYDVQQDDA1kbGFhcy5pYm0uY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1qB+XOvdAPLBz7xIzsmK7wHvS9TMFmg70yC7+cvPQlXstSn7dSPHLJ/IRBrWkVIY0qbFioHAUWaAG59AVBHt2gd98FR8cMwaOAMr8mz20JHjyme01DvTuqri5UNXt1rIszI9h83lP/Ih+szrFcf2ZvsOROItQ2rcs/nY2/nt1A9SWO26x4Vy8UZKhml3OXFE1TzAc4cvjb8WrhwUUzNHEK0Lwq7KhQuMzSUALlBAwDzYKQPr8PXU8DKV4YO1Cs6hjYJirOCpCjq+jfRLnh3vcACbCazUSWLUzVbpSNWa5yA3emGccetT4VZBGl/2B9dp/Gh8H75pmcyzy6ziJAFXHWeV2lzdLDUDhuArHWIGskBUos/fW8QtkL5Suad0fMAsoRHE8sL0D+BiGF39i0Rjk6PKcLCxcLcJyU1felQMevjMFsDShHtY82NM0rsyLFAvWfv0cH+0LVO/Mo3I3xzt6Yg16UaQ9wU/qOjEw7mhqGw0fuB12HrLoBstof4Jyb3IMRkWM2TmlH918SKABuT69Dyrc4xX90arGI5ZqafiwVSLnzam73AmKgqJSUa2AwVIL5ZMX1Au7O9wi3U9p8gjb5+MOrjR4i2IPoz//9gwVj3pdu2tx2Ai9muH1Yi3tTh+IWMUB/LuOQSsdSd1kHt74mF5HzC8/3TJRyv4uNBfho0CAwEAAaNQME4wHQYDVR0OBBYEFHx/O0IFLMrFpYtbfUH6uojZHVNQMB8GA1UdIwQYMBaAFHx/O0IFLMrFpYtbfUH6uojZHVNQMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAKKYsj9Mjy819DOFKmE6eY+DIcBlkJGNzknZr0qp1eieDa/ZRADowbcw18iQDiXi01BNAygMSLf6132RVMNY9p92U2s4KWom1gfdBAykEnWuPB5uIXN7w5vV0X+Vp+kRI6op1UEhvf0fnpDKLjpfPx1wmUVZB2ARuXq2z18b67K7PkF5fgm07ngE1O+ByIC05xEpNE9UBCSlgDLfjUFtFGPeCfhIMlYeh2kgUY441U/ALneCv7WBR+09yUl51CEDENk4MCYq1qWqzYHuI9nlZzbU0G+JOVE0vPpgDkUOyZwbz244nI4jhI1cuFR00TMpXlQUe6rY3ndHImQD5NmS4kBr9xJm2e+H5cwY+/0GjNXOxx5olXcMiLl4R9VA+KMPS9kYKl7E/J0M2WUeXjEGcGHqg12/QKiI9fgIwd1WwkiJARDciUqYTw2GAOZrJ2lytH8WvV8lZIPUp8awUDnZzmg+iFIYlADCjtOu4bdlnFVTGURCvPvrYA+8evtdFhXimWB/Chfof/EYv3r4qImL2/+N192jxilFkb/OBMkmG9t97iLvJykjmTFKkzysRy53F4CVlgAAOst8MQsJ6tewmSvgHVWOT1Ohi3eNzMCW/fTEjsf9hO/j23DHjwzZ3JIQxwNmNpdk8yIyhEQNnBQGjsZxB3MANqyOiZcm1al/Tkxw
+
 restapi:
   version: restapi-v0.3.2
   port: 30960

install/log/job-log-collecter/fluent-bit.yaml

@@ -53,7 +53,7 @@ spec:
               xxx_nounkeyedliteral: {}
               xxx_unrecognized: []
               xxx_sizecache: 0
-        image: uat.sf.dockerhub.stgwebank/webank/mlss-di:fluent-bit-1.2.1
+        image: wedatasphere/prophecis:fluent-bit-1.2.1
         imagePullPolicy: Always
         name: log-collector
         resources:

install/log/pod-log-collector/fluent-bit-prophecis/values.yaml

@@ -11,7 +11,7 @@ namespace: logging
 
 image:
   # repository: fluent/fluent-bit
-  repository:  uat.sf.dockerhub.stgwebank/webank/mlss-di
+  repository:  wedatasphere/prophecis
   pullPolicy: IfNotPresent
   tag: fluent-bit-1.7.5-debug
 

install/sql/prophecis-data.sql

@@ -7,8 +7,8 @@
 
 
 -- 导出 mlss_gzpc_bdap_uat_01 的数据库结构
-CREATE DATABASE IF NOT EXISTS `mlss_gzpc_bdap_uat_01` /*!40100 DEFAULT CHARACTER SET utf8 */;
-USE `mlss_gzpc_bdap_uat_01`;
+CREATE DATABASE IF NOT EXISTS `prophecis_db` /*!40100 DEFAULT CHARACTER SET utf8 */;
+USE `prophecis_db`;
 
 -- 导出  表 mlss_gzpc_bdap_uat_01.t_group 结构
 CREATE TABLE IF NOT EXISTS `t_group` (

install/sql/prophecis.sql

@@ -7,8 +7,8 @@
 
 
 -- 导出 mlss_gzpc_bdap_uat_01 的数据库结构
-CREATE DATABASE IF NOT EXISTS `mlss_gzpc_bdap_uat_01` /*!40100 DEFAULT CHARACTER SET utf8 */;
-USE `mlss_gzpc_bdap_uat_01`;
+CREATE DATABASE IF NOT EXISTS `prophecis_db` /*!40100 DEFAULT CHARACTER SET utf8 */;
+USE `prophecis_db`;
 
 -- 导出  表 mlss_gzpc_bdap_uat_01.t_experiment 结构
 CREATE TABLE IF NOT EXISTS `t_experiment` (

mf/Makefile

@@ -1,4 +1,4 @@
-registry = uat.sf.dockerhub.stgwebank/webank
+registry = wedatasphere
 repo = prophecis
 version = v0.3.0
 tag = mf-server-$(version)