summaryrefslogtreecommitdiff
path: root/0018-Add-compatibility-between-iSulad-and-k8s.patch
diff options
context:
space:
mode:
Diffstat (limited to '0018-Add-compatibility-between-iSulad-and-k8s.patch')
-rw-r--r--0018-Add-compatibility-between-iSulad-and-k8s.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/0018-Add-compatibility-between-iSulad-and-k8s.patch b/0018-Add-compatibility-between-iSulad-and-k8s.patch
new file mode 100644
index 0000000..48d9f0c
--- /dev/null
+++ b/0018-Add-compatibility-between-iSulad-and-k8s.patch
@@ -0,0 +1,57 @@
+From bec48dcd219885abd72cb9973a2e810e3f504269 Mon Sep 17 00:00:00 2001
+From: jikai <jikai11@huawei.com>
+Date: Wed, 15 Nov 2023 10:51:01 +0800
+Subject: [PATCH 18/64] Add compatibility between iSulad and k8s
+
+Signed-off-by: jikai<jikai11@huawei.com>
+---
+ README.md | 13 ++++++++++++-
+ README_zh.md | 12 +++++++++++-
+ 2 files changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/README.md b/README.md
+index 7e4b6de1..e7949dee 100644
+--- a/README.md
++++ b/README.md
+@@ -233,4 +233,15 @@ The standard specification versions that `iSulad` is compatible with are as foll
+
+ - Compatible with OCI 1.0.0.
+ - Compatible with CNI 0.3.0 and above.
+-- Compatible with lcr 2.1.x and above.
+\ No newline at end of file
++- Compatible with lcr 2.1.x and above.
++
++## Kubernetes Support
++
++`iSulad` supports Kubernetes version 1.13 and above. The following table shows the compatibility between `iSulad` and Kubernetes.
++It lists the minimum `iSulad` version required for some given Kubernetes versions.
++
++iSulad Version | Kubernetes Version | CRI Version
++--- | --- | ---
++v2.0.0+ | v1.13-v1.18 | v1alpha2
++v2.0.8+ | v1.19-v1.22 | v1alpha2
++v2.1.4+ | v1.23-v1.26 | v1, v1alpha2
+diff --git a/README_zh.md b/README_zh.md
+index 72942765..1c4dff4f 100755
+--- a/README_zh.md
++++ b/README_zh.md
+@@ -229,4 +229,14 @@ $ sudo isula rm test
+
+ - 兼容 1.0.0 版本的OCI
+ - 兼容 0.3.0 版本以上的CNI
+-- 兼容 2.1.x 版本以上的lcr
+\ No newline at end of file
++- 兼容 2.1.x 版本以上的lcr
++
++## Kubernetes Support
++
++`iSulad`提供对Kubernetes 1.13 版本以上的支持。以下表格显示了 `iSulad` 与 Kubernetes 之间的兼容性。它给出了指定Kubernetes版本下所需要的最低 `iSulad` 版本。
++
++iSulad 版本 | Kubernetes 版本 | CRI 版本
++--- | --- | ---
++v2.0.0+ | v1.13-v1.18 | v1alpha2
++v2.0.8+ | v1.19-v1.22 | v1alpha2
++v2.1.4+ | v1.23-v1.26 | v1, v1alpha2
+--
+2.42.0
+