Merge pull request #2169 from Felixnoo/update-uninstall-devops

Update Commands for Uninstalling DevOps from 3.2.0

content/en/docs/devops-user-guide/how-to-use/create-a-pipeline-using-graphical-editing-panel.md

@@ -146,7 +146,7 @@ Pipelines include [declarative pipelines](https://www.jenkins.io/doc/book/pipeli
 3. Click **Add Nesting Steps** to add a nested step under the `maven` container. Select **shell** from the list and enter the following command in the command line. Click **OK** to save it.
 
    ```shell
-   mvn clean test
+   mvn clean -gs `pwd`/configuration/settings.xml test
    ```
 
    {{< notice note >}}
@@ -155,9 +155,6 @@ Pipelines include [declarative pipelines](https://www.jenkins.io/doc/book/pipeli
 
    {{</ notice >}} 
 
-   ![shell](/images/docs/devops-user-guide/using-devops/create-a-pipeline-using-graphical-editing-panels/shell.png)
-   
-   ![unit-test-set](/images/docs/devops-user-guide/using-devops/create-a-pipeline-using-graphical-editing-panels/unit-test-set.png)
 
 #### Stage 3: Code analysis (optional)
 

content/en/docs/pluggable-components/uninstall-pluggable-components.md

@@ -42,53 +42,29 @@ Change the value of `openpitrix.store.enabled` from `true` to `false` in `ks-ins
 
 1. Change the value of `devops.enabled` from `true` to `false` in `ks-installer` of the CRD `ClusterConfiguration`.
 
-2. Run the command mentioned in [Prerequisites](#prerequisites) and then delete the code under `status.devops` in `ks-installer` of the CRD `ClusterConfiguration`.
-
-3. Run the following commands:
+2. To uninstall DevOps:
 
    ```bash
-   helm -n kubesphere-devops-system delete devops-jenkins
-   helm -n kubesphere-devops-system delete uc
+   helm uninstall -n kubesphere-devops-system devops
+   kubectl patch -n kubesphere-system cc ks-installer --type=json -p='[{"op": "remove", "path": "/status/devops"}]'
    ```
+3. To delete DevOps resources:
 
    ```bash
-   # Delete DevOps projects
-   for devopsproject in `kubectl get devopsprojects -o jsonpath="{.items[*].metadata.name}"`
-   do
-     kubectl patch devopsprojects $devopsproject -p '{"metadata":{"finalizers":null}}' --type=merge
+   # Remove all resources related with DevOps
+   for devops_crd in $(kubectl get crd -o=jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' | grep "devops.kubesphere.io"); do
+       for ns in $(kubectl get ns -ojsonpath='{.items..metadata.name}'); do
+           for devops_res in $(kubectl get $devops_crd -n $ns -oname); do
+               kubectl patch $devops_res -n $ns -p '{"metadata":{"finalizers":[]}}' --type=merge
+           done
+       done
    done
-   
-   for pip in `kubectl get pipeline -A -o jsonpath="{.items[*].metadata.name}"`
-   do
-     kubectl patch pipeline $pip -n `kubectl get pipeline -A | grep $pip | awk '{print $1}'` -p '{"metadata":{"finalizers":null}}' --type=merge
-   done
-   
-   for s2ibinaries in `kubectl get s2ibinaries -A -o jsonpath="{.items[*].metadata.name}"`
-   do
-     kubectl patch s2ibinaries $s2ibinaries -n `kubectl get s2ibinaries -A | grep $s2ibinaries | awk '{print $1}'` -p '{"metadata":{"finalizers":null}}' --type=merge
-   done
-   
-   for s2ibuilders in `kubectl get s2ibuilders -A -o jsonpath="{.items[*].metadata.name}"`
-   do
-     kubectl patch s2ibuilders $s2ibuilders -n `kubectl get s2ibuilders -A | grep $s2ibuilders | awk '{print $1}'` -p '{"metadata":{"finalizers":null}}' --type=merge
-   done
-   
-   for s2ibuildertemplates in `kubectl get s2ibuildertemplates -A -o jsonpath="{.items[*].metadata.name}"`
-   do
-     kubectl patch s2ibuildertemplates $s2ibuildertemplates -n `kubectl get s2ibuildertemplates -A | grep $s2ibuildertemplates | awk '{print $1}'` -p '{"metadata":{"finalizers":null}}' --type=merge
-   done
-   
-   for s2iruns in `kubectl get s2iruns -A -o jsonpath="{.items[*].metadata.name}"`
-   do
-     kubectl patch s2iruns $s2iruns -n `kubectl get s2iruns -A | grep $s2iruns | awk '{print $1}'` -p '{"metadata":{"finalizers":null}}' --type=merge
-   done
-   
-   kubectl delete devopsprojects --all 2>/dev/null
-   ```
-
-   ```bash
-   kubectl delete ns kubesphere-devops-system
+   # Remove all DevOps CRDs
+   kubectl get crd -o=jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' | grep "devops.kubesphere.io" | xargs -I crd_name kubectl delete crd crd_name
+   # Remove DevOps namespace
+   kubectl delete namespace kubesphere-devops-system
    ```
+   
 
 ## Uninstall KubeSphere Logging
 

content/zh/docs/devops-user-guide/how-to-use/create-a-pipeline-using-graphical-editing-panel.md

@@ -146,7 +146,7 @@ KubeSphere 中的图形编辑面板包含用于 Jenkins [阶段 (Stage)](https:/
 3. 点击**添加嵌套步骤**，在 `maven` 容器下添加一个嵌套步骤。在列表中选择 **shell** 并在命令行中输入以下命令。点击**确定**保存操作。
 
    ```shell
-   mvn clean test
+   mvn clean -gs `pwd`/configuration/settings.xml test
    ```
 
    {{< notice note >}}
@@ -155,9 +155,6 @@ KubeSphere 中的图形编辑面板包含用于 Jenkins [阶段 (Stage)](https:/
 
    {{</ notice >}} 
 
-   ![shell](/images/docs/zh-cn/devops-user-guide/use-devops/create-a-pipeline-using-graphical-editing-panel/shell_set.png)
-   
-   ![单元测试设置完成](/images/docs/zh-cn/devops-user-guide/use-devops/create-a-pipeline-using-graphical-editing-panel/unit_test_set.png)
 
 #### 阶段 3：代码分析（可选）
 

content/zh/docs/pluggable-components/uninstall-pluggable-components.md

@@ -43,53 +43,29 @@ kubectl -n kubesphere-system edit clusterconfiguration ks-installer
 
 1. 将 CRD `ClusterConfiguration`  配置文件中 `ks-installer` 参数的 `devops.enabled` 字段的值从 `true` 改为 `false`。
 
-2. 运行[准备工作](#准备工作)中提到的命令，然后删除 CRD `ClusterConfiguration` 配置文件 `ks-installer` 参数中 `status.devops` 字段下的代码。
-
-3. 运行下面的命令。
+2. 卸载 DevOps：
 
    ```bash
-   helm -n kubesphere-devops-system delete devops-jenkins
-   helm -n kubesphere-devops-system delete uc
+   helm uninstall -n kubesphere-devops-system devops
+   kubectl patch -nkubesphere-system cc ks-installer --type=json -p='[{"op": "remove", "path": "/status/devops"}]'
    ```
+3. 删除 DevOps 资源：
 
    ```bash
-   # Delete DevOps projects
-   for devopsproject in `kubectl get devopsprojects -o jsonpath="{.items[*].metadata.name}"`
-   do
-     kubectl patch devopsprojects $devopsproject -p '{"metadata":{"finalizers":null}}' --type=merge
+   # 删除所有 DevOps 相关资源
+   for devops_crd in $(kubectl get crd -o=jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' | grep "devops.kubesphere.io"); do
+       for ns in $(kubectl get ns -ojsonpath='{.items..metadata.name}'); do
+           for devops_res in $(kubectl get $devops_crd -n $ns -oname); do
+               kubectl patch $devops_res -n $ns -p '{"metadata":{"finalizers":[]}}' --type=merge
+           done
+       done
    done
-   
-   for pip in `kubectl get pipeline -A -o jsonpath="{.items[*].metadata.name}"`
-   do
-     kubectl patch pipeline $pip -n `kubectl get pipeline -A | grep $pip | awk '{print $1}'` -p '{"metadata":{"finalizers":null}}' --type=merge
-   done
-   
-   for s2ibinaries in `kubectl get s2ibinaries -A -o jsonpath="{.items[*].metadata.name}"`
-   do
-     kubectl patch s2ibinaries $s2ibinaries -n `kubectl get s2ibinaries -A | grep $s2ibinaries | awk '{print $1}'` -p '{"metadata":{"finalizers":null}}' --type=merge
-   done
-   
-   for s2ibuilders in `kubectl get s2ibuilders -A -o jsonpath="{.items[*].metadata.name}"`
-   do
-     kubectl patch s2ibuilders $s2ibuilders -n `kubectl get s2ibuilders -A | grep $s2ibuilders | awk '{print $1}'` -p '{"metadata":{"finalizers":null}}' --type=merge
-   done
-   
-   for s2ibuildertemplates in `kubectl get s2ibuildertemplates -A -o jsonpath="{.items[*].metadata.name}"`
-   do
-     kubectl patch s2ibuildertemplates $s2ibuildertemplates -n `kubectl get s2ibuildertemplates -A | grep $s2ibuildertemplates | awk '{print $1}'` -p '{"metadata":{"finalizers":null}}' --type=merge
-   done
-   
-   for s2iruns in `kubectl get s2iruns -A -o jsonpath="{.items[*].metadata.name}"`
-   do
-     kubectl patch s2iruns $s2iruns -n `kubectl get s2iruns -A | grep $s2iruns | awk '{print $1}'` -p '{"metadata":{"finalizers":null}}' --type=merge
-   done
-   
-   kubectl delete devopsprojects --all 2>/dev/null
-   ```
-
-   ```bash
-   kubectl delete ns kubesphere-devops-system
+   # 删除所有 DevOps CRD
+   kubectl get crd -o=jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' | grep "devops.kubesphere.io" | xargs -I crd_name kubectl delete crd crd_name
+   # 删除 DevOps 命名空间
+   kubectl delete namespace kubesphere-devops-system
    ```
+   
 
 ## 卸载 KubeSphere 日志系统