Skip to content

Commit 241a39e

Browse files
committed
bump mse-simple-demo from 1.2.0 to 2.0.1
1 parent 49c8a4c commit 241a39e

File tree

17 files changed

+41
-31
lines changed

17 files changed

+41
-31
lines changed

mse-simple-demo/A/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -e
33

44
cd "$(dirname "$0")"
55

6-
docker build --platform linux/amd64 . -t ${REGISTRY}spring-cloud-a:1.2.0
6+
docker build --platform linux/amd64 . -t ${REGISTRY}spring-cloud-a:2.0.1
77

88
if [ -n "${REGISTRY}" ]; then
9-
docker push ${REGISTRY}spring-cloud-a:1.2.0
9+
docker push ${REGISTRY}spring-cloud-a:2.0.1
1010
fi

mse-simple-demo/A/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>A</artifactId>
8-
<version>1.2.0</version>
8+
<version>2.0.1</version>
99
<packaging>jar</packaging>
1010

1111
<name>A</name>

mse-simple-demo/B/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
cd "$(dirname "$0")"
44

5-
docker build --platform linux/amd64 . -t ${REGISTRY}spring-cloud-b:1.2.0
5+
docker build --platform linux/amd64 . -t ${REGISTRY}spring-cloud-b:2.0.1
66

77
if [ -n "${REGISTRY}" ]; then
8-
docker push ${REGISTRY}spring-cloud-b:1.2.0
8+
docker push ${REGISTRY}spring-cloud-b:2.0.1
99
fi

mse-simple-demo/B/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>B</artifactId>
8-
<version>1.2.0</version>
8+
<version>2.0.1</version>
99
<packaging>jar</packaging>
1010

1111
<name>B</name>

mse-simple-demo/C/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -e
33

44
cd "$(dirname "$0")"
55

6-
docker build --platform linux/amd64 . -t ${REGISTRY}spring-cloud-c:1.2.0
6+
docker build --platform linux/amd64 . -t ${REGISTRY}spring-cloud-c:2.0.1
77

88
if [ -n "${REGISTRY}" ]; then
9-
docker push ${REGISTRY}spring-cloud-c:1.2.0
9+
docker push ${REGISTRY}spring-cloud-c:2.0.1
1010
fi

mse-simple-demo/C/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>C</artifactId>
8-
<version>1.2.0</version>
8+
<version>2.0.1</version>
99
<packaging>jar</packaging>
1010

1111
<name>C</name>

mse-simple-demo/gateway/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -e
33

44
cd "$(dirname "$0")"
55

6-
docker build --platform linux/amd64 . -t ${REGISTRY}spring-cloud-zuul:1.2.0
6+
docker build --platform linux/amd64 . -t ${REGISTRY}spring-cloud-zuul:2.0.1
77

88
if [ -n "${REGISTRY}" ]; then
9-
docker push ${REGISTRY}spring-cloud-zuul:1.2.0
9+
docker push ${REGISTRY}spring-cloud-zuul:2.0.1
1010
fi

mse-simple-demo/gateway/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.alibabacloud.mse.demo</groupId>
77
<artifactId>gateway</artifactId>
8-
<version>1.2.0</version>
8+
<version>2.0.1</version>
99
<packaging>jar</packaging>
1010

1111
<parent>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ public class DemoController {
3131
@Value("${demo.qps:100}")
3232
private int qps;
3333

34-
@Value("${enable.rpc.invoke:false}")
34+
@Value("${enable.rpc.invoke:true}")
3535
private boolean enableRpcInvoke;
3636

3737
@Value("${background.color:white}")
3838
private String backgroundColor;
3939

40-
@Value("${enable.sql:false}")
40+
@Value("${enable.sql:true}")
4141
private boolean enableSql;
4242

43-
@Value("${enable.auto:false}")
43+
@Value("${enable.auto:true}")
4444
private boolean enableAuto;
4545

46-
@Value("${enable.sentinel.demo.flow:false}")
46+
@Value("${enable.sentinel.demo.flow:true}")
4747
private boolean enableSentinelFlow;
4848

4949
private static Random random = new Random();
Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
11
## build
2+
export REGISTRY=registry.cn-hangzhou.aliyuncs.com/mse-demo-hz/ #对应的registry前缀
23

3-
At directory `A`/`B`/`C`/`gateway`:
4+
At directory `A`/`B`/`C`/`gateway`/`mysql`:
45

5-
* execute `./build.sh` to build image
6-
* `docker tag` to tag image
7-
* `docker push` to push image
6+
* execute `./build.sh` to build and push image
87

98
## install
109

1110
```shell
12-
helm3 upgrade mse-simple-demo1 helm/mse-simple-demo \
13-
--namespace default --create-namespace \
14-
--install \
15-
--values helm/mse-simple-demo/values.example.yaml
11+
kubectl create namespace mse-demo
12+
13+
helm install mse-simple-demo mse-simple-demo \
14+
--set images.version=2.0.1 \
15+
--set mse.application.prefix=demo \
16+
--set registry=registry.cn-hangzhou.aliyuncs.com/mse-demo-hz/ \
17+
--namespace=mse-demo
1618
```
19+
20+
其中可以修改的参数如下:
21+
- `namespace`: 要安装到的k8s命名空间(可选,一般为default)
22+
- `registry`: 容器镜像地址前缀
23+
- `images.version`:镜像版本
24+
- `mse.namespace`: 接入MSE微服务治理的微服务命名空间,可以用来区分环境
25+
- `autoscaling`:是否开启自动伸缩。
26+
- `resources.enableRequests`:是否设置resources的requests配置

0 commit comments

Comments
 (0)