Merge pull request #83 from hanbingleixue/main

Add configuration and code for xDS flow control validation demo

.github/workflows/create_release.yml

@@ -186,25 +186,15 @@ jobs:
           asset_path: ${{ github.workspace }}/package/result/sermant-examples-first-plugin-demo-${{ env.version }}.tar.gz
           asset_name: sermant-examples-first-plugin-demo-${{ env.version }}.tar.gz
           asset_content_type: application/tar
-      - name: Upload Release xds-service-discovery-demo # xds-service-discovery-demo release包
-        id: upload-release-asset-xds-service-discovery
+      - name: Upload Release xds-demo # xds-demo release包
+        id: upload-release-asset-xds
         uses: actions/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ github.workspace }}/package/result/sermant-examples-xds-service-discovery-demo-${{ env.version }}.tar.gz
-          asset_name: sermant-examples-xds-service-discovery-demo-${{ env.version }}.tar.gz
-          asset_content_type: application/tar
-      - name: Upload Release xds-router-demo # xds-router-demo release包
-        id: upload-release-asset-xds-router
-        uses: actions/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ${{ github.workspace }}/package/result/sermant-examples-xds-router-demo-${{ env.version }}.tar.gz
-          asset_name: sermant-examples-xds-router-demo-${{ env.version }}.tar.gz
+          asset_path: ${{ github.workspace }}/package/result/sermant-examples-xds-demo-${{ env.version }}.tar.gz
+          asset_name: sermant-examples-xds-demo-${{ env.version }}.tar.gz
           asset_content_type: application/tar
       - name: Upload Release mq-gray-demo # rocketmq-gray-demo release包
         id: upload-release-mq-gray

pom.xml

@@ -21,8 +21,7 @@
         <module>mq-consume-prohibition-demo</module>
         <module>loadbalancer-demo</module>
         <module>database-write-prohibition-demo</module>
-        <module>xds-service-discovery-demo</module>
-        <module>xds-router-demo</module>
+        <module>xds-demo</module>
         <module>mq-gray-demo</module>
     </modules>
 

scripts/copy_jar.sh

@@ -26,17 +26,14 @@ mkdir -p package/removal-demo
 mkdir -p package/mq-consume-prohibition-demo
 mkdir -p package/database-write-prohibition-demo
 mkdir -p package/first-plugin-demo
-mkdir -p package/xds-service-discovery-demo
-mkdir -p package/xds-router-demo
+mkdir -p package/xds-demo
 mkdir -p package/mq-gray-demo
 
 # 按照文件名模式将对应的jar文件复制到对应目录
 # 创建首个插件
 find . -type d -name "agent" -exec cp -rv {} package/first-plugin-demo/ \;
-# xDS服务发现
-cp -rv ./xds-service-discovery-demo/product package/xds-service-discovery-demo/
 # xDS路由
-cp -rv ./xds-router-demo/router-product package/xds-router-demo/
+cp -rv ./xds-demo/product package/xds-demo/
 # 动态配置
 find . -type f -name "spring-provider.jar" -exec cp -v {} package/dynamic-demo/ \;
 # 流控
@@ -82,8 +79,7 @@ find . -type f -name "rocketmq-gray-producer-demo.jar" -exec cp -v {} package/mq
 
 # 打包
 tar -czvf package/result/sermant-examples-first-plugin-demo-$*.tar.gz -C package/first-plugin-demo/ .
-tar -czvf package/result/sermant-examples-xds-service-discovery-demo-$*.tar.gz -C package/xds-service-discovery-demo/ .
-tar -czvf package/result/sermant-examples-xds-router-demo-$*.tar.gz -C package/xds-router-demo/ .
+tar -czvf package/result/sermant-examples-xds-demo-$*.tar.gz -C package/xds-demo/ .
 tar -czvf package/result/sermant-examples-dynamic-demo-$*.tar.gz -C package/dynamic-demo/ .
 tar -czvf package/result/sermant-examples-flowcontrol-demo-$*.tar.gz -C package/flowcontrol-demo/ .
 tar -czvf package/result/sermant-examples-grace-demo-$*.tar.gz -C package/grace-demo/ .

xds-router-demo/pom.xml → xds-demo/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>xds-router-demo</artifactId>
+    <artifactId>xds-demo</artifactId>
     <packaging>pom</packaging>
 
     <modules>

xds-service-discovery-demo/product/spring-client/spring-client.yaml → xds-demo/product/script/spring-client-flowcontrol.yaml

@@ -15,9 +15,22 @@ spec:
       containers:
       - name: spring-client
         image: spring-client:1.0.0
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Never
         ports:
         - containerPort: 8080
