From a4198c7e769a99d4afe458448b180beecea584a4 Mon Sep 17 00:00:00 2001 From: hemiao Date: Wed, 9 Jul 2025 15:43:04 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E2=80=9C=E8=A7=A3=E5=86=B3pr=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/en/docs/Administration/basic-configuration.md | 2 +- .../Administration/using-dnf-to-manage-software-packages.md | 2 +- docs/en/docs/Installation/installation-guideline.md | 4 ++-- docs/en/docs/Installation/installation-preparations.md | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/en/docs/Administration/basic-configuration.md b/docs/en/docs/Administration/basic-configuration.md index c2a061b81..226cd5c39 100644 --- a/docs/en/docs/Administration/basic-configuration.md +++ b/docs/en/docs/Administration/basic-configuration.md @@ -45,7 +45,7 @@ To display the current locale status, run the following command: localectl status ``` -Example command output: +For example, to display the current system settings, the command and output are as follows: ```bash $ localectl status diff --git a/docs/en/docs/Administration/using-dnf-to-manage-software-packages.md b/docs/en/docs/Administration/using-dnf-to-manage-software-packages.md index 3a1f6b6dd..c45d8b21a 100644 --- a/docs/en/docs/Administration/using-dnf-to-manage-software-packages.md +++ b/docs/en/docs/Administration/using-dnf-to-manage-software-packages.md @@ -99,7 +99,7 @@ Common options are as follows:

The options are 1 and 0, indicating whether to allow the update of outdated RPM packages. The default value is 1, indicating that the update is allowed.

-

gpgcheck

+<tr id="en-us_topic_0151921080_r30106389463d4ba0bf505a6b78034b23">

gpgcheck

The options are 1 and 0, indicating whether to perform GPG verification. The default value is 1, indicating that verification is required.

diff --git a/docs/en/docs/Installation/installation-guideline.md b/docs/en/docs/Installation/installation-guideline.md index 309149725..c38376800 100644 --- a/docs/en/docs/Installation/installation-guideline.md +++ b/docs/en/docs/Installation/installation-guideline.md @@ -30,7 +30,7 @@ Mount the ISO image of openEuler to the CD/DVD-ROM drive of the server and resta ### Installation Boot Menu -A boot menu is displayed after the system is booted using the boot medium. In addition to options for starting the installation program, some other options are available on the boot menu. During system installation, the **Test this media & install openEuler 22.03-LTS-SP3** option is selected by default. Press the arrow keys on the keyboard to change the selection, and press **Enter** when the desired option is highlighted. +A boot menu is displayed after the system is booted using the boot medium. In addition to options for starting the installation program, some other options are available on the boot menu. During system installation, the **Test this media & install openEuler 22.03-LTS-SP3** option is selected by default. If you want to select an option other than the default option, use the "↑" and "↓" arrow keys on the keyboard to make the selection and press Enter when the option is highlighted. >![](./public_sys-resources/icon-note.gif) **Note** > @@ -132,7 +132,7 @@ After the setting is complete, click **Done** in the upper left corner to go bac #### Setting the Installation Source -On the **INSTALLATION SUMMARY** page, click **Installation Source** to specify the installation source. +On the INSTALLATION SUMMARY page, click Installation Source to specify the installation source. - When you use a full CD/DVD image for installation, the installation program automatically detects and displays the installation source information. You can use the default settings, as shown in the following figure. diff --git a/docs/en/docs/Installation/installation-preparations.md b/docs/en/docs/Installation/installation-preparations.md index 8e2d04198..b434a3ee6 100644 --- a/docs/en/docs/Installation/installation-preparations.md +++ b/docs/en/docs/Installation/installation-preparations.md @@ -6,7 +6,7 @@ This section describes the compatibility of the hardware and software and the re Obtain the openEuler release package and verification file before the installation. -Perform the following operations to obtain the openEuler release package: +Please follow the steps below to obtain the openEuler release package and verification file: 1. Visit the [openEuler](https://www.openeuler.org/en/) website. 2. Click **Downloads**. @@ -63,7 +63,7 @@ To verify the file integrity, perform the following operations: ## Installation Requirements for PMs -To install the openEuler OS on a PM, the PM must meet the following requirements. +To install the openEuler OS on a PM, the PM must meet the following hardware compatibility and minimum hardware requirements. ### Hardware Compatibility @@ -84,7 +84,7 @@ You need to take hardware compatibility into account before installing openEuler ## Installation Requirements for VMs -To install the openEuler OS on a VM, the VM must meet the following requirements. +To install the openEuler OS on a VM, the VM must meet the following hardware compatibility and minimum hardware requirements. ### Virtualization Platform Compatibility -- Gitee From a7a52f150b476796def5b6ac359881fb4c8e8104 Mon Sep 17 00:00:00 2001 From: hemiao Date: Wed, 9 Jul 2025 15:56:41 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E2=80=9C=E8=A7=A3=E5=86=B3pr=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Installation/installation-guideline.md | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/docs/en/docs/Installation/installation-guideline.md b/docs/en/docs/Installation/installation-guideline.md index c38376800..7a84d870b 100644 --- a/docs/en/docs/Installation/installation-guideline.md +++ b/docs/en/docs/Installation/installation-guideline.md @@ -343,7 +343,8 @@ In the main menu, enter **2** to enter time zone settings. See **Figure 3**. **Figure 3** Time settings ![](figures/zh-cn_image_text_timedate.png) -- Time zone settings +- Time zone settings + In **Time settings**, enter **1** to enter time zone settings. You can change regions and cities as required. See **Figure 4**. **Figure 4** Timezone settings @@ -357,6 +358,7 @@ Cities are displayed in pages. Press **Enter** multiple times to view all cities After completing the settings, enter **c** to go back to the main menu. - NTP configuration + In **Time settings**, enter **2** to enter NTP configuration. See **Figure 6**. **Figure 6** NTP configuration @@ -418,6 +420,7 @@ In the main menu, enter **5** to select the OS installation destination. See **F - Standard Partition: A standard partition can be a file system, swap partition, or a container for software RAID or LVM physical volume. - LVM: Logical volume management (LVM) displays a simple bare-metal view of basic physical storage space, such as a hard disk or an LUN. Partitions that are regarded as physical volumes in physical storage can be grouped into volume groups. Each volume group can be divided into multiple logical volumes, and each logical volume simulates a standard disk partition. Therefore, an LVM logical volume can be used as a partition that contains multiple physical disks. - LVM Thin Provisioning: Thin provisioning allows you to manage storage pools with available space, also called thin pools, which can be allocated to any number of devices as required. The thin pools can be dynamically expanded as required to allocate storage space. + After completing the settings, enter **c** to go back to the main menu. >![](./public_sys-resources/icon-note.gif) **Note:** @@ -434,9 +437,12 @@ In the main menu, enter **6** to enter network configuration. See **Figure 10**. ![](figures/zh-cn_image_text_net.png) - Set the host name. + Enter **1**, type in a host name, then press **Enter**. Ensure that the host name does not end with a period (.) because it is not supported by the kernel and systemd. + - Configure the NIC. + Enter **2** to enter network device configuration. See **Figure 11**. **Figure 11** Device configuration @@ -474,10 +480,10 @@ After completing the settings, enter **c** to go back to the main menu. >- The root user is used to perform key OS management tasks. You are advised not to use the root user for routine operations and OS access. >- The default encryption algorithm is yescrypt. If yescrypt is not supported, SHA512 will be used. >- When setting the password of the **root** user or that of a new user, you are advised to set the password according to the password complexity requirements. When you set a weak password (the password does not meet the complexity requirements), the system generates an alarm and asks you whether to use the weak password. If you enter **yes**, the weak password is forcibly set. However, the weak password poses security risks. Therefore, exercise caution when selecting a weak password. A strong password is expected to: -> 1. Contain at least 8 characters -> 2. Contain at least 3 of the following types: uppercase letters, lowercase letters, digits, and special characters. -> 3. Be different from the user name. -> 4. Not contain words in the dictionary. +> 1. Contain at least 8 characters +> 2. Contain at least 3 of the following types: uppercase letters, lowercase letters, digits, and special characters. +> 3. Be different from the user name. +> 4. Not contain words in the dictionary. #### Creating a User @@ -490,10 +496,10 @@ In the main menu, enter **8** to enter user creation. Configure user information > >- The default encryption algorithm is yescrypt. If yescrypt is not supported, SHA512 will be used. >- Password of the new user must meet the password complexity requirements. Otherwise, user creation will fail. The password is expected to: -> 1. Contain at least 8 characters -> 2. Contain at least 3 of the following types: uppercase letters, lowercase letters, digits, and special characters. -> 3. Be different from the user name. -> 4. Not contain words in the dictionary. +> 1. Contain at least 8 characters +> 2. Contain at least 3 of the following types: uppercase letters, lowercase letters, digits, and special characters. +> 3. Be different from the user name. +> 4. Not contain words in the dictionary. After completing the settings, enter **c** to go back to the main menu. -- Gitee From e7e3d9cb03a47e813ad6d7621e3c8048c93c0fd5 Mon Sep 17 00:00:00 2001 From: hemiao Date: Wed, 9 Jul 2025 16:02:19 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E2=80=9C=E8=A7=A3=E5=86=B3pr=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docs/Installation/installation-guideline.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/en/docs/Installation/installation-guideline.md b/docs/en/docs/Installation/installation-guideline.md index 7a84d870b..1f0d2dfde 100644 --- a/docs/en/docs/Installation/installation-guideline.md +++ b/docs/en/docs/Installation/installation-guideline.md @@ -480,10 +480,10 @@ After completing the settings, enter **c** to go back to the main menu. >- The root user is used to perform key OS management tasks. You are advised not to use the root user for routine operations and OS access. >- The default encryption algorithm is yescrypt. If yescrypt is not supported, SHA512 will be used. >- When setting the password of the **root** user or that of a new user, you are advised to set the password according to the password complexity requirements. When you set a weak password (the password does not meet the complexity requirements), the system generates an alarm and asks you whether to use the weak password. If you enter **yes**, the weak password is forcibly set. However, the weak password poses security risks. Therefore, exercise caution when selecting a weak password. A strong password is expected to: -> 1. Contain at least 8 characters -> 2. Contain at least 3 of the following types: uppercase letters, lowercase letters, digits, and special characters. -> 3. Be different from the user name. -> 4. Not contain words in the dictionary. +> - Contain at least 8 characters +> - Contain at least 3 of the following types: uppercase letters, lowercase letters, digits, and special characters. +> - Be different from the user name. +> - Not contain words in the dictionary. #### Creating a User @@ -496,10 +496,10 @@ In the main menu, enter **8** to enter user creation. Configure user information > >- The default encryption algorithm is yescrypt. If yescrypt is not supported, SHA512 will be used. >- Password of the new user must meet the password complexity requirements. Otherwise, user creation will fail. The password is expected to: -> 1. Contain at least 8 characters -> 2. Contain at least 3 of the following types: uppercase letters, lowercase letters, digits, and special characters. -> 3. Be different from the user name. -> 4. Not contain words in the dictionary. +> - Contain at least 8 characters +> - Contain at least 3 of the following types: uppercase letters, lowercase letters, digits, and special characters. +> - Be different from the user name. +> - Not contain words in the dictionary. After completing the settings, enter **c** to go back to the main menu. -- Gitee From d2f6e5c5071f51216814497c9817ee6e65888463 Mon Sep 17 00:00:00 2001 From: hemiao Date: Wed, 9 Jul 2025 16:10:55 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E2=80=9C=E8=A7=A3=E5=86=B3pr=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...77\347\224\250\346\226\207\346\241\243.md" | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git "a/docs/zh/docs/KubeEdge/KubeEdge\344\275\277\347\224\250\346\226\207\346\241\243.md" "b/docs/zh/docs/KubeEdge/KubeEdge\344\275\277\347\224\250\346\226\207\346\241\243.md" index c2cf6145f..f0f2a7e9e 100644 --- "a/docs/zh/docs/KubeEdge/KubeEdge\344\275\277\347\224\250\346\226\207\346\241\243.md" +++ "b/docs/zh/docs/KubeEdge/KubeEdge\344\275\277\347\224\250\346\226\207\346\241\243.md" @@ -12,7 +12,7 @@ KubeEdge将Kubernetes的能力延伸到了边缘场景中，为云和边缘之 **1）本示例要求KubeEdge版本必须是v1.2.1+，此次选择最新版的KubeEdge v1.8.0** -``` +```sh [root@ke-cloud ~]# kubectl get node NAME STATUS ROLES AGE VERSION ke-cloud Ready master 13h v1.20.2 @@ -23,28 +23,29 @@ ke-edge1 Ready agent,edge 64s v1.19.3-kubeedge-v1.8.0 **2）确保k8s apiserver开启了以下配置：** -``` ---insecuret-port=8080 +```shell +--insecure-port=8080 --insecure-bind-address=0.0.0.0 ``` + 可以通过修改/etc/kubernetes/manifests/kube-apiserver.yaml文件，并重启k8s-apiserver组件的pod来进行更改。 **3）安装golang：** -``` +```sh [root@ke-cloud ~]# wget https://golang.google.cn/dl/go1.14.4.linux-amd64.tar.gz [root@ke-cloud ~]# tar -zxvf go1.14.4.linux-amd64.tar.gz -C /usr/local ``` **4）配置golang环境：** -``` +```sh [root@ke-cloud ~]# vim /etc/profile ``` 文件末尾添加： -``` +```sh export GOROOT=/usr/local/go export GOPATH=/data/gopath export PATH=$PATH:$GOROOT/bin:$GOPATH/bin @@ -52,7 +53,7 @@ export PATH=$PATH:$GOROOT/bin:$GOPATH/bin **5）应用改变：** -``` +```sh [root@ke-cloud ~]# source /etc/profile [root@ke-cloud ~]# mkdir -p /data/gopath && cd /data/gopath [root@ke-cloud ~]# mkdir -p src pkg bin @@ -60,14 +61,15 @@ export PATH=$PATH:$GOROOT/bin:$GOPATH/bin **6）下载示例代码：** -``` +```sh [root@ke-cloud ~]# git clone https://github.com/kubeedge/examples.git $GOPATH/src/github.com/kubeedge/examples ``` ## 2. 创建device model和device **1）创建device model** -``` + +```sh [root@ke-cloud ~]# cd $GOPATH/src/github.com/kubeedge/examples/kubeedge-counter-demo/crds [root@ke-cloud crds~]# kubectl create -f kubeedge-counter-model.yaml ``` @@ -76,7 +78,7 @@ export PATH=$PATH:$GOROOT/bin:$GOPATH/bin 根据你的实际情况修改matchExpressions： -``` +```sh [root@ke-cloud ~]# cd $GOPATH/src/github.com/kubeedge/examples/kubeedge-counter-demo/crds [root@ke-cloud crds~]# vim kubeedge-counter-instance.yaml apiVersion: devices.kubeedge.io/v1alpha1 @@ -117,7 +119,8 @@ status: **1）修改代码** 云端应用web-controller-app用来控制边缘端的pi-counter-app应用，该程序默认监听的端口号为80，此处修改为8089，如下所示： -``` + +```sh [root@ke-cloud ~]# cd $GOPATH/src/github.com/kubeedge/examples/kubeedge-counter-demo/web-controller-app [root@ke-cloud web-controller-app~]# vim main.go package main @@ -139,14 +142,14 @@ func main() { 注意：构建镜像时，请将源码拷贝到GOPATH对应的路径下，如果开启了go mod请关闭。 -``` +```sh [root@ke-cloud web-controller-app~]# make all [root@ke-cloud web-controller-app~]# make docker ``` **3）部署web-controller-app** -``` +```sh [root@ke-cloud ~]# cd $GOPATH/src/github.com/kubeedge/examples/kubeedge-counter-demo/crds [root@ke-cloud crds~]# kubectl apply -f kubeedge-web-controller-app.yaml ``` @@ -159,7 +162,7 @@ func main() { 需要将Makefile中的GOARCH修改为amd64才能运行该容器。 -``` +```sh [root@ke-cloud ~]# cd $GOPATH/src/github.com/kubeedge/examples/kubeedge-counter-demo/counter-mapper [root@ke-cloud counter-mapper~]# vim Makefile .PHONY: all pi-execute-app docker clean @@ -180,7 +183,7 @@ clean: **2）部署Pi Counter App** -``` +```sh [root@ke-cloud ~]# cd $GOPATH/src/github.com/kubeedge/examples/kubeedge-counter-demo/crds [root@ke-cloud crds~]# kubectl apply -f kubeedge-pi-counter-app.yaml @@ -195,7 +198,7 @@ clean: 现在，KubeEdge Demo的云端部分和边缘端的部分都已经部署完毕，如下： -``` +```sh [root@ke-cloud ~]# kubectl get pods -o wide NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES kubeedge-counter-app-758b9b4ffd-f8qjj 1/1 Running 0 26m 192.168.1.66 ke-cloud @@ -207,7 +210,8 @@ kubeedge-pi-counter-c69698d6-rb4xz 1/1 Running 0 2m 192 **1）执行ON命令** 在web页面上选择ON，并点击Execute，可以在edge节点上通过以下命令查看执行结果： -``` + +```sh [root@ke-edge1 ~]# docker logs -f counter-container-id ``` @@ -226,7 +230,8 @@ kubeedge-pi-counter-c69698d6-rb4xz 1/1 Running 0 2m 192 **3）执行OFF命令** 在web页面上选择OFF，并点击Execute，可以在edge节点上通过以下命令查看执行结果： -``` + +```sh [root@ke-edge1 ~]# docker logs -f counter-container-id ``` @@ -236,8 +241,7 @@ kubeedge-pi-counter-c69698d6-rb4xz 1/1 Running 0 2m 192 ## 6. 其他 - -**1）更多的KubeEdge官方示例请参考 https://github.com/kubeedge/examples** +**1）更多的KubeEdge官方示例请参考 ** |名称 | 描述 | |---|---| -- Gitee From 656bccd6122dde9dc10948c1e700cef1a0b98e2f Mon Sep 17 00:00:00 2001 From: hemiao Date: Wed, 9 Jul 2025 16:14:27 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E2=80=9C=E8=A7=A3=E5=86=B3pr=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...beEdge\344\275\277\347\224\250\346\226\207\346\241\243.md" | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git "a/docs/zh/docs/KubeEdge/KubeEdge\344\275\277\347\224\250\346\226\207\346\241\243.md" "b/docs/zh/docs/KubeEdge/KubeEdge\344\275\277\347\224\250\346\226\207\346\241\243.md" index f0f2a7e9e..910e70c85 100644 --- "a/docs/zh/docs/KubeEdge/KubeEdge\344\275\277\347\224\250\346\226\207\346\241\243.md" +++ "b/docs/zh/docs/KubeEdge/KubeEdge\344\275\277\347\224\250\346\226\207\346\241\243.md" @@ -258,8 +258,8 @@ kubeedge-pi-counter-c69698d6-rb4xz 1/1 Running 0 2m 192 **2）使用EdgeMesh做边缘服务发现** -https://github.com/kubeedge/edgemesh + **3）自定义云边消息路由** -https://kubeedge.io/en/docs/developer/custom_message_deliver/ + -- Gitee From 741e1d2bc782cadf89afbbc7a5d4dc10990ed5eb Mon Sep 17 00:00:00 2001 From: hemiao Date: Wed, 9 Jul 2025 16:27:38 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E2=80=9C=E8=A7=A3=E5=86=B3pr=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ve-development-cluster-deployment-guide.md | 182 ++++++++---------- ...50\347\275\262\346\214\207\345\257\274.md" | 160 +++++++-------- 2 files changed, 163 insertions(+), 179 deletions(-) diff --git a/docs/en/docs/ClusterDeployment/native-development-cluster-deployment-guide.md b/docs/en/docs/ClusterDeployment/native-development-cluster-deployment-guide.md index c1fb74c51..bb594ef73 100644 --- a/docs/en/docs/ClusterDeployment/native-development-cluster-deployment-guide.md +++ b/docs/en/docs/ClusterDeployment/native-development-cluster-deployment-guide.md @@ -52,20 +52,20 @@ The following table lists the software and images required during installation. 1. Change the host name. The following uses one host as an example. - ``` + ```shell # hostnamectl set-hostname lab1 # sudo -i ``` 2. Open the **/etc/hosts** files of the three hosts. - ``` + ```shell # vim /etc/hosts ``` 3. Add the following content (IP address + host name) to the **hosts** file: - ``` + ```shell 197.xxx.xxx.xxx lab1 197.xxx.xxx.xxx lab2 197.xxx.xxx.xxx lab3 @@ -75,27 +75,27 @@ The following table lists the software and images required during installation. 1. Disable the firewall. - ``` + ```shell # systemctl stop firewalld # systemctl disable firewalld ``` 2. Disable SELinux. - ``` + ```shell # setenforce 0 ``` 3. Disable the system swap. - ``` + ```shell # swapoff -a # sed -ri 's/.*swap.*/#&/' /etc/fstab ``` 4. Enable the forwarding mechanisms. - ``` + ```shell # cat > /etc/sysctl.d/kubernetes.conf < **CI/CD** > **Runners** > **Expand**. - - 5. Record the address and token for registering the Runner. - - 6. Import certificate files. Check and generate certificate files **admin.crt**, **admin.key**, and **ca.crt** on the master node. @@ -535,8 +525,6 @@ Perform registration in the GitLab Runner container. Currently, interactive regi ![register-gitlab-runner](figures/15.register-gitlab-runner.jpg) - - Upload the prepared **gitlab-runner-helper** image to the private image repository in advance, go to the GitLab Runner container, and modify the configuration file. ```shell @@ -564,7 +552,7 @@ Upload the prepared **gitlab-runner-helper** image to the private image reposito # kubectl edit configmaps coredns -n kube-system ``` -![dns](figures/18.dns-config.png) + ![dns](figures/18.dns-config.png) 3. Restart the CoreDNS service. @@ -577,12 +565,8 @@ Upload the prepared **gitlab-runner-helper** image to the private image reposito Return to the GitLab web IDE and choose **CI/CD** > **Editor** > **Create new CI/CD pipeline**. - - - Compile the YAML file as follows: ![yaml](figures/20.yaml.png) - Choose **Pipelines** and view the status. - - diff --git "a/docs/zh/docs/ClusterDeployment/\346\224\257\346\214\201\345\216\237\347\224\237\345\274\200\345\217\221\347\216\257\345\242\203\346\211\247\350\241\214\346\234\272\351\233\206\347\276\244\351\203\250\347\275\262\346\214\207\345\257\274.md" "b/docs/zh/docs/ClusterDeployment/\346\224\257\346\214\201\345\216\237\347\224\237\345\274\200\345\217\221\347\216\257\345\242\203\346\211\247\350\241\214\346\234\272\351\233\206\347\276\244\351\203\250\347\275\262\346\214\207\345\257\274.md" index b86525708..5eb3efeca 100644 --- "a/docs/zh/docs/ClusterDeployment/\346\224\257\346\214\201\345\216\237\347\224\237\345\274\200\345\217\221\347\216\257\345\242\203\346\211\247\350\241\214\346\234\272\351\233\206\347\276\244\351\203\250\347\275\262\346\214\207\345\257\274.md" +++ "b/docs/zh/docs/ClusterDeployment/\346\224\257\346\214\201\345\216\237\347\224\237\345\274\200\345\217\221\347\216\257\345\242\203\346\211\247\350\241\214\346\234\272\351\233\206\347\276\244\351\203\250\347\275\262\346\214\207\345\257\274.md" @@ -52,20 +52,20 @@ 1. 修改主机名，以其中一台机器为例。 - ``` + ```shell # hostnamectl set-hostname lab1 # sudo -i ``` 2. 配置主机名解析，编辑三台服务器的/etc/hosts文件。 - ``` + ```shell # vim /etc/hosts ``` 3. 在hosts文件中添加以下内容（IP+主机名） - ``` + ```shell 197.xxx.xxx.xxx lab1 197.xxx.xxx.xxx lab2 197.xxx.xxx.xxx lab3 @@ -75,27 +75,27 @@ 1. 关闭防火墙。 - ``` + ```shell # systemctl stop firewalld # systemctl disable firewalld ``` 2. 禁用selinux。 - ``` + ```shell # setenforce 0 ``` 3. 关闭系统swap。 - ``` + ```shell # swapoff -a # sed -ri 's/.*swap.*/#&/' /etc/fstab ``` 4. 网络配置，开启相应的转发机制。 - ``` + ```shell # cat > /etc/sysctl.d/kubernetes.conf < Date: Wed, 9 Jul 2025 16:38:15 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E2=80=9C=E8=A7=A3=E5=86=B3pr=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../native-development-cluster-deployment-guide.md | 2 +- ...\276\244\351\203\250\347\275\262\346\214\207\345\257\274.md" | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/docs/ClusterDeployment/native-development-cluster-deployment-guide.md b/docs/en/docs/ClusterDeployment/native-development-cluster-deployment-guide.md index bb594ef73..bf75bf950 100644 --- a/docs/en/docs/ClusterDeployment/native-development-cluster-deployment-guide.md +++ b/docs/en/docs/ClusterDeployment/native-development-cluster-deployment-guide.md @@ -164,7 +164,7 @@ The following table lists the software and images required during installation. ## Installing kubeadm, kubectl, kubelet, and iSulad 1. Run **yum install** to install the software packages. - + ```shell # yum install -y kubernetes-kubeadm # yum install -y kubernetes-client diff --git "a/docs/zh/docs/ClusterDeployment/\346\224\257\346\214\201\345\216\237\347\224\237\345\274\200\345\217\221\347\216\257\345\242\203\346\211\247\350\241\214\346\234\272\351\233\206\347\276\244\351\203\250\347\275\262\346\214\207\345\257\274.md" "b/docs/zh/docs/ClusterDeployment/\346\224\257\346\214\201\345\216\237\347\224\237\345\274\200\345\217\221\347\216\257\345\242\203\346\211\247\350\241\214\346\234\272\351\233\206\347\276\244\351\203\250\347\275\262\346\214\207\345\257\274.md" index 5eb3efeca..8b26ef944 100644 --- "a/docs/zh/docs/ClusterDeployment/\346\224\257\346\214\201\345\216\237\347\224\237\345\274\200\345\217\221\347\216\257\345\242\203\346\211\247\350\241\214\346\234\272\351\233\206\347\276\244\351\203\250\347\275\262\346\214\207\345\257\274.md" +++ "b/docs/zh/docs/ClusterDeployment/\346\224\257\346\214\201\345\216\237\347\224\237\345\274\200\345\217\221\347\216\257\345\242\203\346\211\247\350\241\214\346\234\272\351\233\206\347\276\244\351\203\250\347\275\262\346\214\207\345\257\274.md" @@ -164,7 +164,7 @@ ## 安装kubeadm、kubectl、kubelet组件及iSulad 1. 使用yum install安装软件包。 - + ```shell # yum install -y kubernetes-kubeadm # yum install -y kubernetes-client -- Gitee From 81b551a8f67e86ee9b12c4174e599f82a84a2eab Mon Sep 17 00:00:00 2001 From: hemiao Date: Wed, 9 Jul 2025 16:44:17 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E2=80=9C=E8=A7=A3=E5=86=B3pr=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/en/docs/I3/overview.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/docs/I3/overview.md b/docs/en/docs/I3/overview.md index 1e857b602..a581b1fc3 100644 --- a/docs/en/docs/I3/overview.md +++ b/docs/en/docs/I3/overview.md @@ -19,13 +19,13 @@ The interface of i3 is as follows: 2. As i3 is only a window manager, it does not contain the [components](https://wiki.archlinux.org/title/desktop_environment#Custom_environments) required in a complete Linux desktop environment. You need to install some basic components. ```bash - dnf in xorg-x11-drv-* lightdm lightdm-gtk + dnf install xorg-x11-drv-* lightdm lightdm-gtk ``` 3. Install i3 components. ```bash - dnf in i3 i3status i3blocks i3lock i3blocks-contrib \ + dnf install i3 i3status i3blocks i3lock i3blocks-contrib \ xfce4-terminal xcompmgr acpi dmenu ``` -- Gitee From 137dbb8fe7762dfd04f87e77f85a80b257609c37 Mon Sep 17 00:00:00 2001 From: hemiao Date: Wed, 9 Jul 2025 16:48:25 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E2=80=9C=E8=A7=A3=E5=86=B3pr=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/en/docs/I3/overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/docs/I3/overview.md b/docs/en/docs/I3/overview.md index a581b1fc3..8be5db42f 100644 --- a/docs/en/docs/I3/overview.md +++ b/docs/en/docs/I3/overview.md @@ -1,6 +1,6 @@ # i3 in openEuler User Guide -## What Is i3? +## What Is i3 [i3](https://i3wm.org/) is a [tiling window manager](https://en.wikipedia.org/wiki/Tiling_window_manager). -- Gitee From 5cec20bdd31d207506c44c39572fe1be28840f9c Mon Sep 17 00:00:00 2001 From: hemiao Date: Wed, 9 Jul 2025 16:52:45 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E2=80=9C=E8=A7=A3=E5=86=B3pr=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/en/docs/rubik/overview.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/docs/rubik/overview.md b/docs/en/docs/rubik/overview.md index 6dd4a3c0f..752de4d3f 100644 --- a/docs/en/docs/rubik/overview.md +++ b/docs/en/docs/rubik/overview.md @@ -4,7 +4,7 @@ Low server resource utilization has always been a recognized challenge in the industry. With the development of cloud native technologies, hybrid deployment of online (high-priority) and offline (low-priority) services becomes an effective means to improve resource utilization. -In hybrid service deployment scenarios, Rubik can properly schedule resources based on Quality if Service (QoS) levels to greatly improve resource utilization while ensuring the quality of online services. +In hybrid service deployment scenarios, Rubik can properly schedule resources based on Quality of Service (QoS) levels to greatly improve resource utilization while ensuring the quality of online services. Rubik supports the following features: -- Gitee From 56f47fd6351f2a2d31a37899d605a7c0e2dca2ca Mon Sep 17 00:00:00 2001 From: hemiao Date: Wed, 9 Jul 2025 17:29:24 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E2=80=9C=E8=A7=A3=E5=86=B3pr=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Administration/using-dnf-to-manage-software-packages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/docs/Administration/using-dnf-to-manage-software-packages.md b/docs/en/docs/Administration/using-dnf-to-manage-software-packages.md index c45d8b21a..7e77c2b71 100644 --- a/docs/en/docs/Administration/using-dnf-to-manage-software-packages.md +++ b/docs/en/docs/Administration/using-dnf-to-manage-software-packages.md @@ -99,7 +99,7 @@ Common options are as follows:

The options are 1 and 0, indicating whether to allow the update of outdated RPM packages. The default value is 1, indicating that the update is allowed.

-<tr id="en-us_topic_0151921080_r30106389463d4ba0bf505a6b78034b23">

gpgcheck

+;

gpgcheck

The options are 1 and 0, indicating whether to perform GPG verification. The default value is 1, indicating that verification is required.

-- Gitee From a28d68bc971c65401d1e3d4a96b16417f0a3dcc4 Mon Sep 17 00:00:00 2001 From: hemiao Date: Wed, 9 Jul 2025 17:30:47 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E2=80=9C=E8=A7=A3=E5=86=B3pr=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Administration/using-dnf-to-manage-software-packages.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/docs/Administration/using-dnf-to-manage-software-packages.md b/docs/en/docs/Administration/using-dnf-to-manage-software-packages.md index 7e77c2b71..d52e616d4 100644 --- a/docs/en/docs/Administration/using-dnf-to-manage-software-packages.md +++ b/docs/en/docs/Administration/using-dnf-to-manage-software-packages.md @@ -99,7 +99,7 @@ Common options are as follows:

The options are 1 and 0, indicating whether to allow the update of outdated RPM packages. The default value is 1, indicating that the update is allowed.

-;

gpgcheck

+

gpgcheck

The options are 1 and 0, indicating whether to perform GPG verification. The default value is 1, indicating that verification is required.

-- Gitee