From 99d7175c5509b4f98d2bc8169c3fcdefae1f8a03 Mon Sep 17 00:00:00 2001 From: Abner Date: Mon, 22 Apr 2024 09:38:56 +0800 Subject: [PATCH] add cri version notice in installation (#178) Signed-off-by: Abner-1 --- .github/workflows/pre_dict.json | 6 +++++- docs/installation.md | 2 ++ .../docusaurus-plugin-content-docs/current/installation.md | 2 ++ .../version-v1.6/installation.md | 2 ++ versioned_docs/version-v1.6/installation.md | 2 ++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pre_dict.json b/.github/workflows/pre_dict.json index a52e73f8d0..cfd6c3504f 100644 --- a/.github/workflows/pre_dict.json +++ b/.github/workflows/pre_dict.json @@ -802,5 +802,9 @@ "openapi", "patchesStrategicMerge", "tcpSocket", - "x-kubernetes-patch" + "x-kubernetes-patch", + "CronJob", + "GitOps\uff1f", + "Devops\uff1f", + "timeZone" ] diff --git a/docs/installation.md b/docs/installation.md index 1cf8354afc..a2c2b0b82c 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -6,6 +6,8 @@ title: Installation - Since v1.6.0 (alpha/beta), OpenKruise requires **Kubernetes version >= 1.18**. However it's still possible to use OpenKruise with Kubernetes versions 1.16 and 1.17 as long as KruiseDaemon is not enabled(install/upgrade kruise charts with featureGates="KruiseDaemon=false") +- Since v1.6.0 (alpha/beta), KruiseDaemon will **no longer support v1alpha2 CRI runtimes**. However, it is still possible to use OpenKruise on Kubernetes clusters with nodes that only support v1alpha2 CRI, as long as KruiseDaemon is not enabled (install/upgrade Kruise charts with featureGates="KruiseDaemon=false"). + ## Install with helm Kruise can be simply installed by helm v3.5+, which is a simple command-line tool and you can get it from [here](https://github.com/helm/helm/releases). diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/installation.md b/i18n/zh/docusaurus-plugin-content-docs/current/installation.md index a2a62683b8..301846dce0 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/installation.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/installation.md @@ -6,6 +6,8 @@ title: 安装 - 从 v1.6.0 (alpha/beta) 开始，OpenKruise 要求在 **Kubernetes >= 1.18** 以上版本的集群中安装和使用。如果你关闭了 Kruise-Daemon 组件（featureGates="KruiseDaemon=false"），你依然可以在 K8S 1.16 和 1.17 的集群上安装和使用。 +- 从 v1.6.0 (alpha/beta) 开始，Kruise-Daemon 将**不再支持 v1alpha2 CRI 的运行时**。如果你关闭了 Kruise-Daemon 组件（featureGates="KruiseDaemon=false"），你依然可以在只支持 v1alpha2 CRI 的运行时节点所在集群上安装和使用 OpenKruise。 + ## 通过 helm 安装 建议采用 helm v3.5+ 来安装 Kruise，helm 是一个简单的命令行工具可以从 [这里](https://github.com/helm/helm/releases) 获取。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-v1.6/installation.md b/i18n/zh/docusaurus-plugin-content-docs/version-v1.6/installation.md index a2a62683b8..301846dce0 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-v1.6/installation.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-v1.6/installation.md @@ -6,6 +6,8 @@ title: 安装 - 从 v1.6.0 (alpha/beta) 开始，OpenKruise 要求在 **Kubernetes >= 1.18** 以上版本的集群中安装和使用。如果你关闭了 Kruise-Daemon 组件（featureGates="KruiseDaemon=false"），你依然可以在 K8S 1.16 和 1.17 的集群上安装和使用。 +- 从 v1.6.0 (alpha/beta) 开始，Kruise-Daemon 将**不再支持 v1alpha2 CRI 的运行时**。如果你关闭了 Kruise-Daemon 组件（featureGates="KruiseDaemon=false"），你依然可以在只支持 v1alpha2 CRI 的运行时节点所在集群上安装和使用 OpenKruise。 + ## 通过 helm 安装 建议采用 helm v3.5+ 来安装 Kruise，helm 是一个简单的命令行工具可以从 [这里](https://github.com/helm/helm/releases) 获取。 diff --git a/versioned_docs/version-v1.6/installation.md b/versioned_docs/version-v1.6/installation.md index 1cf8354afc..a2c2b0b82c 100644 --- a/versioned_docs/version-v1.6/installation.md +++ b/versioned_docs/version-v1.6/installation.md @@ -6,6 +6,8 @@ title: Installation - Since v1.6.0 (alpha/beta), OpenKruise requires **Kubernetes version >= 1.18**. However it's still possible to use OpenKruise with Kubernetes versions 1.16 and 1.17 as long as KruiseDaemon is not enabled(install/upgrade kruise charts with featureGates="KruiseDaemon=false") +- Since v1.6.0 (alpha/beta), KruiseDaemon will **no longer support v1alpha2 CRI runtimes**. However, it is still possible to use OpenKruise on Kubernetes clusters with nodes that only support v1alpha2 CRI, as long as KruiseDaemon is not enabled (install/upgrade Kruise charts with featureGates="KruiseDaemon=false"). + ## Install with helm Kruise can be simply installed by helm v3.5+, which is a simple command-line tool and you can get it from [here](https://github.com/helm/helm/releases).