From c6ba83859b8e7aa20aaaf116ad2eb658d2e79d7d Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Mon, 21 Oct 2024 13:56:07 -0700 Subject: [PATCH 1/6] [2.9.3] versions table --- src/pages/versions.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/pages/versions.md b/src/pages/versions.md index 0c362cbd673..20054ea9cfb 100644 --- a/src/pages/versions.md +++ b/src/pages/versions.md @@ -18,10 +18,10 @@ Here you can find links to supporting documentation for the current released ver Community - v2.9.2 + v2.9.3 Documentation - Release Notes - Support Matrix + Release Notes +
N/A
✓
✓
@@ -82,6 +82,14 @@ Here you can find links to supporting documentation for previous versions of Ran Prime Community + + v2.9.2 + Documentation + Release Notes + Support Matrix +
✓
+
✓
+ v2.9.1 Documentation From 8abdd21d8addb99256ef0fc6fd5f37c04d30043e Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Mon, 21 Oct 2024 14:00:01 -0700 Subject: [PATCH 2/6] [2.9.3] webhook table entry --- docs/reference-guides/rancher-webhook.md | 1 + versioned_docs/version-2.9/reference-guides/rancher-webhook.md | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/reference-guides/rancher-webhook.md b/docs/reference-guides/rancher-webhook.md index 8a8a3a811df..6461253264b 100644 --- a/docs/reference-guides/rancher-webhook.md +++ b/docs/reference-guides/rancher-webhook.md @@ -20,6 +20,7 @@ Each Rancher version is designed to be compatible with a single version of the w | Rancher Version | Webhook Version | Availability in Prime | Availability in Community | |-----------------|-----------------|-----------------------|---------------------------| +| v2.9.3 | v0.5.3 | ✓ | ✓ | | v2.9.2 | v0.5.2 | ✓ | ✓ | | v2.9.1 | v0.5.1 | ✓ | ✓ | | v2.9.0 | v0.5.0 | ✗ | ✓ | diff --git a/versioned_docs/version-2.9/reference-guides/rancher-webhook.md b/versioned_docs/version-2.9/reference-guides/rancher-webhook.md index 8a8a3a811df..6461253264b 100644 --- a/versioned_docs/version-2.9/reference-guides/rancher-webhook.md +++ b/versioned_docs/version-2.9/reference-guides/rancher-webhook.md @@ -20,6 +20,7 @@ Each Rancher version is designed to be compatible with a single version of the w | Rancher Version | Webhook Version | Availability in Prime | Availability in Community | |-----------------|-----------------|-----------------------|---------------------------| +| v2.9.3 | v0.5.3 | ✓ | ✓ | | v2.9.2 | v0.5.2 | ✓ | ✓ | | v2.9.1 | v0.5.1 | ✓ | ✓ | | v2.9.0 | v0.5.0 | ✗ | ✓ | From 99800a17ef844ebd38b3979fdc516b1fcf1d5e58 Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Mon, 21 Oct 2024 14:01:23 -0700 Subject: [PATCH 3/6] [2.9.3] csp adapter table entry --- .../cloud-marketplace/aws-cloud-marketplace/install-adapter.md | 1 + .../cloud-marketplace/aws-cloud-marketplace/install-adapter.md | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md b/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md index e2199645e4d..88222845ac5 100644 --- a/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md +++ b/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md @@ -19,6 +19,7 @@ In order to deploy and run the adapter successfully, you need to ensure its vers | Rancher Version | Adapter Version | |-----------------|------------------| +| v2.9.3 | v104.0.0+up4.0.0 | | v2.9.2 | v104.0.0+up4.0.0 | | v2.9.1 | v104.0.0+up4.0.0 | | v2.9.0 | v104.0.0+up4.0.0 | diff --git a/versioned_docs/version-2.9/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md b/versioned_docs/version-2.9/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md index e2199645e4d..88222845ac5 100644 --- a/versioned_docs/version-2.9/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md +++ b/versioned_docs/version-2.9/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md @@ -19,6 +19,7 @@ In order to deploy and run the adapter successfully, you need to ensure its vers | Rancher Version | Adapter Version | |-----------------|------------------| +| v2.9.3 | v104.0.0+up4.0.0 | | v2.9.2 | v104.0.0+up4.0.0 | | v2.9.1 | v104.0.0+up4.0.0 | | v2.9.0 | v104.0.0+up4.0.0 | From 9446177dc4ea5e7f742b7e7cffac6f32e2d1e370 Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Mon, 21 Oct 2024 14:06:30 -0700 Subject: [PATCH 4/6] [2.9.3] deprecated features table entry --- docs/faq/deprecated-features.md | 1 + versioned_docs/version-2.9/faq/deprecated-features.md | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/faq/deprecated-features.md b/docs/faq/deprecated-features.md index bef8d016578..405dfdf3ab4 100644 --- a/docs/faq/deprecated-features.md +++ b/docs/faq/deprecated-features.md @@ -16,6 +16,7 @@ Rancher will publish deprecated features as part of the [release notes](https:// | Patch Version | Release Date | |---------------|---------------| +| [2.9.3](https://github.com/rancher/rancher/releases/tag/v2.9.3) | Oct 24, 2024 | | [2.9.2](https://github.com/rancher/rancher/releases/tag/v2.9.2) | Sep 19, 2024 | | [2.9.1](https://github.com/rancher/rancher/releases/tag/v2.9.1) | Aug 26, 2024 | | [2.9.0](https://github.com/rancher/rancher/releases/tag/v2.9.0) | Jul 31, 2024 | diff --git a/versioned_docs/version-2.9/faq/deprecated-features.md b/versioned_docs/version-2.9/faq/deprecated-features.md index bef8d016578..405dfdf3ab4 100644 --- a/versioned_docs/version-2.9/faq/deprecated-features.md +++ b/versioned_docs/version-2.9/faq/deprecated-features.md @@ -16,6 +16,7 @@ Rancher will publish deprecated features as part of the [release notes](https:// | Patch Version | Release Date | |---------------|---------------| +| [2.9.3](https://github.com/rancher/rancher/releases/tag/v2.9.3) | Oct 24, 2024 | | [2.9.2](https://github.com/rancher/rancher/releases/tag/v2.9.2) | Sep 19, 2024 | | [2.9.1](https://github.com/rancher/rancher/releases/tag/v2.9.1) | Aug 26, 2024 | | [2.9.0](https://github.com/rancher/rancher/releases/tag/v2.9.0) | Jul 31, 2024 | From f9cc03d60a0cc3f24daed2d138abe455269269d2 Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Mon, 21 Oct 2024 14:10:43 -0700 Subject: [PATCH 5/6] [2.9.3] CNI popularity --- shared-files/_cni-popularity.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/shared-files/_cni-popularity.md b/shared-files/_cni-popularity.md index e5aa19e0ef1..8ee872d26d5 100644 --- a/shared-files/_cni-popularity.md +++ b/shared-files/_cni-popularity.md @@ -3,8 +3,8 @@ The following table summarizes different GitHub metrics to give you an idea of e | Provider | Project | Stars | Forks | Contributors | | ---- | ---- | ---- | ---- | ---- | -| Canal | https://github.com/projectcalico/canal | 715 | 100 | 20 | -| Flannel | https://github.com/flannel-io/flannel | 8.7k | 2.9k | 235 | -| Calico | https://github.com/projectcalico/calico | 5.8k | 1.3k | 354 | -| Weave | https://github.com/weaveworks/weave/ | 6.6k | 667 | 87 | -| Cilium | https://github.com/cilium/cilium | 19.4k | 2.9k | 796 | +| Canal | https://github.com/projectcalico/canal | 716 | 100 | 20 | +| Flannel | https://github.com/flannel-io/flannel | 8.8k | 2.9k | 234 | +| Calico | https://github.com/projectcalico/calico | 6.0k | 1.3k | 353 | +| Weave | https://github.com/weaveworks/weave/ | 6.6k | 670 | 85 | +| Cilium | https://github.com/cilium/cilium | 20.0k | 2.9k | 832 | From ea6b368ce5c0137ec579ec60f443a6675d272e8d Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Tue, 22 Oct 2024 18:46:32 -0700 Subject: [PATCH 6/6] Apply PR#1514 (2.9.3 release maintenace tasks) to zh docs --- .../faq/container-network-interface-providers.md | 12 ++++++------ .../version-2.9/faq/deprecated-features.md | 16 ++++++++++------ .../aws-cloud-marketplace/install-adapter.md | 12 +++++------- .../reference-guides/rancher-webhook.md | 10 +++++----- shared-files/_cni-popularity.md | 2 +- 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.9/faq/container-network-interface-providers.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.9/faq/container-network-interface-providers.md index ad796bb5c4c..fa651c702e7 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.9/faq/container-network-interface-providers.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.9/faq/container-network-interface-providers.md @@ -181,15 +181,15 @@ spec: ## CNI 社区人气 -下表总结了不同的 GitHub 指标，让你了解每个项目的受欢迎程度和活动。数据收集于 2022 年 1 月。 +下表总结了不同的 GitHub 指标，让你了解每个项目的受欢迎程度和活动。数据收集于 2024 年 10 月。 | 提供商 | 项目 | Stars | Forks | Contributors | | ---- | ---- | ---- | ---- | ---- | -| Canal | https://github.com/projectcalico/canal | 679 | 100 | 21 | -| Flannel | https://github.com/flannel-io/flannel | 7k | 2.5k | 185 | -| Calico | https://github.com/projectcalico/calico | 3.1k | 741 | 224 | -| Weave | https://github.com/weaveworks/weave/ | 6.2k | 635 | 84 | -| Cilium | https://github.com/cilium/cilium | 10.6k | 1.3k | 352 | +| Canal | https://github.com/projectcalico/canal | 716 | 100 | 20 | +| Flannel | https://github.com/flannel-io/flannel | 8.8k | 2.9k | 234 | +| Calico | https://github.com/projectcalico/calico | 6.0k | 1.3k | 353 | +| Weave | https://github.com/weaveworks/weave/ | 6.6k | 670 | 85 | +| Cilium | https://github.com/cilium/cilium | 20.0k | 2.9k | 832 |
diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.9/faq/deprecated-features.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.9/faq/deprecated-features.md index b594bd0a42b..168f2663cad 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.9/faq/deprecated-features.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.9/faq/deprecated-features.md @@ -14,12 +14,16 @@ title: Rancher 中已弃用的功能 Rancher 将在 GitHub 上发布的 Rancher 的[发版说明](https://github.com/rancher/rancher/releases)中发布已弃用的功能。有关已弃用的功能，请参阅以下的补丁版本： -| Patch 版本 | 发布时间 | -| --------------------------------------------------------------- | ------------------ | -| [2.8.3](https://github.com/rancher/rancher/releases/tag/v2.8.3) | 2024 年 3 月 28 日 | -| [2.8.2](https://github.com/rancher/rancher/releases/tag/v2.8.2) | 2024 年 2 月 8 日 | -| [2.8.1](https://github.com/rancher/rancher/releases/tag/v2.8.1) | 2024 年 1 月 22 日 | -| [2.8.0](https://github.com/rancher/rancher/releases/tag/v2.8.0) | 2023 年 12 月 6 日 | +| Patch 版本 | 发布时间 | +| --------------------------------------------------------------- | -------------------| +| [2.9.3](https://github.com/rancher/rancher/releases/tag/v2.9.3) | 2024 年 10 月 24 日 | +| [2.9.2](https://github.com/rancher/rancher/releases/tag/v2.9.2) | 2024 年 9 月 19 日 | +| [2.9.1](https://github.com/rancher/rancher/releases/tag/v2.9.1) | 2024 年 8 月 26 日 | +| [2.9.0](https://github.com/rancher/rancher/releases/tag/v2.9.0) | 2024 年 7 月 31 日 | +| [2.8.3](https://github.com/rancher/rancher/releases/tag/v2.8.3) | 2024 年 3 月 28 日 | +| [2.8.2](https://github.com/rancher/rancher/releases/tag/v2.8.2) | 2024 年 2 月 8 日 | +| [2.8.1](https://github.com/rancher/rancher/releases/tag/v2.8.1) | 2024 年 1 月 22 日 | +| [2.8.0](https://github.com/rancher/rancher/releases/tag/v2.8.0) | 2023 年 12 月 6 日 | ### 当一个功能被标记为弃用我可以得到什么样的预期？ diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.9/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.9/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md index 831bf952a6d..c8fe54b2689 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.9/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.9/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md @@ -14,13 +14,11 @@ title: 安装 Adapter ::: | Rancher 版本 | Adapter 版本 | -|-----------------|:---------------:| -| v2.7.0 | v2.0.0 | -| v2.7.1 | v2.0.0 | -| v2.7.2 | v2.0.1 | -| v2.7.3 | v2.0.1 | -| v2.7.4 | v2.0.1 | -| v2.7.5 | v2.0.2 | +|-----------------|------------------| +| v2.9.3 | v104.0.0+up4.0.0 | +| v2.9.2 | v104.0.0+up4.0.0 | +| v2.9.1 | v104.0.0+up4.0.0 | +| v2.9.0 | v104.0.0+up4.0.0 | ### 1. 获取对 Local 集群的访问权限 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.9/reference-guides/rancher-webhook.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.9/reference-guides/rancher-webhook.md index 90a7c4b3e6b..605651e1b17 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.9/reference-guides/rancher-webhook.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.9/reference-guides/rancher-webhook.md @@ -19,11 +19,11 @@ Rancher 将 Rancher-Webhook 作为单独的 deployment 和服务部署在 local | Rancher Version | Webhook Version | Availability in Prime | Availability in Community | -| --------------- | --------------- | --------------------- | ------------------------- | -| v2.8.3 | v0.4.3 | ✓ | ✓ | -| v2.8.2 | v0.4.2 | ✓ | ✓ | -| v2.8.1 | v0.4.2 | ✓ | ✓ | -| v2.8.0 | v0.4.2 | ✗ | ✓ | +|-----------------|-----------------|-----------------------|---------------------------| +| v2.9.3 | v0.5.3 | ✓ | ✓ | +| v2.9.2 | v0.5.2 | ✓ | ✓ | +| v2.9.1 | v0.5.1 | ✓ | ✓ | +| v2.9.0 | v0.5.0 | ✗ | ✓ | ## 为什么我们需要它？ diff --git a/shared-files/_cni-popularity.md b/shared-files/_cni-popularity.md index 8ee872d26d5..5de5c290c9f 100644 --- a/shared-files/_cni-popularity.md +++ b/shared-files/_cni-popularity.md @@ -1,5 +1,5 @@ -The following table summarizes different GitHub metrics to give you an idea of each project's popularity and activity levels. This data was collected in August 2024. +The following table summarizes different GitHub metrics to give you an idea of each project's popularity and activity levels. This data was collected in October 2024. | Provider | Project | Stars | Forks | Contributors | | ---- | ---- | ---- | ---- | ---- |