Skip to content

Commit 1506c4e

Browse files
authored
Merge pull request #239 from Flying-Tom/istio-version
Fix: Specify Istio version for Waypoint feature
2 parents 1b00ee9 + ac671f2 commit 1506c4e

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

docs/setup/develop-with-kind.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,18 @@ EOF
4242
### Install istioctl
4343

4444
```shell
45-
curl -L https://istio.io/downloadIstio | sh -
46-
cd istio-1.22.2/bin
47-
chmod +x istioctl
45+
ISTIO_VERSION="1.24.0" # If you wish to use the Waypoint feature, the Istio version should be 1.23 ~ 1.25.
46+
47+
curl -L https://istio.io/downloadIstio | ISTIO_VERSION="${ISTIO_VERSION}" sh - && \
48+
cd "istio-${ISTIO_VERSION}/bin" && \
49+
chmod +x istioctl && \
4850
mv istioctl /usr/bin/
4951
```
5052

53+
:::note
54+
If you want to use the Waypoint feature, the istio version should not be higher than 1.25
55+
:::
56+
5157
### Install istio components using istioctl
5258

5359
```shell

docs/setup/quick-start.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Before installing Kmesh, ensure your environment meets the following requirement
1515
| Requirement | Version | Notes |
1616
| ----------- | ------- | --------------------- |
1717
| Kubernetes | 1.26+ | Tested on 1.26-1.29 |
18-
| Istio | 1.22+ | Ambient mode required |
18+
| Istio | 1.22+ | Tested on 1.22-1.25 (ambient mode required) |
1919
| Helm | 3.0+ | For helm installation |
2020
| Memory | 4GB+ | Recommended minimum |
2121
| CPU | 2 cores | Recommended minimum |
@@ -69,10 +69,10 @@ helm install istio-base istio/base -n istio-system
6969
To install the chart with the release name `istiod`:
7070

7171
```shell
72-
helm install istiod istio/istiod --namespace istio-system --set pilot.env.PILOT_ENABLE_AMBIENT=true
72+
helm install istiod istio/istiod --namespace istio-system --version 1.24.0 --set pilot.env.PILOT_ENABLE_AMBIENT=true
7373
```
7474

75-
> **Important:** Must set `pilot.env.PILOT_ENABLE_AMBIENT=true`. otherwise Kmesh will not be able to establish grpc links with istiod!
75+
> **Important:** Must set `pilot.env.PILOT_ENABLE_AMBIENT=true`. otherwise Kmesh will not be able to establish grpc links with istiod! If you want to use the Waypoint feature, you should use the istio version 1.23 ~ 1.25.
7676
7777
After installing istiod, it's time to install Kubernetes Gateway API CRDs.
7878

i18n/zh/docusaurus-plugin-content-docs/current/setup/develop-with-kind.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,11 @@ EOF
4242
### 安装 istioctl
4343

4444
```shell
45-
curl -L https://istio.io/downloadIstio | sh -
46-
cd istio-1.22.2/bin
47-
chmod +x istioctl
45+
ISTIO_VERSION="1.24.0" # 如果您希望使用 Waypoint 功能,istio 版本应该为 1.23 ~ 1.25
46+
47+
curl -L https://istio.io/downloadIstio | ISTIO_VERSION="${ISTIO_VERSION}" sh - && \
48+
cd "istio-${ISTIO_VERSION}/bin" && \
49+
chmod +x istioctl && \
4850
mv istioctl /usr/bin/
4951
```
5052

i18n/zh/docusaurus-plugin-content-docs/current/setup/quick-start.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ sidebar_position: 1
1515
| 要求 | 版本 | 备注 |
1616
| ---------- | ----- | ----------------------- |
1717
| Kubernetes | 1.26+ | 在 1.26-1.29 上测试通过 |
18-
| Istio | 1.22+ | 需要环境模式 |
18+
| Istio | 1.22+ | 在 1.23-1.25 上测试通过 (需要环境模式) |
1919
| Helm | 3.0+ | 用于 helm 安装 |
2020
| 内存 | 4GB+ | 建议最小配置 |
2121
| CPU | 2 核 | 建议最小配置 |
@@ -69,10 +69,10 @@ helm install istio-base istio/base -n istio-system
6969
使用发布名称 `istiod` 安装图表:
7070

7171
```shell
72-
helm install istiod istio/istiod --namespace istio-system --set pilot.env.PILOT_ENABLE_AMBIENT=true
72+
helm install istiod istio/istiod --namespace istio-system --version 1.24.0 --set pilot.env.PILOT_ENABLE_AMBIENT=true
7373
```
7474

75-
> **重要:** 必须设置 `pilot.env.PILOT_ENABLE_AMBIENT=true`。否则 Kmesh 将无法与 istiod 建立 grpc 链接!
75+
> **重要:** 必须设置 `pilot.env.PILOT_ENABLE_AMBIENT=true`。否则 Kmesh 将无法与 istiod 建立 grpc 链接! 如果想要使用 Waypoint 功能,您的 istiod 版本应该为 1.23~1.25。
7676
7777
安装 istiod 后,是时候安装 Kubernetes Gateway API CRD 了。
7878

0 commit comments

Comments
 (0)