diff --git a/docs/en/docs/Administration/basic-configuration.md b/docs/en/docs/Administration/basic-configuration.md index c2a061b81b87618292682538e308c194d10e4bd2..226cd5c39945547ec73126f9e1be1c59846eb880 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 3a1f6b6ddedf0ebd318477bd724157c27cccd6e2..d52e616d4d1b3b2c127f9e744b5594aa49941c92 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.

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 c1fb74c51983729a75f51b205dcab6c2d50febf2..bf75bf9508ecf70956e1fef35e5fa25b3fe4460b 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/en/docs/I3/overview.md b/docs/en/docs/I3/overview.md index 1e857b6026c6615b4d1180fb64c01f30ed7a2125..8be5db42f041813237ff1af1200569d596d1e277 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). @@ -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 ``` diff --git a/docs/en/docs/Installation/installation-guideline.md b/docs/en/docs/Installation/installation-guideline.md index a8aa5ebe6343d891634fa615a64b0c6d50aba13f..953d966b490be747f888c596e98843ef5215810d 100644 --- a/docs/en/docs/Installation/installation-guideline.md +++ b/docs/en/docs/Installation/installation-guideline.md @@ -131,7 +131,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. @@ -342,7 +342,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 @@ -356,6 +357,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 @@ -417,6 +419,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:** @@ -433,9 +436,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 @@ -473,10 +479,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 @@ -489,10 +495,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. 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 b865257089194520bde77437013336c76b2ce410..8b26ef9445634a58665372a368abc305ea622fbd 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 < @@ -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官方示例请参考 ** |名称 | 描述 | |---|---| @@ -254,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/ +