【deploy】volcano-deploy.yaml root-equota subsequence (#1115)

* volcano-deploy.yaml root-equota subsequence

* volcano-deploy.yaml root-equota subsequence

* volcano-deploy.yaml root-equota subsequence

Author: liujiaxing123666

docs/zh_cn/deployment/install_paddleflow_on_k3s.md

@@ -9,9 +9,9 @@ touch /mnt/paddleflow.db && chmod 666 /mnt/paddleflow.db
 
 ```shell
 # Kubernetes version >= v1.18
-kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/paddleflow-deployment.yaml
+kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/paddleflow-deployment.yaml -n paddleflow
 # Kubernetes version < v1.18
-kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/paddleflow-deployment-before-v1-18.yaml
+kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/paddleflow-deployment-before-v1-18.yaml -n paddleflow
 # For x86: todo
 # For arm64: todo
 ```
@@ -25,7 +25,7 @@ kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/rele
 touch /mnt/paddleflow.db && chmod 666 /mnt/paddleflow.db
 # 创建基于sqllite的paddleflow-server
 # For x86:
-kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/deploys/paddleflow-server/paddleflow-server-deploy.yaml
+kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/deploys/paddleflow-server/paddleflow-server-deploy.yaml -n paddleflow
 # For arm64: todo
 ```
 
@@ -38,13 +38,13 @@ export DB_PORT=3306
 export DB_USER=paddleflow
 export DB_PW=paddleflow
 export DB_DATABASE=paddleflow
-wget https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/database/paddleflow.sql
-bash < <(curl -s https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/database/execute.sh)
+wget https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/database/paddleflow.sql
+bash < <(curl -s https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/database/execute.sh)
 # 创建基于mysql的paddleflow-server
 # For x86:
 curl -sSL https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/deploys/paddleflow-server/paddleflow-server-deploy.yaml | \
 sed -e "s/sqlite/${DB_DRIVER}/g"  -e "s/host: 127.0.0.1/host: ${DB_HOST}/g"  -e "s/3306/${DB_PORT}/g" -e "s/user: paddleflow/user: ${DB_USER}/g"  -e "s/password: paddleflow/password: ${DB_PW}/g"  -e "s/database: paddleflow/database: ${DB_DATABASE}/g" \
-| kubectl apply -f -
+| kubectl apply -f - -n paddleflow
 # For arm64: todo
 ```
 
@@ -54,9 +54,9 @@ sed -e "s/sqlite/${DB_DRIVER}/g"  -e "s/host: 127.0.0.1/host: ${DB_HOST}/g"  -e
 
 ```shell
 # Kubernetes version >= v1.18
-kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/deploys/paddleflow-csi-plugin/paddleflow-csi-plugin-deploy.yaml
+kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/deploys/paddleflow-csi-plugin/paddleflow-csi-plugin-deploy.yaml -n paddleflow
 # Kubernetes v1.13<version< v1.18
-kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/deploys/paddleflow-csi-plugin/paddleflow-csi-plugin-deploy-before-v1-18.yaml
+kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/deploys/paddleflow-csi-plugin/paddleflow-csi-plugin-deploy-before-v1-18.yaml -n paddleflow
 # 为了在kubernetes == v1.13的集群中部署scsi插件，kubernetes集群需要满足以下配置。
 # kube-apiserver启动参数:
 --feature-gates=CSIDriverRegistry=true
@@ -65,7 +65,7 @@ kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/deve
 # kubelet启动参数
 --feature-gates=CSIDriverRegistry=true
 # 1.13环境中的csi安装命令
-kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/deploys/paddleflow-csi-plugin/paddleflow-csi-plugin-deploy-v1-13.yaml
+kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/deploys/paddleflow-csi-plugin/paddleflow-csi-plugin-deploy-v1-13.yaml -n paddleflow
 ```
 
 #### 2.3.3 安装volcano

docs/zh_cn/deployment/install_paddleflow_on_k8s.md

@@ -41,7 +41,9 @@ curl -sSL https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14
 
 
 ### 2.3 自定义安装
-#### 2.3.1 安装paddleflow-server
+#### 2.3.1 安装前创建namespace
+`kubectl create ns padddleflow`
+#### 2.3.2 安装paddleflow-server
 `paddleflow-server`支持多种数据库(`sqlite`,`mysql`)，其中`sqlite`仅用于快速部署和体验功能，不适合用于生产环境。
 - **指定用sqllite安装paddleflow-server**
 ```shell
@@ -62,8 +64,8 @@ export DB_PORT=3306
 export DB_USER=paddleflow
 export DB_PW=paddleflow
 export DB_DATABASE=paddleflow
-wget https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/database/paddleflow.sql
-bash < <(curl -s https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/database/execute.sh)
+wget https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/database/paddleflow.sql
+bash < <(curl -s https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/database/execute.sh)
 # 创建基于mysql的paddleflow-server
 # For x86:
 curl -sSL https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/deploys/paddleflow-server/paddleflow-server-deploy.yaml | \
@@ -72,7 +74,7 @@ sed -e "s/sqlite/${DB_DRIVER}/g"  -e "s/host: 127.0.0.1/host: ${DB_HOST}/g"  -e
 # For arm64: todo
 ```
 
-#### 2.3.2 安装paddleflow-csi-plugin
+#### 2.3.3 安装paddleflow-csi-plugin
 
 1. 检查 `kubelet root-dir` 路径
 
@@ -87,9 +89,9 @@ ps -ef | grep kubelet | grep root-dir
 **如果前面检查命令返回的结果为空**，无需修改配置，可直接部署：
 ```shell
 # Kubernetes version >= v1.18
-kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/deploys/paddleflow-csi-plugin/paddleflow-csi-plugin-deploy.yaml -n paddleflow
+kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/deploys/paddleflow-csi-plugin/paddleflow-csi-plugin-deploy.yaml -n paddleflow
 # Kubernetes v1.13<version< v1.18
-kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/deploys/paddleflow-csi-plugin/ paddleflow-csi-plugin-deploy-before-v1-18.yaml -n paddleflow
+kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/deploys/paddleflow-csi-plugin/ paddleflow-csi-plugin-deploy-before-v1-18.yaml -n paddleflow
 # 为了在kubernetes == v1.13的集群中部署scsi插件，kubernetes集群需要满足以下配置。
 # kube-apiserver启动参数:
 --feature-gates=CSIDriverRegistry=true
@@ -98,7 +100,7 @@ kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/deve
 # kubelet启动参数
 --feature-gates=CSIDriverRegistry=true
 # 1.13环境中的csi安装命令
-kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/deploys/paddleflow-csi-plugin/paddleflow-csi-plugin-deploy-v1-13.yaml -n paddleflow
+kubectl create -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/deploys/paddleflow-csi-plugin/paddleflow-csi-plugin-deploy-v1-13.yaml -n paddleflow
 ```
 
 **如果前面检查命令返回的结果不为空**，则代表 kubelet 的 root-dir 路径不是默认值，因此需要在 CSI Driver 的部署文件中更新 `kubeletDir` 路径并部署：
@@ -120,9 +122,10 @@ curl -sSL https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14
 
 > **注意**: 请将上述命令中 `{{KUBELET_DIR}}` 替换成 kubelet 当前的根目录路径。
 
-#### 2.3.3 安装volcano
+#### 2.3.4 安装volcano
 ```shell
 # For x86_64:
+kubectl apply -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/deploys/volcano/crd.yaml -n paddleflow
 kubectl apply -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/deploys/volcano/pf-volcano-deploy.yaml -n paddleflow
 
 # For arm64:

installer/deploys/paddleflow-server/README.md

@@ -22,7 +22,7 @@ export DB_USER=paddleflow
 export DB_PW=paddleflow
 export DB_DATABASE=paddleflow
 wget https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/database/paddleflow.sql
-bash < <(curl -s https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/database/execute.sh)
+bash < <(curl -s https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/database/execute.sh)
 # 创建基于mysql的paddleflow-server
 # For x86:
 curl -sSL https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/release-0.14.6/installer/deploys/paddleflow-server/paddleflow-server-deploy.yaml | \

installer/deploys/volcano/README.md

@@ -4,7 +4,8 @@
 目前PaddleFlow使用改造过的volcano作为默认调度器,具体改造内容参考todo(zhongzichao)
 ```shell
 # For x86_64:
-kubectl apply -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/deploys/volcano/pf-volcano-deploy.yaml -n paddleflow
+kubectl apply -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/release-0.14.6/volcano/crd.yaml -n paddleflow
+kubectl apply -f https://raw.githubusercontent.com/PaddlePaddle/PaddleFlow/develop/installer/release-0.14.6/volcano/pf-volcano-deploy.yaml -n paddleflow
 
 # For arm64:
 todo

installer/deploys/volcano/crd.yaml

@@ -206,21 +206,6 @@ spec:
   conversion:
     strategy: None
 ---
-kind: ElasticResourceQuota
-spec:
-  max:
-    cpu: '0'
-    memory: '0'
-  min:
-    cpu: '0'
-    memory: '0'
-  namespace: default
-metadata:
-  name: root
-  labels:
-    paddleflow.baidu.com/resource-isolation-type: logical
-apiVersion: scheduling.volcano.sh/v1beta1
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata: