Skip to content

Commit 705a29e

Browse files
robberphexrobberphex
committed
update version
1 parent cf02910 commit 705a29e

27 files changed

+82
-88
lines changed

‎mse-simple-demo/A/Dockerfile

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.3-labs
22

3-
FROM maven:3-eclipse-temurin-8-alpine
3+
FROM maven:3-eclipse-temurin-8-alpine as build
44

55
# copy arthas
66
COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
@@ -15,14 +15,9 @@ COPY <<EOF /root/.m2/settings.xml
1515
<mirror>
1616
<id>alimaven</id>
1717
<name>aliyun maven</name>
18-
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
18+
<url>https://maven.aliyun.com/nexus/content/groups/public/</url>
1919
<mirrorOf>central</mirrorOf>
2020
</mirror>
21-
<mirror>
22-
<id>maven-default-http-blocker</id>
23-
<mirrorOf>!*</mirrorOf>
24-
<url>http://0.0.0.0/</url>
25-
</mirror>
2621
</mirrors>
2722
</settings>
2823
EOF
@@ -34,6 +29,14 @@ COPY ./ ./
3429
RUN --mount=type=cache,target=/root/.m2/repository/ \
3530
mvn clean package --batch-mode
3631

32+
33+
FROM dragonwell-registry.cn-hangzhou.cr.aliyuncs.com/dragonwell/dragonwell:8-extended-ga-centos
34+
35+
# copy arthas
36+
COPY --from=hengyunabc/arthas:latest /opt/arthas /opt/arthas
37+
38+
COPY --from=build /app/target/A.jar /app/target/A.jar
39+
3740
EXPOSE 20001
3841
ENTRYPOINT ["sh", "-c"]
3942
CMD ["java -jar /app/target/A.jar"]

‎mse-simple-demo/A/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -e
33

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

6-
docker build . -t ${REGISTRY}spring-cloud-a:1.1.0
6+
docker build . -t ${REGISTRY}spring-cloud-a:1.2.0
77

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

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

+1-1
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.1.0</version>
8+
<version>1.2.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>A</name>

