Skip to content

Commit f533cda

Browse files
flystar32EndlessSeeker
flystar32
authored and
EndlessSeeker
committed
update helm version to 3.1.0
1 parent a97fc4c commit f533cda

File tree

7 files changed

+19
-75
lines changed

7 files changed

+19
-75
lines changed

‎mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/b/BController.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,34 +69,34 @@ public String flow() throws ExecutionException, InterruptedException {
6969
long sleepTime = 5 + RANDOM.nextInt(5);
7070
silentSleep(sleepTime);
7171
String result = restTemplate.getForObject("http://sc-C/flow", String.class);
72-
return "B[tag=" + serviceTag + "][" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime + " -> " + result;
72+
return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime + " -> " + result;
7373
}
7474

7575
@GetMapping("/params/{hot}")
7676
public String params(@PathVariable("hot") String hot) throws ExecutionException, InterruptedException {
7777
long sleepTime = 5 + RANDOM.nextInt(5);
7878
silentSleep(sleepTime);
7979
String result = restTemplate.getForObject("http://sc-C/params/" + hot, String.class);
80-
return "B[tag=" + serviceTag + "][" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime + " params:" + hot + " -> " + result;
80+
return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime + " params:" + hot + " -> " + result;
8181
}
8282

8383
@GetMapping("/isolate")
8484
public String isolate() throws ExecutionException, InterruptedException {
8585
long sleepTime = 500 + RANDOM.nextInt(5);
8686
silentSleep(sleepTime);
8787
String result = restTemplate.getForObject("http://sc-C/isolate", String.class);
88-
return "B[tag=" + serviceTag + "][" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime + " -> " + result;
88+
return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime + " -> " + result;
8989
}
9090

9191
@GetMapping("/b")
9292
public String b() {
93-
return "B[tag=" + serviceTag + "][" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " -> " +
93+
return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " -> " +
9494
restTemplate.getForObject("http://sc-C/c", String.class);
9595
}
9696

9797
@GetMapping("/bByFeign")
9898
public String bByFeign(String s) {
99-
return "B[tag=" + serviceTag + "][" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
99+
return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
100100
}
101101

102102
@GetMapping("/circuit-breaker-rt-b")
@@ -112,7 +112,7 @@ public String circuit_breaker_rt_b() {
112112

113113
String slowMessage = isSlowRequest ? " RT:" + rt : "";
114114

115-
return "B[tag=" + serviceTag + "][" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + slowMessage;
115+
return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + slowMessage;
116116
}
117117

118118
@GetMapping("/circuit-breaker-exception-b")
@@ -122,12 +122,12 @@ public String circuit_breaker_exception_b() {
122122
if (isExceptionRequest) {
123123
throw new RuntimeException("TestCircuitBreakerException");
124124
}
125-
return "B[tag=" + serviceTag + "][" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
125+
return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
126126
}
127127

128128
@GetMapping("/b-zone")
129129
public String bZone() {
130-
return "B[tag=" + serviceTag + "][" + currentZone + "]" + " -> " +
130+
return "B" + serviceTag + "[" + currentZone + "]" + " -> " +
131131
restTemplate.getForObject("http://sc-C/c-zone", String.class);
132132
}
133133

@@ -162,7 +162,7 @@ public String sql(@RequestParam Map<String, String> allRequestParams) {
162162
List<User> list = user.selectAll();
163163
result = JSON.toJSONString(list);
164164
}
165-
return "B[tag=" + serviceTag + "][" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " result:" + result;
165+
return "B" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " result:" + result;
166166
}
167167

168168
@GetMapping("/set-traffic-attribute")

‎mse-simple-demo/C/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@
141141
<groupId>org.springframework.boot</groupId>
142142
<artifactId>spring-boot-maven-plugin</artifactId>
143143
<version>${spring-boot.version}</version>
144-
<configuration>
145-
<mainClass>com.alibabacloud.mse.demo.c.CApplication</mainClass>
146-
</configuration>
147144
<executions>
148145
<execution>
149146
<id>repackage</id>

‎mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/c/CController.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public String c() {
6868
try (Entry entry1 = SphU.entry("HelloWorld-c-1", EntryType.IN)) {
6969
// 具体的业务逻辑
7070
try {
71-
return "C[tag=" + serviceTag + "][" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
71+
return "C" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
7272
} catch (Throwable e) {
7373
// 标记此次资源调用失败
7474
entry1.setError(e);
@@ -88,7 +88,7 @@ public String cZone() {
8888
try (Entry entry2 = SphU.entry("HelloWorld-c-2", EntryType.IN)) {
8989
try {
9090
log.debug("Hello Sentinel!2");
91-
return "C[tag=" + serviceTag + "][" + currentZone + "]";
91+
return "C" + serviceTag + "[" + currentZone + "]";
9292
} catch (Throwable e) {
9393
entry2.setError(e);
9494
throw e;
@@ -100,7 +100,7 @@ public String cZone() {
100100

101101
@GetMapping("/spring_boot")
102102
public String spring_boot() {
103-
return "C[tag=" + serviceTag + "][" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
103+
return "C" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]";
104104
}
105105

106106
@GetMapping("/flow")
@@ -112,7 +112,7 @@ public String flow() {
112112
try {
113113
long sleepTime = 5 + RANDOM.nextInt(5);
114114
silentSleep(sleepTime);
115-
return "C[tag=" + serviceTag + "][" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime;
115+
return "C" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime;
116116
} catch (Throwable throwable) {
117117
entry2.setError(throwable);
118118
entry1.setError(throwable);
@@ -130,14 +130,14 @@ public String flow() {
130130
public String params(@PathVariable("hot") String hot) throws ExecutionException, InterruptedException {
131131
long sleepTime = 5 + RANDOM.nextInt(5);
132132
silentSleep(sleepTime);
133-
return "C[tag=" + serviceTag + "][" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime + " params:" + hot;
133+
return "C" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime + " params:" + hot;
134134
}
135135

136136
@GetMapping("/isolate")
137137
public String isolate() throws ExecutionException, InterruptedException {
138138
long sleepTime = 5 + RANDOM.nextInt(5);
139139
silentSleep(sleepTime);
140-
return "C[tag=" + serviceTag + "][" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime;
140+
return "C" + serviceTag + "[" + inetUtils.findFirstNonLoopbackAddress().getHostAddress() + "]" + " sleepTime:" + sleepTime;
141141
}
142142

143143
private void silentSleep(long ms) {

‎mse-simple-demo/helm/mse-simple-demo/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: mse-simple-demo
3-
version: "3.0.8"
4-
appVersion: "3.0.8"
3+
version: "3.1.0"
4+
appVersion: "3.1.0"
55
home: https://mse.console.aliyun.com/
66
keywords:
77
- mse

‎mse-simple-demo/helm/mse-simple-demo/templates/PodMonitor.yaml

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎mse-simple-demo/helm/mse-simple-demo/templates/nacos-server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: nacos-server
18-
image: "{{ .Values.registry }}nacos-server:v2.1.2"
18+
image: "{{ .Values.registry }}nacos-server:v2.4.3"
1919
env:
2020
- name: MODE
2121
value: standalone

‎mse-simple-demo/helm/mse-simple-demo/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
registry: registry.cn-hangzhou.aliyuncs.com/mse-governance-demo/
33

44
images:
5-
version: 3.0.8
5+
version: 3.1.0
66

77
# 是否启动zuul、springcloud网关
88
gateway:

0 commit comments

Comments
 (0)