Skip to content

Merge release branch v2.11.1 into main #1753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Merge release branch v2.11.1 into main #1753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/faq/deprecated-features.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Rancher will publish deprecated features as part of the [release notes](https://

| Patch Version | Release Date |
|---------------|---------------|
| [2.11.1](https://github.com/rancher/rancher/releases/tag/v2.11.1) | Apr 23, 2025 |
| [2.11.0](https://github.com/rancher/rancher/releases/tag/v2.11.0) | Mar 31, 2025 |

## What can I expect when a feature is marked for deprecation?
Expand Down
1 change: 1 addition & 0 deletions ...egrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ In order to deploy and run the adapter successfully, you need to ensure its vers

| Rancher Version | Adapter Version |
|-----------------|------------------|
| v2.11.1 | v106.0.0+up6.0.0 |
| v2.11.0 | v106.0.0+up6.0.0 |

### 1. Gain Access to the Local Cluster
Expand Down
1 change: 1 addition & 0 deletions docs/reference-guides/rancher-webhook.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1 | v0.7.1 | ✓ | ✓ |
| v2.11.0 | v0.7.0 | ✗ | ✓ |

## Why Do We Need It?
Expand Down
10 changes: 4 additions & 6 deletions i18n/zh/docusaurus-plugin-content-docs/current/faq/deprecated-features.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@ 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.11.1](https://github.com/rancher/rancher/releases/tag/v2.11.1) | 2024 年 4 月 23 日 |
| [2.11.0](https://github.com/rancher/rancher/releases/tag/v2.11.0) | 2024 年 3 月 31 日 |

## 当一个功能被标记为弃用我可以得到什么样的预期？

Expand Down
11 changes: 3 additions & 8 deletions ...egrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,9 @@ 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.11.1 | v106.0.0+up6.0.0 |
| v2.11.0 | v106.0.0+up6.0.0 |

## 1. 获取对 Local 集群的访问权限

Expand Down
8 changes: 3 additions & 5 deletions i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-webhook.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ 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.11.1 | v0.7.1 | &check; | &check; |
| v2.11.0 | v0.7.0 | &cross; | &check; |

## 为什么我们需要它？

Expand Down
13 changes: 4 additions & 9 deletions .../docusaurus-plugin-content-docs/version-2.11/faq/deprecated-features-in-v2.5.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,10 @@ title: Rancher 弃用的功能

Rancher 会在 GitHub 上的[发行说明](https://github.com/rancher/rancher/releases)中公布已弃用的功能。请参阅以下补丁版本了解已弃用的功能：

| 补丁版本 | 发布日期 |
|---------------|---------------|
| [2.6.0](https://github.com/rancher/rancher/releases/tag/v2.6.0) | 2021 年 8 月 31 日 |
| [2.6.1](https://github.com/rancher/rancher/releases/tag/v2.6.1) | 2021 年 10 月 11 日 |
| [2.6.2](https://github.com/rancher/rancher/releases/tag/v2.6.2) | 2021 年 10 月 19 日 |
| [2.6.3](https://github.com/rancher/rancher/releases/tag/v2.6.3) | 2021 年 12 月 21 日 |
| [2.6.4](https://github.com/rancher/rancher/releases/tag/v2.6.4) | 2022 年 3 月 31 日 |
| [2.6.5](https://github.com/rancher/rancher/releases/tag/v2.6.5) | 2022 年 5 月 12 日 |
| [2.6.6](https://github.com/rancher/rancher/releases/tag/v2.6.6) | 2022 年 6 月 30 日 |
| Patch 版本 | 发布时间 |
| ----------------------------------------------------------------- | ------------------ |
| [2.11.1](https://github.com/rancher/rancher/releases/tag/v2.11.1) | 2024 年 4 月 23 日 |
| [2.11.0](https://github.com/rancher/rancher/releases/tag/v2.11.0) | 2024 年 3 月 31 日 |

## 如果某个功能标记为弃用，我要怎么做？

Expand Down
11 changes: 3 additions & 8 deletions ...egrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,9 @@ 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.11.1 | v106.0.0+up6.0.0 |
| v2.11.0 | v106.0.0+up6.0.0 |

## 1. 获取对 Local 集群的访问权限

Expand Down
8 changes: 3 additions & 5 deletions ...docusaurus-plugin-content-docs/version-2.11/reference-guides/rancher-webhook.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ 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.11.1 | v0.7.1 | &check; | &check; |
| v2.11.0 | v0.7.0 | &cross; | &check; |

## 为什么我们需要它？

Expand Down
10 changes: 5 additions & 5 deletions shared-files/_cni-popularity.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | 720 | 100 | 20 |
| Flannel | https://github.com/flannel-io/flannel | 9k | 2.9k | 237 |
| Calico | https://github.com/projectcalico/calico | 6.3k | 1.4k | 373 |
| Weave | https://github.com/weaveworks/weave | 6.6k | 679 | 84 |
| Cilium | https://github.com/cilium/cilium | 21.2k | 3.1k | 909 |
| Canal | https://github.com/projectcalico/canal | 720 | 99 | 20 |
| Flannel | https://github.com/flannel-io/flannel | 9k | 2.9k | 238 |
| Calico | https://github.com/projectcalico/calico | 6.4k | 1.4k | 375 |
| Weave | https://github.com/weaveworks/weave | 6.6k | 681 | 84 |
| Cilium | https://github.com/cilium/cilium | 21.4k | 3.2k | 917 |
27 changes: 24 additions & 3 deletions src/pages/versions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ Here you can find links to supporting documentation for the current released ver
<th>Community</th>
</tr>
<tr>
<td><b>v2.11.0</b></td>
<td><b>v2.11.1</b></td>
<td><a href="https://ranchermanager.docs.rancher.com/v2.11">Documentation</a></td>
<td><a href="https://github.com/rancher/rancher/releases/tag/v2.11.0">Release Notes</a></td>
<td><center>N/A</center></td>
<td><a href="https://github.com/rancher/rancher/releases/tag/v2.11.1">Release Notes</a></td>
<td><center>N/A</center></td>
<td><center>&#10003;</center></td>
<td><center>&#10003;</center></td>
</tr>
</table>

Expand Down Expand Up @@ -91,6 +91,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.11, and their availability for [Rancher Prime](/v2.11/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.11.0</b></td>
<td><a href="https://ranchermanager.docs.rancher.com/v2.11">Documentation</a></td>
<td><a href="https://github.com/rancher/rancher/releases/tag/v2.11.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.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>
Expand Down
1 change: 1 addition & 0 deletions versioned_docs/version-2.11/faq/deprecated-features.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Rancher will publish deprecated features as part of the [release notes](https://

| Patch Version | Release Date |
|---------------|---------------|
| [2.11.1](https://github.com/rancher/rancher/releases/tag/v2.11.1) | Apr 23, 2025 |
| [2.11.0](https://github.com/rancher/rancher/releases/tag/v2.11.0) | Mar 31, 2025 |

## What can I expect when a feature is marked for deprecation?
Expand Down
1 change: 1 addition & 0 deletions ...egrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ In order to deploy and run the adapter successfully, you need to ensure its vers

| Rancher Version | Adapter Version |
|-----------------|------------------|
| v2.11.1 | v106.0.0+up6.0.0 |
| v2.11.0 | v106.0.0+up6.0.0 |

### 1. Gain Access to the Local Cluster
Expand Down
1 change: 1 addition & 0 deletions versioned_docs/version-2.11/reference-guides/rancher-webhook.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1 | v0.7.1 | &check; | &check; |
| v2.11.0 | v0.7.0 | &cross; | &check; |

## Why Do We Need It?
Expand Down