summaryrefslogtreecommitdiff
path: root/0091-add-enable-cri-v1-in-k8s-integration.patch
diff options
context:
space:
mode:
Diffstat (limited to '0091-add-enable-cri-v1-in-k8s-integration.patch')
-rw-r--r--0091-add-enable-cri-v1-in-k8s-integration.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/0091-add-enable-cri-v1-in-k8s-integration.patch b/0091-add-enable-cri-v1-in-k8s-integration.patch
new file mode 100644
index 0000000..8c36478
--- /dev/null
+++ b/0091-add-enable-cri-v1-in-k8s-integration.patch
@@ -0,0 +1,54 @@
+From 1f69ffe589f7225a1db83377e276ddbab963bd16 Mon Sep 17 00:00:00 2001
+From: jikai <jikai11@huawei.com>
+Date: Tue, 21 May 2024 01:13:08 +0000
+Subject: [PATCH 091/108] add enable cri v1 in k8s integration
+
+Signed-off-by: jikai <jikai11@huawei.com>
+---
+ docs/manual/k8s_integration.md | 9 +++++++++
+ docs/manual/k8s_integration_zh.md | 9 +++++++++
+ 2 files changed, 18 insertions(+)
+
+diff --git a/docs/manual/k8s_integration.md b/docs/manual/k8s_integration.md
+index 8fcd0a54..14de0ef4 100644
+--- a/docs/manual/k8s_integration.md
++++ b/docs/manual/k8s_integration.md
+@@ -20,6 +20,15 @@
+
+ if `hosts` is not configured, the default endpoint is `unix:///var/run/isulad.sock`.
+
++ `iSulad` supports both `CRI V1alpha2` and `CRI V1`, and uses `CRI V1alph2` by default.
++ If `CRI V1` is required, it can be configured in `/etc/isulad/daemon.json` to enable `CRI V1`:
++
++ ```json
++ "enable-cri-v1": true,
++ ```
++
++ If `iSulad` is compiled from source codes, `-D ENABLE_CRI_API_V1=ON` option is required in cmake.
++
+ 2. Restart `isulad`:
+
+ ```bash
+diff --git a/docs/manual/k8s_integration_zh.md b/docs/manual/k8s_integration_zh.md
+index 6dda1e4d..26ba6cc4 100644
+--- a/docs/manual/k8s_integration_zh.md
++++ b/docs/manual/k8s_integration_zh.md
+@@ -20,6 +20,15 @@
+
+ 如果`hosts`没有配置,默认的`endpoint`为``unix:///var/run/isulad.sock``
+
++ `iSulad`同时支持`CRI V1alpha2`和`CRI V1`两种`CRI`接口,默认使用`CRI V1alph2`,若需使用`CRI V1`,
++ 需要在`/etc/isulad/daemon.json`对`iSulad`进行相关配置,配置方式为:
++
++ ```json
++ "enable-cri-v1": true,
++ ```
++
++ 若使用源码编译`iSulad`,还需在编译时增加cmake编译选项`-D ENABLE_CRI_API_V1=ON`。
++
+ 2. 重启`isulad`
+
+ ```bash
+--
+2.25.1
+