Skip to content

Commit 07728af

Browse files
robberphexrobberphex
committed
fix demo
1 parent 74aa8f3 commit 07728af

File tree

34 files changed

+175
-160
lines changed

34 files changed

+175
-160
lines changed

‎helm-chart/README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
## install
3+
4+
```shell
5+
helm3 upgrade mse-demo1 helm-chart/ \
6+
--namespace default --create-namespace \
7+
--install \
8+
--values helm-chart/values.yaml
9+
```

‎helm-chart/templates/cartservice1.yaml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ metadata:
77
labels:
88
app: cartservice1
99
name: cartservice1
10-
selfLink: /apis/apps/v1/namespaces/default/deployments/cartservice1
1110
spec:
12-
progressDeadlineSeconds: 600
13-
replicas: 2
11+
replicas: 1
1412
selector:
1513
matchLabels:
1614
app: cartservice1
@@ -21,9 +19,8 @@ spec:
2119
type: RollingUpdate
2220
template:
2321
metadata:
24-
annotations:
25-
alicloud.service.tag: v1
2622
labels:
23+
alicloud.service.tag: v1
2724
app: cartservice1
2825
armsPilotAutoEnable: "on"
2926
armsPilotCreateAppName: {{ .Values.application.name.prefix}}cartservice
@@ -32,10 +29,6 @@ spec:
3229
spec:
3330
containers:
3431
- env:
35-
- name: LANG
36-
value: C.UTF-8
37-
- name: JAVA_HOME
38-
value: /usr/lib/jvm/java-1.8-openjdk/jre
3932
- name: spring.cloud.nacos.discovery.server-addr
4033
value: {{ .Values.mse.address.springcloud}}
4134
- name: dubbo.registry.address
@@ -44,7 +37,7 @@ spec:
4437
value: ' -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 '
4538
- name: dubbo.consumer.check
4639
value: "false"
47-
image: registry.cn-hangzhou.aliyuncs.com/mse-hz/cartservice:{{ .Values.images.version}}
40+
image: {{ .Values.image.prefix }}cartservice:{{ .Values.image.version }}
4841
imagePullPolicy: Always
4942
name: cartservice
5043
ports:

‎helm-chart/templates/cartservice2.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
annotations:
5-
deployment.kubernetes.io/revision: "9"
64
generation: 1
75
labels:
86
app: cartservice2
97
name: cartservice2
10-
selfLink: /apis/apps/v1/namespaces/default/deployments/cartservice2
118
spec:
129
progressDeadlineSeconds: 600
1310
replicas: 1
@@ -21,10 +18,11 @@ spec:
2118
type: RollingUpdate
2219
template:
2320
metadata:
24-
annotations:
25-
alicloud.service.tag: v2
2621
labels:
22+
alicloud.service.tag: v2
2723
app: cartservice2
24+
armsPilotAutoEnable: "on"
25+
armsPilotCreateAppName: {{ .Values.application.name.prefix}}cartservice
2826
msePilotAutoEnable: "on"
2927
msePilotCreateAppName: {{ .Values.application.name.prefix}}cartservice
3028
spec:
@@ -40,7 +38,7 @@ spec:
4038
value: ' -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 '
4139
- name: dubbo.consumer.check
4240
value: "false"
43-
image: registry.cn-hangzhou.aliyuncs.com/mse-hz/cartservice:{{ .Values.images.version}}
41+
image: {{ .Values.image.prefix }}cartservice:{{ .Values.image.version }}
4442
imagePullPolicy: Always
4543
name: cartservice2
4644
resources:

‎helm-chart/templates/checkoutservice.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
value: ' -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 '
3939
- name: dubbo.consumer.check
4040
value: "false"
41-
image: registry.cn-hangzhou.aliyuncs.com/mse-hz/checkoutservice:{{ .Values.images.version}}
41+
image: {{ .Values.image.prefix }}checkoutservice:{{ .Values.image.version }}
4242
imagePullPolicy: Always
4343
name: checkoutservice
4444
resources:

‎helm-chart/templates/frontend1.yaml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
annotations:
5-
deployment.kubernetes.io/revision: "48"
6-
creationTimestamp: null
7-
generation: 1
84
labels:
95
app: frontend1
106
name: frontend1
@@ -22,11 +18,10 @@ spec:
2218
type: RollingUpdate
2319
template:
2420
metadata:
25-
annotations:
26-
alicloud.service.tag: tag1
2721
labels:
22+
alicloud.service.tag: tag1
2823
armsPilotAutoEnable: "on"
29-
armsPilotCreateAppName: {{ .Values.application.name.prefix}}frontend1
24+
armsPilotCreateAppName: {{ .Values.application.name.prefix}}frontend
3025
msePilotAutoEnable: "on"
3126
msePilotCreateAppName: {{ .Values.application.name.prefix}}frontend
3227
app: frontend1
@@ -35,8 +30,6 @@ spec:
3530
- env:
3631
- name: LANG
3732
value: C.UTF-8
38-
- name: JAVA_HOME
39-
value: /usr/lib/jvm/java-1.8-openjdk/jre
4033
- name: TOMCAT_ACCESSLOG_ENABLED
4134
value: "true"
4235
- name: micro.service.shutdown.wait.time
@@ -51,7 +44,7 @@ spec:
5144
value: ' -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 '
5245
- name: dubbo.consumer.check
5346
value: "false"
54-
image: registry.cn-hangzhou.aliyuncs.com/mse-hz/frontend:{{ .Values.images.version}}
47+
image: {{ .Values.image.prefix }}frontend:{{ .Values.image.version }}
5548
imagePullPolicy: Always
5649
name: frontend1
5750
ports:
@@ -68,4 +61,3 @@ spec:
6861
schedulerName: default-scheduler
6962
securityContext: {}
7063
terminationGracePeriodSeconds: 30
71-
status: {}

