diff options
Diffstat (limited to '0089-docs-update-cni-doc.patch')
| -rw-r--r-- | 0089-docs-update-cni-doc.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/0089-docs-update-cni-doc.patch b/0089-docs-update-cni-doc.patch new file mode 100644 index 0000000..32d1fad --- /dev/null +++ b/0089-docs-update-cni-doc.patch @@ -0,0 +1,68 @@ +From 7fc8578097b9f8254962dc4fb277492b3251e5cb Mon Sep 17 00:00:00 2001 +From: liuxu <liuxu156@huawei.com> +Date: Thu, 16 May 2024 17:56:08 +0800 +Subject: [PATCH 089/108] docs:update cni doc + +Signed-off-by: liuxu <liuxu156@huawei.com> +--- + README.md | 2 +- + README_zh.md | 2 +- + docs/design/README.md | 2 ++ + docs/design/README_zh.md | 2 ++ + 4 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/README.md b/README.md +index 694ddbc2..7ddc62ab 100644 +--- a/README.md ++++ b/README.md +@@ -228,7 +228,7 @@ Using [ptcr](https://gitee.com/openeuler/ptcr) as a performance test tool , it s + The standard specification versions that `iSulad` is compatible with are as follows: + + - Compatible with OCI 1.0.0. +-- Compatible with CNI 0.3.0 and above. ++- Compatible with CNI 0.3.0 - 1.0.0, iSulad supports CNI 1.0.0 from 2.1.4 version. + - Compatible with lcr 2.1.x and above. + + ## Kubernetes Support +diff --git a/README_zh.md b/README_zh.md +index 5db28f3a..45ac66ac 100755 +--- a/README_zh.md ++++ b/README_zh.md +@@ -224,7 +224,7 @@ $ sudo isula rm test + `iSulad` 能够兼容的标准规范版本如下： + + - 兼容 1.0.0 版本的OCI +-- 兼容 0.3.0 版本以上的CNI ++- 兼容 0.3.0-1.0.0 版本的CNI，iSulad从2.1.4版本后支持 CNI 1.0.0版本 + - 兼容 2.1.x 版本以上的lcr + + ## Kubernetes Support +diff --git a/docs/design/README.md b/docs/design/README.md +index d2a3702d..c171cb20 100644 +--- a/docs/design/README.md ++++ b/docs/design/README.md +@@ -43,6 +43,8 @@ This section contains some design documents for users who want to learn more abo + + - You can see how the cni operator modules are designed in [cni_operator_design](./detailed/Network/cni_operator_design.md). + ++- You can see how the cni operator modules update to CNI v1.0.0 in [cni_1.0.0_change](./detailed/Network/cni_1.0.0_change.md)。 ++ + - You can see how the CRI adapter modules are designed in [CRI_adapter_design](./detailed/Network/CRI_adapter_design.md). + + - You can see how the native network adapter modules are designed in [native_network_adapter_design](./detailed/Network/native_network_adapter_design.md). +diff --git a/docs/design/README_zh.md b/docs/design/README_zh.md +index c6172b6f..0f4cf13e 100644 +--- a/docs/design/README_zh.md ++++ b/docs/design/README_zh.md +@@ -49,6 +49,8 @@ + + - 查看 cni operator 模块的设计文档： [cni_operator_design](./detailed/Network/cni_operator_design_zh.md) 。 + ++- 查看 cni operator 模块升级到CNI v1.0.0的设计文档： [cni_1.0.0_change](./detailed/Network/cni_1.0.0_change.md) 。 ++ + - 查看 CRI adapter 模块的设计文档： [CRI_adapter_design](./detailed/Network/CRI_adapter_design_zh.md) 。 + + - 查看 native network adapter 模块的设计文档： [native_network_adapter_design](./detailed/Network/native_network_adapter_design_zh.md) 。 +-- +2.25.1 + |