Merge pull request #16 from alexzyWu/dev-0.2.0

Update Doc & Setting

Author: alexzyWu

cc/sql/prophecis-data.sql

@@ -177,17 +177,30 @@ INSERT INTO `t_role_permission` (`id`, `role_id`, `permission_id`, `enable_flag`
 	(81, 2, 38, 0, '2019-11-11 18:15:36'),
 	(82, 1, 39, 1, '2019-11-11 18:15:36'),
 	(83, 2, 39, 1, '2019-11-11 18:15:36'),
-	(84, 1, 43, 1, '2019-11-11 18:15:36'),
-	(85, 2, 43, 1, '2019-11-11 18:15:36'),
 	(86, 1, 40, 1, '2019-11-11 18:15:37'),
 	(87, 2, 40, 1, '2019-11-11 18:15:37'),
-	(88, 1, 41, 1, '2019-11-11 18:15:37'),
-	(89, 2, 41, 1, '2019-11-11 18:15:37'),
-	(90, 1, 42, 1, '2019-11-11 18:15:37'),
-	(91, 2, 42, 1, '2019-11-11 18:15:37'),
-	(92, 1, 44, 1, '2019-11-11 18:15:37'),
-	(93, 2, 44, 1, '2019-11-11 18:15:37');
-/*!40000 ALTER TABLE `t_role_permission` ENABLE KEYS */;
+	(108, 1, 41, 1, '2021-03-01 16:36:21'),
+	(109, 1, 42, 1, '2021-03-01 16:36:21'),
+	(110, 1, 43, 1, '2021-03-01 16:36:21'),
+	(111, 1, 44, 1, '2021-03-01 16:36:21'),
+	(112, 1, 45, 1, '2021-03-01 16:36:21'),
+	(113, 1, 46, 1, '2021-03-01 16:36:21'),
+	(114, 1, 47, 1, '2021-03-01 16:36:21'),
+	(115, 1, 48, 1, '2021-03-01 16:36:21'),
+	(116, 1, 49, 1, '2021-03-01 16:36:21'),
+	(117, 1, 50, 1, '2021-03-01 16:36:21'),
+	(118, 2, 41, 1, '2021-03-01 16:36:21'),
+	(119, 2, 42, 1, '2021-03-01 16:36:22'),
+	(120, 2, 43, 1, '2021-03-01 16:36:22'),
+	(121, 2, 44, 1, '2021-03-01 16:36:22'),
+	(122, 2, 45, 1, '2021-03-01 16:36:22'),
+	(123, 2, 46, 1, '2021-03-01 16:36:22'),
+	(124, 2, 47, 1, '2021-03-01 16:36:22'),
+	(125, 2, 48, 1, '2021-03-01 16:36:22'),
+	(126, 2, 49, 1, '2021-03-01 16:36:22'),
+	(127, 2, 50, 1, '2021-03-01 16:36:22'),
+	(128, 2, 51, 1, '2021-03-01 16:58:16'),
+	(129, 1, 51, 1, '2021-03-01 16:58:20');
 
 -- 导出  表 mlss_gzpc_bdap_uat_01.t_superadmin 结构
 CREATE TABLE IF NOT EXISTS `t_superadmin` (

docs/zh_CN/QuickStartGuide.md

@@ -35,13 +35,26 @@ source prophecis-data.sql #permission数据
 
 - Prophecis对Kubeflow提供的Notebook Controller进行NodePort SVC的扩展，用于PySpark Session的创建，如需使用可从wedatasphere仓库拉取。
 
-  ```
+  ```shell
   cd ./helm-charts/notebook-controller
   helm install notebook-controller .
   ```
 
+#### 五、部署MinIO及Log Collector
+
+- MinIO
+  ```shell
+  cd ./helm-charts/MinioDeployment
+  helm install minio-prophecis --namespace prophecis .
+  ```
+
+- Log Collector
+    ```shell
+    cd ./helm-charts/
+    kubectl apply -f ./LogCollectorDS
+    ```
 
-#### 五、修改配置
+#### 六、修改配置
 
 - 修改ui nginx反向代理配置（values.yml文件，host ip + nodeport）：
 
@@ -50,9 +63,11 @@ cc:
 	server: 127.0.0.1:30778
 aide:
 	server: 127.0.0.1:30778
+di:
+    server: 127.0.0.1:30778
 ```
 
-- 修改数库配置（values.yml文件）：
+- 修改数库配置（values.yml文件，db配置一致即可）：
 
 ```shell
 cc:
@@ -62,6 +77,14 @@ cc:
     name: prophecis_db
     user: prophecis
     pwd: password
+datasource:
+  userName: prophecis
+  userPwd: prophecis
+  url: 127.0.0.1
+  port: 3306
+  db: prophecis_db
+  encryptPwd: ""
+  privKey: ""
 ```
 - 登录采用通过LDAP方案，需要配置values中的ldap address和baseDN变量：
 ```shell
@@ -76,12 +99,12 @@ cc:
 kubectl label nodes prophecis01 mlss-node-role=platform
 ```
 
-#### 六、管理员用户
+#### 七、管理员用户
 
 - 默认的管理员用户为admin，账号密码通过values中的admin进行配置。
 - 若需要新增SA用户，需要在t_superadmin和t_user中增加对应的用户记录；
 
-#### 七、部署命令
+#### 八、部署命令
 
 ```shell
 kubectl create namespace prophecis
@@ -90,7 +113,7 @@ kubectl create namespace prophecis
 helm install prophecis .
 ```
 
-#### 八、关键配置解释
+#### 九、关键配置解释
 - platformNodeSelectors：prophecis服务运行label
 
 - cc:

helm-charts/Prophecis/values.yaml

@@ -118,7 +118,7 @@ ui:
         - name: Prophecis_1.8.0_tensorflow-1.13.1-jupyterlab-cpu-v0.5.0
         - name: Prophecis_1.8.0_tensorflow-1.13.1-jupyterlab-gpu-v0.5.0
         - name: Prophecis_1.8.0_tensorflow-1.12.0-jupyterlab-gpu-v0.5.0
-        - name: Prophecis_1.8.0_tensorflow-1.12.0-jupyterlab-cpu-v0.5
+        - name: Prophecis_1.8.0_tensorflow-1.12.0-jupyterlab-cpu-v0.5.0
   di:
     server: 127.0.0.1:30778
     image:

helm-charts/k8s 1.18.6/notebook-controller/templates/notebook-controller-0.5.1.yaml

@@ -112,8 +112,8 @@ spec:
         - name: POD_LABELS
           value: gcp-cred-secret=user-gcp-sa,gcp-cred-secret-filename=user-gcp-sa.json
 #        image: gcr.io/kubeflow-images-public/notebook-controller:v20190401-v0.4.0-rc.1-308-g33618cc9-e3b0c4
-        image: {{.Values.aide.controller.notebook.repository}}:{{.Values.aide.controller.notebook.tag}}
-        imagePullPolicy: {{.Values.aide.controller.notebook.pullPolicy}}
+        image: {{.Values.mllabis.controller.notebook.repository}}:{{.Values.mllabis.controller.notebook.tag}}
+        imagePullPolicy: {{.Values.mllabis.controller.notebook.pullPolicy}}
         name: manager
 #      nodeSelector:
 #        kubernetes.io/hostname: mlssdi010007