diff --git a/docs/en/docs/Administration/basic-configuration.md b/docs/en/docs/Administration/basic-configuration.md index 4115a543d2831af98d18302ce9cc7de41fef364a..4c2e09cb77fc4205891ae5743558d80664e093ba 100644 --- a/docs/en/docs/Administration/basic-configuration.md +++ b/docs/en/docs/Administration/basic-configuration.md @@ -33,6 +33,7 @@ - [Disabling Network Drivers](#disabling-network-drivers) + ## Setting the System Locale System locale settings are stored in the **/etc/locale.conf** file and can be modified by the **localectl** command. These settings are read at system boot by the systemd daemon. @@ -45,7 +46,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/ClusterDeployment/k8s+isulad-deployment.md b/docs/en/docs/ClusterDeployment/k8s+isulad-deployment.md index cbb015d1bb72c1ffe83ad58a3bc9cf9c3b0afb19..555732b20e6e43e1a1b3a533cee2876dd2d90908 100644 --- a/docs/en/docs/ClusterDeployment/k8s+isulad-deployment.md +++ b/docs/en/docs/ClusterDeployment/k8s+isulad-deployment.md @@ -128,7 +128,7 @@ The following table lists software packages and images used in the example. The 7. Create the configuration file. ```shell - $ vim br_netfilte.service + $ vim br_netfilter.service [Unit] Description=To enable the core module br_netfilter when reboot 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..bb594ef731e3886c355e12afc814e1815f151199 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/Installation/installation-guideline.md b/docs/en/docs/Installation/installation-guideline.md index 3091497256a240636160af9205f740d3ec314bf6..8f49116e5e7503951bb40137e82c63db42b7d248 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. >![](./public_sys-resources/icon-note.gif) **Note** > diff --git a/docs/en/docs/Installation/installation-preparations.md b/docs/en/docs/Installation/installation-preparations.md index 8e2d04198ad44a4bc1a047acd5c37b756e53655a..b434a3ee66f76e569b389354ea53e6280b28b624 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 diff --git "a/docs/zh/docs/ClusterDeployment/K8s+iSulad\347\216\257\345\242\203\351\203\250\347\275\262.md" "b/docs/zh/docs/ClusterDeployment/K8s+iSulad\347\216\257\345\242\203\351\203\250\347\275\262.md" index 1526f1ebbdf8c201db196eceadcb7c32def05483..417d117a59b51f5a0b6c770526c129e36ccee4f9 100644 --- "a/docs/zh/docs/ClusterDeployment/K8s+iSulad\347\216\257\345\242\203\351\203\250\347\275\262.md" +++ "b/docs/zh/docs/ClusterDeployment/K8s+iSulad\347\216\257\345\242\203\351\203\250\347\275\262.md" @@ -126,7 +126,8 @@ 7. 添加配置文件。 - 配置文件br_netfilte.service应该放在systemd的service目录,一般在/usr/lib/systemd/system。 + 配置文件br_netfilter.service应该放在systemd的service目录,一般在/usr/lib/systemd/system。 + ```shell # vim br_netfilte.service @@ -158,84 +159,85 @@ 1. 使用yum install安装软件包。 kubernetes相关的组件在EPOL中,使用yum安装前需要在yum源中配置EPOL源。 - ```shell - # yum install -y kubernetes-kubeadm - # yum install -y kubernetes-client - # yum install -y kubernetes-kubelet - # yum install -y iSulad - ``` + + ```shell + # yum install -y kubernetes-kubeadm + # yum install -y kubernetes-client + # yum install -y kubernetes-kubelet + # yum install -y iSulad + ``` 2. 设置kubelet开机启动。 - ```shell - # systemctl enable kubelet - ``` + ```shell + # systemctl enable kubelet + ``` ## 修改isulad配置 1. 进入/etc/isulad,修改daemon.json文件。 - ```shell - # vi /etc/isulad/daemon.json - ``` + ```shell + # vi /etc/isulad/daemon.json + ``` 2. 修改并添加配置文件中的内容。 - ```json -{ - "group": "isula", - "default-runtime": "runc", - "graph": "/var/lib/isulad", - "state": "/var/run/isulad", - "engine": "lcr", - "log-level": "ERROR", - "pidfile": "/var/run/isulad.pid", - "log-opts": { - "log-file-mode": "0600", - "log-path": "/var/lib/isulad", - "max-file": "1", - "max-size": "30KB" - }, - "log-driver": "stdout", - "container-log": { - "driver": "json-file" - }, - "hook-spec": "/etc/default/isulad/hooks/default.json", - "start-timeout": "2m", - "storage-driver": "overlay2", - "storage-opts": [ - "overlay2.override_kernel_check=true" - ], - "registry-mirrors": [ - "docker.io" - ], - "insecure-registries": [ - "k8s.gcr.io", - "quay.io", - "oci.inhuawei.com", - "rnd-dockerhub.huawei.com", - "registry.aliyuncs.com", - "【本地私有镜像仓IP】" - ], - "pod-sandbox-image": "k8s.gcr.io/pause:3.2", - "native.umask": "normal", - "network-plugin": "cni", - "cni-bin-dir": "/opt/cni/bin", - "cni-conf-dir": "/etc/cni/net.d", - "image-layer-check": false, - "use-decrypted-key": true, - "insecure-skip-verify-enforce": false, - "cri-runtimes": { - "kata": "io.containerd.kata.v2" - } -} - ``` + ```json + { + "group": "isula", + "default-runtime": "runc", + "graph": "/var/lib/isulad", + "state": "/var/run/isulad", + "engine": "lcr", + "log-level": "ERROR", + "pidfile": "/var/run/isulad.pid", + "log-opts": { + "log-file-mode": "0600", + "log-path": "/var/lib/isulad", + "max-file": "1", + "max-size": "30KB" + }, + "log-driver": "stdout", + "container-log": { + "driver": "json-file" + }, + "hook-spec": "/etc/default/isulad/hooks/default.json", + "start-timeout": "2m", + "storage-driver": "overlay2", + "storage-opts": [ + "overlay2.override_kernel_check=true" + ], + "registry-mirrors": [ + "docker.io" + ], + "insecure-registries": [ + "k8s.gcr.io", + "quay.io", + "oci.inhuawei.com", + "rnd-dockerhub.huawei.com", + "registry.aliyuncs.com", + "【本地私有镜像仓IP】" + ], + "pod-sandbox-image": "k8s.gcr.io/pause:3.2", + "native.umask": "normal", + "network-plugin": "cni", + "cni-bin-dir": "/opt/cni/bin", + "cni-conf-dir": "/etc/cni/net.d", + "image-layer-check": false, + "use-decrypted-key": true, + "insecure-skip-verify-enforce": false, + "cri-runtimes": { + "kata": "io.containerd.kata.v2" + } + } + ``` 3. 重启isulad服务。 - ```shell - # systemctl restart isulad - ``` + ```shell + # systemctl restart isulad + ``` ## 加载isulad镜像 @@ -245,8 +247,8 @@ # kubeadm config images list ``` - 注意对应的版本号,输出结果如图所示。 -![](figures/1.%E6%9F%A5%E7%9C%8B%E9%9C%80%E8%A6%81%E9%95%9C%E5%83%8F.png) + 注意对应的版本号,输出结果如图所示。 + ![](figures/1.%E6%9F%A5%E7%9C%8B%E9%9C%80%E8%A6%81%E9%95%9C%E5%83%8F.png) 2. 使用isula拉取所需镜像。 @@ -382,4 +384,4 @@ pod-network-cidr 指定pod分配的ip段 ```shell # kubeadm reset -``` \ No newline at end of file +``` 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 7f0acb33d3f754b6aed57a584a20aa6193f2bf14..ba6cb48d8ff5d6c4ab6d805c7acbfff6cede0ae1 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 < - 如果当前使用物理光盘安装操作系统,且在重启过程中安装光盘没有自动弹出,请手动取出光盘,则可以直接进入openEuler命令行登录界面。 > - 如果当前使用虚拟光驱安装操作系统,则需要修改服务器的启动项为“硬盘”,然后重启服务器,则可以直接进入openEuler命令行登录界面。 -### 文本模式安装 +## 文本模式安装 +>![](./public_sys-resources/icon-note.gif) **说明:** +> +>- UEFI启动模式下,选择安装模式,按“e”进入参数编辑界面,在linux启动参数行末尾添加inst.text,按“ctrl+x”,进入文本安装。 +>- Legacy启动模式下,选择安装模式,按“Tab”进入参数编辑界面,添加启动参数inst.text,按回车键,进入文本安装。 可以通过界面提示操作键盘进行文本程序安装。如【图1】所示。 **图 1** 文本菜单 diff --git "a/docs/zh/docs/Releasenotes/\345\205\263\351\224\256\347\211\271\346\200\247.md" "b/docs/zh/docs/Releasenotes/\345\205\263\351\224\256\347\211\271\346\200\247.md" index ba193499e1f16cfdd263679ca5c30ed566b5d893..5c3928d3d8017f02097e5618fd11dea070d7798b 100644 --- "a/docs/zh/docs/Releasenotes/\345\205\263\351\224\256\347\211\271\346\200\247.md" +++ "b/docs/zh/docs/Releasenotes/\345\205\263\351\224\256\347\211\271\346\200\247.md" @@ -55,7 +55,6 @@ openEuler 22.03 LTS SP4 基于 Linux Kernel 5.10 构建,在此基础上,同 - xfs atomic write特性:数据库(如MySQL的InnoDB存储引擎)使用Doublewrite机制,写2次16KB数据到磁盘,来保护故障场景下数据不受部分写损坏的影响。xfs atomic write特性基于硬件的原子写能力,通过保证用户态软件发起的Direct IO原子性写入磁盘,可以替代数据库Doublewrite机制,以减少IO写数量,提升数据库的写入性能。 - 增强核隔离特性:在HPC场景,由于每个线程会频繁进行同步,OS背景噪声对性能的影响会随着节点数增多逐步放大,OS背景噪声包括背景守护进程、外设中断、内核背景线程等。增强核隔离特性将系统CPU分为housekeeping CPU和non-housekeeping CPU,将OS背景噪声集中在housekeeping CPU上,non-housekeeping CPU只运行业务计算任务,通过减少业务运行时背景噪声的干扰,提升业务性能。 - non-housekeeping CPU可以通过启动参数nohz_full和isolcpus指定,增加enhanced_isolcpus参数后可以进一步消除磁盘IO的噪声干扰。详情可参考文档 [kernel-parameters.txt](https://gitee.com/openeuler/kernel/blob/openEuler-22.03-LTS/Documentation/admin-guide/kernel-parameters.txt)。 ### 调度