diff --git a/content/en/docs/project-user-guide/grayscale-release/canary-release.md b/content/en/docs/project-user-guide/grayscale-release/canary-release.md index b2dce01d4..53d2669b6 100644 --- a/content/en/docs/project-user-guide/grayscale-release/canary-release.md +++ b/content/en/docs/project-user-guide/grayscale-release/canary-release.md @@ -29,7 +29,7 @@ This method serves as an efficient way to test performance and reliability of a 4. On the **Grayscale Release Version** tab, add another version of it (e.g `kubesphere/examples-bookinfo-reviews-v2:1.13.0`; change `v1` to `v2`) as shown in the image below and click **Next**: - ![canary-release-4](/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-4.jpg) + ![canary-release-4](/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-4.png) {{< notice note >}} @@ -39,27 +39,27 @@ This method serves as an efficient way to test performance and reliability of a 5. You send traffic to these two versions (`v1` and `v2`) either by a specific percentage or by the request content such as `Http Header`, `Cookie` and `URI`. Select **Forward by traffic ratio** and drag the icon in the middle to change the percentage of traffic sent to these two versions respectively (for example, set 50% for either one). When you finish, click **Create**. - ![canary-release-5](/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-5.gif) + ![canary-release-5](/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-5.png) ## Step 2: Verify the Canary Release Now that you have two available app versions, access the app to verify the canary release. -1. Visit the Bookinfo website and refresh your browser repeatedly. You will be able to see the **Book Reviews** section switching between v1 and v2 at a rate of 50%. +1. Visit the Bookinfo website and refresh your browser repeatedly. You can see that the **Book Reviews** section switching between v1 and v2 at a rate of 50%. ![canary](/images/docs/quickstart/deploy-bookinfo-to-k8s/canary.gif) -2. The canary release job created displays under the tab **Job Status**. Click it to view details. +2. The created canary release job is displayed under the tab **Job Status**. Click it to view details. - ![canary-release-job](/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-job.jpg) + ![canary-release-job](/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-job.png) 3. You can see half of the traffic goes to each of them: - ![canary-release-6](/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-6.jpg) + ![canary-release-6](/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-6.png) 4. The new Deployment is created as well. - ![deployment-list-1](/images/docs/project-user-guide/grayscale-release/canary-release/deployment-list-1.jpg) + ![deployment-list-1](/images/docs/project-user-guide/grayscale-release/canary-release/deployment-list-1.png) 5. You can directly get the virtual Service to identify the weight by executing the following command: @@ -69,7 +69,7 @@ Now that you have two available app versions, access the app to verify the canar {{< notice note >}} - - When you execute the command above, replace `demo-project` with your own project (i.e. namespace) name. + - When you execute the command above, replace `demo-project` with your own project (namely, namespace) name. - If you want to execute the command from the web kubectl on the KubeSphere console, you need to use the account `admin`. {{}} @@ -136,7 +136,7 @@ If everything runs smoothly, you can bring all the traffic to the new version. 1. In **Grayscale Release**, click the canary release job. -2. In the dialog that appears, click the three dots of **reviews v2** and select **Take Over**. It means 100% of the traffic will be sent to the new version (v2). +2. In the displayed dialog box, click on the right of **reviews v2** and select **Take Over**. It means 100% of the traffic will be sent to the new version (v2). ![take-over-release](/images/docs/project-user-guide/grayscale-release/canary-release/take-over-release.png) diff --git a/content/zh/docs/project-user-guide/grayscale-release/canary-release.md b/content/zh/docs/project-user-guide/grayscale-release/canary-release.md index 8de79b0c3..ed0034b46 100644 --- a/content/zh/docs/project-user-guide/grayscale-release/canary-release.md +++ b/content/zh/docs/project-user-guide/grayscale-release/canary-release.md @@ -55,11 +55,11 @@ KubeSphere 基于 [Istio](https://istio.io/) 向用户提供部署金丝雀服 3. 您可以看到每个版本分别收到一半流量： - ![canary-release-6](/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/canary-release-6.PNG) + ![canary-release-6](/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/canary-release_6.png) 4. 新的部署也已创建。 - ![deployment-list-1](/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/deployment-list-1.PNG) + ![deployment-list-1](/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/deployment-list_1.png) 5. 您可以执行以下命令直接获取虚拟服务来识别权重： @@ -136,7 +136,7 @@ KubeSphere 提供基于 [Jaeger](https://www.jaegertracing.io/) 的分布式追 1. 在**灰度发布**中，点击金丝雀发布任务。 -2. 在出现的对话框中，点击 **reviews v2** 的三个点，选择**接管所有流量**。这代表 100% 的流量将会被发送到新版本 (v2)。 +2. 在弹出的对话框中，点击 **reviews v2** 右侧的 ，选择**接管所有流量**。这代表 100% 的流量将会被发送到新版本 (v2)。 ![take-over-release](/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/take-over-release.png) diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-4.jpg b/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-4.jpg deleted file mode 100644 index 962d28f7e..000000000 Binary files a/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-4.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-4.png b/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-4.png new file mode 100644 index 000000000..aa8006cac Binary files /dev/null and b/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-4.png differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-5.gif b/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-5.gif deleted file mode 100644 index 6d90dec44..000000000 Binary files a/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-5.gif and /dev/null differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-5.png b/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-5.png new file mode 100644 index 000000000..7f922d317 Binary files /dev/null and b/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-5.png differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-6.jpg b/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-6.jpg deleted file mode 100644 index 5b78346ee..000000000 Binary files a/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-6.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-6.png b/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-6.png new file mode 100644 index 000000000..415293857 Binary files /dev/null and b/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-6.png differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-job.jpg b/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-job.jpg deleted file mode 100644 index f67c7b80b..000000000 Binary files a/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-job.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-job.png b/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-job.png new file mode 100644 index 000000000..28d516fb5 Binary files /dev/null and b/static/images/docs/project-user-guide/grayscale-release/canary-release/canary-release-job.png differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/deployment-list-1.jpg b/static/images/docs/project-user-guide/grayscale-release/canary-release/deployment-list-1.jpg deleted file mode 100644 index 57ad0a1f0..000000000 Binary files a/static/images/docs/project-user-guide/grayscale-release/canary-release/deployment-list-1.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/deployment-list-1.png b/static/images/docs/project-user-guide/grayscale-release/canary-release/deployment-list-1.png new file mode 100644 index 000000000..c3c340d16 Binary files /dev/null and b/static/images/docs/project-user-guide/grayscale-release/canary-release/deployment-list-1.png differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/three-dots.png b/static/images/docs/project-user-guide/grayscale-release/canary-release/three-dots.png new file mode 100644 index 000000000..f1815a91e Binary files /dev/null and b/static/images/docs/project-user-guide/grayscale-release/canary-release/three-dots.png differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/topology.png b/static/images/docs/project-user-guide/grayscale-release/canary-release/topology.png index 0764e5d8f..6c1eb1163 100644 Binary files a/static/images/docs/project-user-guide/grayscale-release/canary-release/topology.png and b/static/images/docs/project-user-guide/grayscale-release/canary-release/topology.png differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/tracing-kubesphere.png b/static/images/docs/project-user-guide/grayscale-release/canary-release/tracing-kubesphere.png index d10c3ba38..dcd196d9d 100644 Binary files a/static/images/docs/project-user-guide/grayscale-release/canary-release/tracing-kubesphere.png and b/static/images/docs/project-user-guide/grayscale-release/canary-release/tracing-kubesphere.png differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/tracing.png b/static/images/docs/project-user-guide/grayscale-release/canary-release/tracing.png index 109a1b161..e42910f2d 100644 Binary files a/static/images/docs/project-user-guide/grayscale-release/canary-release/tracing.png and b/static/images/docs/project-user-guide/grayscale-release/canary-release/tracing.png differ diff --git a/static/images/docs/project-user-guide/grayscale-release/canary-release/traffic-management.png b/static/images/docs/project-user-guide/grayscale-release/canary-release/traffic-management.png index a634ac5f2..c95cd4da3 100644 Binary files a/static/images/docs/project-user-guide/grayscale-release/canary-release/traffic-management.png and b/static/images/docs/project-user-guide/grayscale-release/canary-release/traffic-management.png differ diff --git a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/canary-release-6.PNG b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/canary-release-6.PNG deleted file mode 100644 index d8d85b195..000000000 Binary files a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/canary-release-6.PNG and /dev/null differ diff --git a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/canary-release_6.png b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/canary-release_6.png new file mode 100644 index 000000000..6a275ed32 Binary files /dev/null and b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/canary-release_6.png differ diff --git a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/deployment-list-1.PNG b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/deployment-list-1.PNG deleted file mode 100644 index 794dc81f5..000000000 Binary files a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/deployment-list-1.PNG and /dev/null differ diff --git a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/deployment-list_1.png b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/deployment-list_1.png new file mode 100644 index 000000000..9782e7d04 Binary files /dev/null and b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/deployment-list_1.png differ diff --git a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/three-dots.png b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/three-dots.png new file mode 100644 index 000000000..f1815a91e Binary files /dev/null and b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/three-dots.png differ diff --git a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/topology.png b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/topology.png index 973e2668d..be678201b 100644 Binary files a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/topology.png and b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/topology.png differ diff --git a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/tracing-kubesphere.png b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/tracing-kubesphere.png index 871d7bc6d..3334c4c5e 100644 Binary files a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/tracing-kubesphere.png and b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/tracing-kubesphere.png differ diff --git a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/tracing.png b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/tracing.png index 7e3fc33d9..a1899597c 100644 Binary files a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/tracing.png and b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/tracing.png differ diff --git a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/traffic-management.png b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/traffic-management.png index 23f97e72f..185cbe2f5 100644 Binary files a/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/traffic-management.png and b/static/images/docs/zh-cn/project-user-guide/grayscale-release/canary-release/traffic-management.png differ