‎helm-chart/templates/frontend2.yaml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,18 @@ spec:
2222
type: RollingUpdate
2323
template:
2424
metadata:
25-
annotations:
26-
alicloud.service.tag: tag2
2725
labels:
26+
alicloud.service.tag: tag2
2827
app: frontend2
2928
armsPilotAutoEnable: "on"
30-
armsPilotCreateAppName: {{ .Values.application.name.prefix}}frontend2
29+
armsPilotCreateAppName: {{ .Values.application.name.prefix}}frontend
3130
msePilotAutoEnable: "on"
3231
msePilotCreateAppName: {{ .Values.application.name.prefix}}frontend
3332
spec:
3433
containers:
3534
- env:
3635
- name: LANG
3736
value: C.UTF-8
38-
- name: JAVA_HOME
39-
value: /usr/lib/jvm/java-1.8-openjdk/jre
4037
- name: demo_version
4138
value: "true"
4239
- name: spring.cloud.nacos.discovery.server-addr
@@ -47,7 +44,7 @@ spec:
4744
value: ' -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 '
4845
- name: dubbo.consumer.check
4946
value: "false"
50-
image: registry.cn-hangzhou.aliyuncs.com/mse-hz/frontend:{{ .Values.images.version}}
47+
image: {{ .Values.image.prefix }}frontend:{{ .Values.image.version }}
5148
imagePullPolicy: Always
5249
name: frontend-v2
5350
ports:

‎helm-chart/templates/frontend3.yaml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,16 @@ spec:
2222
type: RollingUpdate
2323
template:
2424
metadata:
25-
annotations:
26-
alicloud.service.tag: tag3
2725
labels:
26+
alicloud.service.tag: tag3
2827
app: frontend3
2928
armsPilotAutoEnable: "on"
30-
armsPilotCreateAppName: {{ .Values.application.name.prefix}}frontend3
29+
armsPilotCreateAppName: {{ .Values.application.name.prefix}}frontend
3130
msePilotAutoEnable: "on"
3231
msePilotCreateAppName: {{ .Values.application.name.prefix}}frontend
3332
spec:
3433
containers:
3534
- env:
36-
- name: LANG
37-
value: C.UTF-8
38-
- name: JAVA_HOME
39-
value: /usr/lib/jvm/java-1.8-openjdk/jre
4035
- name: demo_version
4136
value: "true"
4237
- name: spring.cloud.nacos.discovery.server-addr
@@ -47,7 +42,7 @@ spec:
4742
value: ' -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 '
4843
- name: dubbo.consumer.check
4944
value: "false"
50-
image: registry.cn-hangzhou.aliyuncs.com/mse-hz/frontend:{{ .Values.images.version}}
45+
image: {{ .Values.image.prefix }}frontend:{{ .Values.image.version }}
5146
imagePullPolicy: Always
5247
name: frontend-v2
5348
ports:

‎helm-chart/templates/loadgenerator1.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
value: user=tag
4848
- name: VIEW_CART
4949
value: "true"
50-
image: registry.cn-hangzhou.aliyuncs.com/mse-hz/loadgenerator:2.0
50+
image: {{ .Values.image.prefix }}loadgenerator:{{ .Values.image.version }}
5151
imagePullPolicy: IfNotPresent
5252
name: loadgenerator1
5353
resources:

‎helm-chart/templates/loadgenerator2.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
value: user=tag2
4848
- name: VIEW_CART
4949
value: "false"
50-
image: registry.cn-hangzhou.aliyuncs.com/mse-hz/loadgenerator:2.0
50+
image: {{ .Values.image.prefix }}loadgenerator:{{ .Values.image.version }}
5151
imagePullPolicy: IfNotPresent
5252
name: loadgenerator2
5353
resources:

‎helm-chart/templates/loadgenerator3.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
value: user=tag3
4848
- name: VIEW_CART
4949
value: "false"
50-
image: registry.cn-hangzhou.aliyuncs.com/mse-hz/loadgenerator:2.0
50+
image: {{ .Values.image.prefix }}loadgenerator:{{ .Values.image.version }}
5151
imagePullPolicy: IfNotPresent
5252
name: loadgenerator3
5353
resources:

0 commit comments

Comments
 (0)