Merge pull request #1600 from rancher/v2.10.1

Merge v2.10.1 release branch into main
rancher · Dec 19, 2024 · a192d4c · a192d4c
2 parents c0bb462 + b9a23c4
commit a192d4c
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 9 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.10.1](https://github.com/rancher/rancher/releases/tag/v2.10.1) | Dec 19, 2024 |
 | [2.10.0](https://github.com/rancher/rancher/releases/tag/v2.10.0) | Nov 18, 2024 |
 
 ## What can I expect when a feature is marked for deprecation?

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.10.1         | v105.0.0+up5.0.1 |
 | v2.10.0         | v105.0.0+up5.0.1 |
 
 ### 1. Gain Access to the Local Cluster

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.10.1         |     v0.6.2      | &check;               | &check;                   |
 | v2.10.0         |     v0.6.1      | &cross;               | &check;                   |
 
 ## Why Do We Need It?

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 October 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 December 2024.
 
 | Provider | Project | Stars | Forks | Contributors |
 | ---- | ---- | ---- | ---- | ---- |
-| Canal | https://github.com/projectcalico/canal | 717 | 100 | 20 |
-| Flannel | https://github.com/flannel-io/flannel | 8.8k | 2.9k | 235 |
-| Calico | https://github.com/projectcalico/calico | 6.0k | 1.3k | 356 |
-| Weave | https://github.com/weaveworks/weave/ | 6.6k | 670 | 84 |
-| Cilium | https://github.com/cilium/cilium | 20.2k | 3k | 853 |
+| Canal | https://github.com/projectcalico/canal | 718 | 100 | 20 |
+| Flannel | https://github.com/flannel-io/flannel | 8.9k | 2.9k | 234 |
+| Calico | https://github.com/projectcalico/calico | 6.1k | 1.4k | 360 |
+| Weave | https://github.com/weaveworks/weave/ | 6.6k | 672 | 84 |
+| Cilium | https://github.com/cilium/cilium | 20.5k | 3k | 868 |
diff --git a/src/pages/versions.md b/src/pages/versions.md
@@ -18,12 +18,12 @@ Here you can find links to supporting documentation for the current released ver
     <th>Community</th>
   </tr>
   <tr>
-    <td><b>v2.10.0</b></td>
+    <td><b>v2.10.1</b></td>
     <td><a href="https://ranchermanager.docs.rancher.com/v2.10">Documentation</a></td>
-    <td><a href="https://github.com/rancher/rancher/releases/tag/v2.10.0">Release Notes</a></td>
-    <td><center>N/A</center></td>
+    <td><a href="https://github.com/rancher/rancher/releases/tag/v2.10.1">Release Notes</a></td>
     <td><center>N/A</center></td>
     <td><center>&#10003;</center></td>
+    <td><center>&#10003;</center></td>
   </tr>
 </table>
 
@@ -92,6 +92,27 @@ Here you can find links to supporting documentation for the current released ver
 
 ### Past Versions
 
+Here you can find links to supporting documentation for previous versions of Rancher v2.10, and their availability for [Rancher Prime](/v2.10/getting-started/quick-start-guides/deploy-rancher-manager/prime) and the Community version of Rancher:
+
+<table>
+  <tr>
+    <th>Version</th>
+    <th>Documentation</th>
+    <th>Release Notes</th>
+    <th>Support Matrix</th>
+    <th>Prime</th>
+    <th>Community</th>
+  </tr>
+  <tr>
+    <td><b>v2.10.0</b></td>
+    <td><a href="https://ranchermanager.docs.rancher.com/v2.10">Documentation</a></td>
+    <td><a href="https://github.com/rancher/rancher/releases/tag/v2.10.0">Release Notes</a></td>
+    <td><center>N/A</center></td>
+    <td><center>N/A</center></td>
+    <td><center>&#10003;</center></td>
+  </tr>
+</table>
+
 Here you can find links to supporting documentation for previous versions of Rancher v2.9, and their availability for [Rancher Prime](/v2.9/getting-started/quick-start-guides/deploy-rancher-manager/prime) and the Community version of Rancher:
 
 <table>

diff --git a/versioned_docs/version-2.10/faq/deprecated-features.md b/versioned_docs/version-2.10/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.10.1](https://github.com/rancher/rancher/releases/tag/v2.10.1) | Dec 19, 2024 |
 | [2.10.0](https://github.com/rancher/rancher/releases/tag/v2.10.0) | Nov 18, 2024 |
 
 ## What can I expect when a feature is marked for deprecation?

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.10.1         | v105.0.0+up5.0.1 |
 | v2.10.0         | v105.0.0+up5.0.1 |
 
 ### 1. Gain Access to the Local Cluster

diff --git a/versioned_docs/version-2.10/reference-guides/rancher-webhook.md b/versioned_docs/version-2.10/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.10.1         |     v0.6.2      | &check;               | &check;                   |
 | v2.10.0         |     v0.6.1      | &cross;               | &check;                   |
 
 ## Why Do We Need It?