+        env:
+        - name: agent_service_dynamic_config_enable
+          value: "false"
+        - name: agent_service_xds_service_enable
+          value: "true"
+        - name: xds_flow_control_config_enable
+          value: "true"
+        - name: ZOOKEEPER_ENABLED
+          value: "false"
+        - name: MYSQL_ENABLED
+          value: "false"
+        - name: JAVA_TOOL_OPTIONS
+          value: "-javaagent:/home/agent/sermant-agent.jar"
       imagePullSecrets:
         - name: default-secret
 ---

xds-demo/product/script/spring-server-virtureservice-flowcontrol.yaml

@@ -0,0 +1,27 @@
+apiVersion: networking.istio.io/v1alpha3
+kind: VirtualService
+metadata:
+  name: spring-server-virtualservice
+spec:
+  hosts:
+  - spring-server
+  http:
+  - name: "v1-routes"
+    match:
+    - headers:
+        version:
+          exact: v1
+      uri:
+        exact: /router
+      ignoreUriCase: false
+    route:
+    - destination:
+        host: spring-server
+        subset: v1
+        port:
+          number: 8081
+    fault:
+      abort:
+        percentage:
+          value: 100
+        httpStatus: 400

xds-router-demo/spring-cloud-client-xds/pom.xml → xds-demo/spring-cloud-client-xds/pom.xml

@@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>xds-router-demo</artifactId>
+        <artifactId>xds-demo</artifactId>
         <groupId>com.huaweicloud.sermant.examples</groupId>
         <version>1.0.0</version>
     </parent>
@@ -64,7 +64,7 @@
                 <configuration>
                     <mainClass>io.sermant.demo.xds.spring.client.SpringCloudClientApplication</mainClass>
                     <finalName>spring-client</finalName>
-                    <outputDirectory>${pom.basedir}/../router-product/spring-client</outputDirectory>
+                    <outputDirectory>${pom.basedir}/../product/spring-client</outputDirectory>
                 </configuration>
                 <executions>
                     <execution>
@@ -89,7 +89,7 @@
                         <configuration>
                             <filesets>
                                 <fileset>
-                                    <directory>${pom.basedir}/../router-product/spring-client</directory>
+                                    <directory>${pom.basedir}/../product/spring-client</directory>
                                     <includes>
                                         <include>spring-client.jar</include>
                                     </includes>

xds-router-demo/spring-cloud-client-xds/src/main/java/io/sermant/demo/xds/spring/client/SpringRouterController.java → xds-demo/spring-cloud-client-xds/src/main/java/io/sermant/demo/xds/spring/client/SpringClientController.java

@@ -60,14 +60,14 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * SpringRouterController
+ * SpringController
  *
  * @author daizhenyu
  * @since 2024-09-23
  **/
 @RequestMapping("router")
 @RestController
-public class SpringRouterController implements InitializingBean {
+public class SpringClientController implements InitializingBean {
     private static final String VERSION = "version";
 
     private static final int SUCCEED_CODE = 200;
@@ -168,7 +168,7 @@ public String testHttpClientRouting(String host, String version) {
                 mockRealLogic();
                 return result;
             } else {
-                return "";
+                return EntityUtils.toString(response.getEntity());
             }
         } catch (IOException e) {
             return "";

xds-router-demo/spring-cloud-server-xds/pom.xml → xds-demo/spring-cloud-server-xds/pom.xml

@@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>xds-router-demo</artifactId>
+        <artifactId>xds-demo</artifactId>
         <groupId>com.huaweicloud.sermant.examples</groupId>
         <version>1.0.0</version>
     </parent>
@@ -36,7 +36,7 @@
                 <configuration>
                     <mainClass>io.sermant.demo.xds.spring.server.SpringCloudServerApplication</mainClass>
                     <finalName>spring-server</finalName>
-                    <outputDirectory>${pom.basedir}/../router-product/spring-server</outputDirectory>
+                    <outputDirectory>${pom.basedir}/../product/spring-server</outputDirectory>
                 </configuration>
                 <executions>
                     <execution>
@@ -61,7 +61,7 @@
                         <configuration>
                             <filesets>
                                 <fileset>
-                                    <directory>${pom.basedir}/../router-product/spring-server</directory>
+                                    <directory>${pom.basedir}/../product/spring-server</directory>
                                     <includes>
                                         <include>spring-server.jar</include>
                                     </includes>

xds-router-demo/spring-cloud-server-xds/src/main/java/io/sermant/demo/xds/spring/server/RouterServerController.java → xds-demo/spring-cloud-server-xds/src/main/java/io/sermant/demo/xds/spring/server/ServerController.java

@@ -24,13 +24,13 @@
 import java.net.UnknownHostException;
 
 /**
- * RouterServerController
+ * ServerController
  *
  * @author daizhenyu
  * @since 2024-10-11
  **/
 @RestController
-public class RouterServerController {
+public class ServerController {
     private static final int ITERATION_COUNT = 15000;
 
     @Value("${SERVER_VERSION:v1}")