Merge pull request #131 from LearningGp/mse-simple-demo

Author: robberphex

mse-simple-demo/A/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>A</artifactId>
-    <version>1.2.0</version>
+    <version>2.0.1</version>
     <packaging>jar</packaging>
 
     <name>A</name>

mse-simple-demo/B/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>B</artifactId>
-    <version>1.2.0</version>
+    <version>2.0.1</version>
     <packaging>jar</packaging>
 
     <name>B</name>

mse-simple-demo/C/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>C</artifactId>
-    <version>1.2.0</version>
+    <version>2.0.1</version>
     <packaging>jar</packaging>
 
     <name>C</name>

mse-simple-demo/build.sh

@@ -7,3 +7,4 @@ cd "$(dirname "$0")"
 ./B/build.sh
 ./C/build.sh
 ./gateway/build.sh
+./mysql/build.sh

mse-simple-demo/gateway/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.alibabacloud.mse.demo</groupId>
     <artifactId>gateway</artifactId>
-    <version>1.2.0</version>
+    <version>2.0.1</version>
     <packaging>jar</packaging>
 
     <parent>

mse-simple-demo/gateway/src/main/java/com/alibabacloud/mse/demo/DemoController.java

@@ -31,19 +31,19 @@ public class DemoController {
     @Value("${demo.qps:100}")
     private int qps;
 
-    @Value("${enable.rpc.invoke:false}")
+    @Value("${enable.rpc.invoke:true}")
     private boolean enableRpcInvoke;
 
     @Value("${background.color:white}")
     private String backgroundColor;
 
-    @Value("${enable.sql:false}")
+    @Value("${enable.sql:true}")
     private boolean enableSql;
 
-    @Value("${enable.auto:false}")
+    @Value("${enable.auto:true}")
     private boolean enableAuto;
 
-    @Value("${enable.sentinel.demo.flow:false}")
+    @Value("${enable.sentinel.demo.flow:true}")
     private boolean enableSentinelFlow;
 
     @Value("${enable.gray:false}")

mse-simple-demo/helm/mse-simple-demo/README.md

@@ -1,16 +1,26 @@
 ## build
+export REGISTRY=registry.cn-hangzhou.aliyuncs.com/mse-demo-hz/ #对应的registry前缀
 
-At directory `A`/`B`/`C`/`gateway`:
+At directory `A`/`B`/`C`/`gateway`/`mysql`:
 
-* execute `./build.sh` to build image
-* `docker tag` to tag image
-* `docker push` to push image
+* execute `./build.sh` to build and push image
 
 ## install
 
 ```shell
-helm3 upgrade mse-simple-demo1 helm/mse-simple-demo \
-  --namespace default --create-namespace \
-  --install \
-  --values helm/mse-simple-demo/values.example.yaml
+kubectl create namespace mse-demo
+
+helm install mse-simple-demo mse-simple-demo \
+--set images.version=2.0.1 \
+--set mse.application.prefix=demo \
+--set registry=registry.cn-hangzhou.aliyuncs.com/mse-demo-hz/ \
+--namespace=mse-demo
 ```
+
+其中可以修改的参数如下：
+- `namespace`: 要安装到的k8s命名空间（可选，一般为default） 
+- `registry`: 容器镜像地址前缀 
+- `images.version`：镜像版本 
+- `mse.namespace`: 接入MSE微服务治理的微服务命名空间，可以用来区分环境 
+- `autoscaling`：是否开启自动伸缩。 
+- `resources.enableRequests`：是否设置resources的requests配置

mse-simple-demo/helm/mse-simple-demo/templates/gateway-deployment.yaml

@@ -42,10 +42,10 @@ spec:
             requests:
               cpu: 1
               memory: 2Gi
-            {{ end }}
             limits:
               cpu: 1
               memory: 2Gi
+            {{ end }}
           ports:
             - containerPort: 20000
       hostAliases:

mse-simple-demo/helm/mse-simple-demo/templates/spring-cloud-a-deployment.yaml

@@ -34,10 +34,10 @@ spec:
             requests:
               cpu: 1
               memory: 2Gi
-            {{ end }}
             limits:
               cpu: 1
               memory: 2Gi
+            {{ end }}
           ports:
             - name: http-port
               containerPort: 20001

mse-simple-demo/helm/mse-simple-demo/templates/spring-cloud-a-gray-deployment.yaml

@@ -37,10 +37,10 @@ spec:
             requests:
               cpu: 1
               memory: 2Gi
-            {{ end }}
             limits:
               cpu: 1
               memory: 2Gi
+            {{ end }}
           ports:
             - name: http-port
               containerPort: 20001