From e154a1b781438b7d10b2bac590af8fa27f25bc1f Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Wed, 29 Jan 2025 10:51:45 -0800 Subject: [PATCH] Merge v2.10.2 release branch into main (#1617) * [2.10.2] versions update Signed-off-by: Sunil Singh * [2.10.2] webhook table update Signed-off-by: Sunil Singh * [2.10.2] csp table update Signed-off-by: Sunil Singh * [2.10.2] deprecated features table update Signed-off-by: Sunil Singh * [2.10.2] CNI update Signed-off-by: Sunil Singh * [2.10.2] webhook update after review Signed-off-by: Sunil Singh --------- Signed-off-by: Sunil Singh Co-authored-by: Sunil Singh --- docs/faq/deprecated-features.md | 1 + .../aws-cloud-marketplace/install-adapter.md | 1 + docs/reference-guides/rancher-webhook.md | 1 + shared-files/_cni-popularity.md | 12 ++++++------ src/pages/versions.md | 12 ++++++++++-- .../version-2.10/faq/deprecated-features.md | 1 + .../aws-cloud-marketplace/install-adapter.md | 1 + .../version-2.10/reference-guides/rancher-webhook.md | 1 + 8 files changed, 22 insertions(+), 8 deletions(-) diff --git a/docs/faq/deprecated-features.md b/docs/faq/deprecated-features.md index c3b1f059cce..1687b79592d 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.10.2](https://github.com/rancher/rancher/releases/tag/v2.10.2) | Jan 29, 2025 | | [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 | 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 fe9e72f977c..472dce754aa 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.10.2 | v105.0.0+up5.0.1 | | v2.10.1 | v105.0.0+up5.0.1 | | v2.10.0 | v105.0.0+up5.0.1 | diff --git a/docs/reference-guides/rancher-webhook.md b/docs/reference-guides/rancher-webhook.md index dd9f7a8bfe6..cc4c446ea81 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.10.2 | v0.6.3 | ✓ | ✓ | | v2.10.1 | v0.6.2 | ✓ | ✓ | | v2.10.0 | v0.6.1 | ✗ | ✓ | diff --git a/shared-files/_cni-popularity.md b/shared-files/_cni-popularity.md index 0fc91281fbb..397ba895f5d 100644 --- a/shared-files/_cni-popularity.md +++ b/shared-files/_cni-popularity.md @@ -1,10 +1,10 @@ -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. +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 January 2025. | Provider | Project | Stars | Forks | Contributors | | ---- | ---- | ---- | ---- | ---- | -| 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 | +| Canal | https://github.com/projectcalico/canal | 719 | 100 | 20 | +| Flannel | https://github.com/flannel-io/flannel | 8.9k | 2.9k | 236 | +| Calico | https://github.com/projectcalico/calico | 6.2k | 1.4k | 365 | +| Weave | https://github.com/weaveworks/weave | 6.6k | 673 | 84 | +| Cilium | https://github.com/cilium/cilium | 20.7k | 3k | 877 | diff --git a/src/pages/versions.md b/src/pages/versions.md index f62119f977d..04ab51a64df 100644 --- a/src/pages/versions.md +++ b/src/pages/versions.md @@ -18,9 +18,9 @@ Here you can find links to supporting documentation for the current released ver Community - v2.10.1 + v2.10.2 Documentation - Release Notes + Release Notes
N/A
✓
✓
@@ -103,6 +103,14 @@ Here you can find links to supporting documentation for previous versions of Ran Prime Community + + v2.10.1 + Documentation + Release Notes + Support Matrix +
✓
+
✓
+ v2.10.0 Documentation diff --git a/versioned_docs/version-2.10/faq/deprecated-features.md b/versioned_docs/version-2.10/faq/deprecated-features.md index c3b1f059cce..1687b79592d 100644 --- 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.2](https://github.com/rancher/rancher/releases/tag/v2.10.2) | Jan 29, 2025 | | [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 | diff --git a/versioned_docs/version-2.10/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md b/versioned_docs/version-2.10/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md index fe9e72f977c..472dce754aa 100644 --- a/versioned_docs/version-2.10/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md +++ b/versioned_docs/version-2.10/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.10.2 | v105.0.0+up5.0.1 | | v2.10.1 | v105.0.0+up5.0.1 | | v2.10.0 | v105.0.0+up5.0.1 | diff --git a/versioned_docs/version-2.10/reference-guides/rancher-webhook.md b/versioned_docs/version-2.10/reference-guides/rancher-webhook.md index 71b5558fda3..da79ead873d 100644 --- 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.2 | v0.6.3 | ✓ | ✓ | | v2.10.1 | v0.6.2 | ✓ | ✓ | | v2.10.0 | v0.6.1 | ✗ | ✓ |