Merge pull request #1524 from rancher/v2.9.3

Merge v2.9.3 release branch into main
rancher · Oct 25, 2024 · a9463f7 · a9463f7
2 parents 17bc799 + c015335
commit a9463f7
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 33 deletions.
diff --git 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/...egrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md b/...egrations-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/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      | &check;               | &check;                   |
 | v2.9.2          |     v0.5.2      | &check;               | &check;                   |
 | v2.9.1          |     v0.5.1      | &check;               | &check;                   |
 | v2.9.0          |     v0.5.0      | &cross;               | &check;                   |

diff --git a/...us-plugin-content-docs/version-2.9/faq/container-network-interface-providers.md b/...us-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 |
 
 <br/>
 

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
@@ -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/...egrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md b/...egrations-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/.../docusaurus-plugin-content-docs/version-2.9/reference-guides/rancher-webhook.md b/.../docusaurus-plugin-content-docs/version-2.9/reference-guides/rancher-webhook.md
@@ -19,11 +19,11 @@ Rancher 将 Rancher-Webhook 作为单独的 deployment 和服务部署在 local
 <!-- releaseTask -->
 
 | Rancher Version | Webhook Version | Availability in Prime | Availability in Community |
-| --------------- | --------------- | --------------------- | ------------------------- |
-| v2.8.3          | v0.4.3          | &check;               | &check;                   |
-| v2.8.2          | v0.4.2          | &check;               | &check;                   |
-| v2.8.1          | v0.4.2          | &check;               | &check;                   |
-| v2.8.0          | v0.4.2          | &cross;               | &check;                   |
+|-----------------|-----------------|-----------------------|---------------------------|
+| v2.9.3          |     v0.5.3      | &check;               | &check;                   |
+| v2.9.2          |     v0.5.2      | &check;               | &check;                   |
+| v2.9.1          |     v0.5.1      | &check;               | &check;                   |
+| v2.9.0          |     v0.5.0      | &cross;               | &check;                   |
 
 ## 为什么我们需要它？
 

diff --git a/shared-files/_cni-popularity.md b/shared-files/_cni-popularity.md
@@ -1,10 +1,10 @@
 <!-- releaseTask -->
-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 |
 | ---- | ---- | ---- | ---- | ---- |
-| 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 |
diff --git 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
     <th>Community</th>
   </tr>
   <tr>
-    <td><b>v2.9.2</b></td>
+    <td><b>v2.9.3</b></td>
     <td><a href="https://ranchermanager.docs.rancher.com/v2.9">Documentation</a></td>
-    <td><a href="https://github.com/rancher/rancher/releases/tag/v2.9.2">Release Notes</a></td>
-    <td><a href="https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-9-2/">Support Matrix</a></td>
+    <td><a href="https://github.com/rancher/rancher/releases/tag/v2.9.3">Release Notes</a></td>
+    <td><center>N/A</center></td>
     <td><center>&#10003;</center></td>
     <td><center>&#10003;</center></td>
   </tr>
@@ -82,6 +82,14 @@ Here you can find links to supporting documentation for previous versions of Ran
     <th>Prime</th>
     <th>Community</th>
   </tr>
+  <tr>
+    <td><b>v2.9.2</b></td>
+    <td><a href="https://ranchermanager.docs.rancher.com/v2.9">Documentation</a></td>
+    <td><a href="https://github.com/rancher/rancher/releases/tag/v2.9.2">Release Notes</a></td>
+    <td><a href="https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-9-2/">Support Matrix</a></td>
+    <td><center>&#10003;</center></td>
+    <td><center>&#10003;</center></td>
+  </tr>
   <tr>
     <td><b>v2.9.1</b></td>
     <td><a href="https://ranchermanager.docs.rancher.com/v2.9">Documentation</a></td>

diff --git 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 |

diff --git a/...egrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md b/...egrations-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/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      | &check;               | &check;                   |
 | v2.9.2          |     v0.5.2      | &check;               | &check;                   |
 | v2.9.1          |     v0.5.1      | &check;               | &check;                   |
 | v2.9.0          |     v0.5.0      | &cross;               | &check;                   |