‎mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/AController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class AController {
4646
@Autowired
4747
InetUtils inetUtils;
4848

49-
@Reference(application = "${dubbo.application.id}", version = "1.1.0")
49+
@Reference(application = "${dubbo.application.id}", version = "1.2.0")
5050
private HelloServiceB helloServiceB;
5151

5252
@Autowired

‎mse-simple-demo/A/src/main/java/com/alibabacloud/mse/demo/service/HelloServiceAImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.cloud.commons.util.InetUtils;
88

9-
@Service(version = "1.1.0")
9+
@Service(version = "1.2.0")
1010
public class HelloServiceAImpl implements HelloServiceA {
1111

1212
@Autowired
1313
InetUtils inetUtils;
1414

15-
@Reference(application = "${dubbo.application.id}", version = "1.1.0")
15+
@Reference(application = "${dubbo.application.id}", version = "1.2.0")
1616
private HelloServiceB helloServiceB;
1717

1818
@Autowired

‎mse-simple-demo/B/Dockerfile

+1-6
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,9 @@ COPY <<EOF /root/.m2/settings.xml
1515
<mirror>
1616
<id>alimaven</id>
1717
<name>aliyun maven</name>
18-
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
18+
<url>https://maven.aliyun.com/nexus/content/groups/public/</url>
1919
<mirrorOf>central</mirrorOf>
2020
</mirror>
21-
<mirror>
22-
<id>maven-default-http-blocker</id>
23-
<mirrorOf>!*</mirrorOf>
24-
<url>http://0.0.0.0/</url>
25-
</mirror>
2621
</mirrors>
2722
</settings>
2823
EOF

‎mse-simple-demo/B/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

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

5-
docker build . -t ${REGISTRY}spring-cloud-b:1.1.0
5+
docker build . -t ${REGISTRY}spring-cloud-b:1.2.0
66

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

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

+1-1
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.1.0</version>
8+
<version>1.2.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>B</name>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class BController {
3333
@Qualifier("restTemplate")
3434
private RestTemplate restTemplate;
3535

36-
@Reference(application = "${dubbo.application.id}", version = "1.1.0")
36+
@Reference(application = "${dubbo.application.id}", version = "1.2.0")
3737
private HelloServiceC helloServiceC;
3838

3939
@Autowired

‎mse-simple-demo/B/src/main/java/com/alibabacloud/mse/demo/service/HelloServiceBImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.cloud.commons.util.InetUtils;
77

8-
@Service(version = "1.1.0")
8+
@Service(version = "1.2.0")
99
public class HelloServiceBImpl implements HelloServiceB {
1010

1111
@Autowired
@@ -14,7 +14,7 @@ public class HelloServiceBImpl implements HelloServiceB {
1414
@Autowired
1515
String serviceTag;
1616

17-
@Reference(application = "${dubbo.application.id}", version = "1.1.0")
17+
@Reference(application = "${dubbo.application.id}", version = "1.2.0")
1818
private HelloServiceC helloServiceC;
1919

2020
@Override

‎mse-simple-demo/C/Dockerfile

+1-6
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,9 @@ COPY <<EOF /root/.m2/settings.xml
1111
<mirror>
1212
<id>alimaven</id>
1313
<name>aliyun maven</name>
14-
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
14+
<url>https://maven.aliyun.com/nexus/content/groups/public/</url>
1515
<mirrorOf>central</mirrorOf>
1616
</mirror>
17-
<mirror>
18-
<id>maven-default-http-blocker</id>
19-
<mirrorOf>!*</mirrorOf>
20-
<url>http://0.0.0.0/</url>
21-
</mirror>
2217
</mirrors>
2318
</settings>
2419
EOF

‎mse-simple-demo/C/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -e
33

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

6-
docker build . -t ${REGISTRY}spring-cloud-c:1.1.0
6+
docker build . -t ${REGISTRY}spring-cloud-c:1.2.0
77

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

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

+1-1
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.1.0</version>
8+
<version>1.2.0</version>
99
<packaging>jar</packaging>
1010

1111
<name>C</name>

‎mse-simple-demo/C/src/main/java/com/alibabacloud/mse/demo/service/HelloServiceCImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.nio.charset.StandardCharsets;
1515

1616
@Slf4j
17-
@DubboService(version = "1.1.0")
17+
@DubboService(version = "1.2.0")
1818
@RequiredArgsConstructor
1919
public class HelloServiceCImpl implements HelloServiceC {
2020

‎mse-simple-demo/gateway/Dockerfile

-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ COPY <<EOF /root/.m2/settings.xml
1414
<url>https://maven.aliyun.com/nexus/content/groups/public/</url>
1515
<mirrorOf>central</mirrorOf>
1616
</mirror>
17-
<mirror>
18-
<id>maven-default-http-blocker</id>
19-
<mirrorOf>!*</mirrorOf>
20-
<url>http://0.0.0.0/</url>
21-
</mirror>
2217
</mirrors>
2318
</settings>
2419
EOF

‎mse-simple-demo/gateway/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -e
33

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

6-
docker build . -t ${REGISTRY}spring-cloud-zuul:1.1.0
6+
docker build . -t ${REGISTRY}spring-cloud-zuul:1.2.0
77

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

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

+1-1
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.1.0</version>
8+
<version>1.2.0</version>
99
<packaging>jar</packaging>
1010

1111
<parent>

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

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

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ spec:
1212
metadata:
1313
labels:
1414
msePilotAutoEnable: "on"
15-
appName: "{{ .Values.mse.namePrefix }}spring-cloud-zuul"
15+
msePilotCreateAppName: "spring-cloud-zuul"
16+
mseNamespace: "{{ .Values.mse.namespace }}"
1617
app: spring-cloud-zuul
1718
spec:
1819
containers:
19-
- image: "{{ .Values.registry }}spring-cloud-zuul:1.1.0"
20+
- image: "{{ .Values.registry }}spring-cloud-zuul:1.2.0"
2021
imagePullPolicy: Always
2122
env:
2223
- name: nacos.host
@@ -26,11 +27,11 @@ spec:
2627
name: "spring-cloud-zuul"
2728
resources:
2829
requests:
29-
cpu: 2
30-
memory: 4Gi
30+
cpu: 1
31+
memory: 2Gi
3132
limits:
32-
cpu: 2
33-
memory: 4Gi
33+
cpu: 1
34+
memory: 2Gi
3435
ports:
3536
- containerPort: 20000
3637
affinity:

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

File renamed without changes.

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ spec:
1212
metadata:
1313
labels:
1414
msePilotAutoEnable: "on"
15-
appName: "{{ .Values.mse.namePrefix }}spring-cloud-a"
15+
msePilotCreateAppName: "spring-cloud-a"
16+
mseNamespace: "{{ .Values.mse.namespace }}"
1617
app: "spring-cloud-a"
1718
spec:
1819
containers:
1920
- name: spring-cloud-a
20-
image: "{{ .Values.registry }}spring-cloud-a:1.1.0"
21+
image: "{{ .Values.registry }}spring-cloud-a:1.2.0"
2122
imagePullPolicy: Always
2223
env:
2324
- name: nacos.host
@@ -26,11 +27,11 @@ spec:
2627
value: "{{ .Values.nacos.namespace }}"
2728
resources:
2829
requests:
29-
cpu: 2
30-
memory: 4Gi
30+
cpu: 1
31+
memory: 2Gi
3132
limits:
32-
cpu: 2
33-
memory: 4Gi
33+
cpu: 1
34+
memory: 2Gi
3435
ports:
3536
- name: http-port
3637
containerPort: 20001

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

+9-8
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ spec:
1212
template:
1313
metadata:
1414
labels:
15+
msePilotAutoEnable: "on"
16+
msePilotCreateAppName: "spring-cloud-a"
17+
mseNamespace: "{{ .Values.mse.namespace }}"
18+
alicloud.service.tag: gray
1519
app: "spring-cloud-a"
1620
version: gray
17-
alicloud.service.tag: gray
18-
msePilotAutoEnable: "on"
19-
appName: "{{ .Values.mse.namePrefix }}spring-cloud-a"
2021
spec:
2122
containers:
2223
- name: spring-cloud-a
23-
image: "{{ .Values.registry }}spring-cloud-a:1.1.0"
24+
image: "{{ .Values.registry }}spring-cloud-a:1.2.0"
2425
imagePullPolicy: Always
2526
env:
2627
- name: nacos.host
@@ -29,11 +30,11 @@ spec:
2930
value: "{{ .Values.nacos.namespace }}"
3031
resources:
3132
requests:
32-
cpu: 2
33-
memory: 4Gi
33+
cpu: 1
34+
memory: 2Gi
3435
limits:
35-
cpu: 2
36-
memory: 4Gi
36+
cpu: 1
37+
memory: 2Gi
3738
ports:
3839
- name: http-port
3940
containerPort: 20001

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ spec:
1212
metadata:
1313
labels:
1414
msePilotAutoEnable: "on"
15-
appName: "{{ .Values.mse.namePrefix }}spring-cloud-b"
15+
msePilotCreateAppName: "spring-cloud-b"
16+
mseNamespace: "{{ .Values.mse.namespace }}"
1617
app: "spring-cloud-b"
1718
spec:
1819
containers:
1920
- name: spring-cloud-b
20-
image: "{{ .Values.registry }}spring-cloud-b:1.1.0"
21+
image: "{{ .Values.registry }}spring-cloud-b:1.2.0"
2122
imagePullPolicy: Always
2223
env:
2324
- name: nacos.host
@@ -26,11 +27,11 @@ spec:
2627
value: "{{ .Values.nacos.namespace }}"
2728
resources:
2829
requests:
29-
cpu: 2
30-
memory: 4Gi
30+
cpu: 1
31+
memory: 2Gi
3132
limits:
32-
cpu: 2
33-
memory: 4Gi
33+
cpu: 1
34+
memory: 2Gi
3435
ports:
3536
- name: http-port
3637
containerPort: 20002

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ spec:
1212
metadata:
1313
labels:
1414
msePilotAutoEnable: "on"
15-
appName: "{{ .Values.mse.namePrefix }}spring-cloud-c"
15+
msePilotCreateAppName: "spring-cloud-c"
16+
mseNamespace: "{{ .Values.mse.namespace }}"
1617
app: "spring-cloud-c"
1718
spec:
1819
containers:
1920
- name: spring-cloud-c
20-
image: "{{ .Values.registry }}spring-cloud-c:1.1.0"
21+
image: "{{ .Values.registry }}spring-cloud-c:1.2.0"
2122
imagePullPolicy: Always
2223
env:
2324
- name: nacos.host
@@ -26,11 +27,11 @@ spec:
2627
value: "{{ .Values.nacos.namespace }}"
2728
resources:
2829
requests:
29-
cpu: 2
30-
memory: 4Gi
30+
cpu: 1
31+
memory: 2Gi
3132
limits:
32-
cpu: 2
33-
memory: 4Gi
33+
cpu: 1
34+
memory: 2Gi
3435
ports:
3536
- name: http-port
3637
containerPort: 20003

0 commit comments

Comments
 (0)