Skip to content

Commit e78dd61

Browse files
authored
Merge pull request #151 from LearningGp/mse-simple-demo
add resources request and limit
2 parents 6ad8329 + 65c24e6 commit e78dd61

8 files changed

+49
-34
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ spec:
3838
{{ end }}
3939
name: "spring-cloud-zuul"
4040
resources:
41-
{{ if .Values.resources.enableRequests }}
41+
{{ if .Values.resources.enable }}
4242
requests:
43-
cpu: 1
44-
memory: 2Gi
43+
cpu: {{ .Values.resources.request.cpu }}
44+
memory: {{ .Values.resources.request.memory }}
4545
limits:
46-
cpu: 1
47-
memory: 2Gi
46+
cpu: {{ .Values.resources.limit.cpu }}
47+
memory: {{ .Values.resources.limit.memory }}
4848
{{ end }}
4949
ports:
5050
- containerPort: 20000

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,13 @@ spec:
2424
image: {{ .Values.registry }}demo-mysql:{{ .Values.images.version }}
2525
name: demo-mysql
2626
ports:
27-
- containerPort: 3306
27+
- containerPort: 3306
28+
resources:
29+
{{ if .Values.resources.enable }}
30+
requests:
31+
cpu: {{ .Values.resources.request.cpu }}
32+
memory: {{ .Values.resources.request.memory }}
33+
limits:
34+
cpu: {{ .Values.resources.limit.cpu }}
35+
memory: {{ .Values.resources.limit.memory }}
36+
{{ end }}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: spring-cloud-a
55
namespace: {{ .Release.Namespace }}
66
spec:
7-
replicas: 2
7+
replicas: 1
88
selector:
99
matchLabels:
1010
app: spring-cloud-a
@@ -30,13 +30,13 @@ spec:
3030
value: {{ .Values.MSE_DEBUG_HOST }}
3131
{{ end }}
3232
resources:
33-
{{ if .Values.resources.enableRequests }}
33+
{{ if .Values.resources.enable }}
3434
requests:
35-
cpu: 1
36-
memory: 2Gi
35+
cpu: {{ .Values.resources.request.cpu }}
36+
memory: {{ .Values.resources.request.memory }}
3737
limits:
38-
cpu: 1
39-
memory: 2Gi
38+
cpu: {{ .Values.resources.limit.cpu }}
39+
memory: {{ .Values.resources.limit.memory }}
4040
{{ end }}
4141
ports:
4242
- name: http-port

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ spec:
3333
value: {{ .Values.MSE_DEBUG_HOST }}
3434
{{ end }}
3535
resources:
36-
{{ if .Values.resources.enableRequests }}
36+
{{ if .Values.resources.enable }}
3737
requests:
38-
cpu: 1
39-
memory: 2Gi
38+
cpu: {{ .Values.resources.request.cpu }}
39+
memory: {{ .Values.resources.request.memory }}
4040
limits:
41-
cpu: 1
42-
memory: 2Gi
41+
cpu: {{ .Values.resources.limit.cpu }}
42+
memory: {{ .Values.resources.limit.memory }}
4343
{{ end }}
4444
ports:
4545
- name: http-port

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ spec:
3030
value: {{ .Values.MSE_DEBUG_HOST }}
3131
{{ end }}
3232
resources:
33-
{{ if .Values.resources.enableRequests }}
33+
{{ if .Values.resources.enable }}
3434
requests:
35-
cpu: 1
36-
memory: 2Gi
35+
cpu: {{ .Values.resources.request.cpu }}
36+
memory: {{ .Values.resources.request.memory }}
3737
limits:
38-
cpu: 1
39-
memory: 2Gi
38+
cpu: {{ .Values.resources.limit.cpu }}
39+
memory: {{ .Values.resources.limit.memory }}
4040
{{ end }}
4141
ports:
4242
- name: http-port

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: spring-cloud-c
55
namespace: {{ .Release.Namespace }}
66
spec:
7-
replicas: 2
7+
replicas: 1
88
selector:
99
matchLabels:
1010
app: spring-cloud-c
@@ -30,13 +30,13 @@ spec:
3030
value: {{ .Values.MSE_DEBUG_HOST }}
3131
{{ end }}
3232
resources:
33-
{{ if .Values.resources.enableRequests }}
33+
{{ if .Values.resources.enable }}
3434
requests:
35-
cpu: 1
36-
memory: 2Gi
35+
cpu: {{ .Values.resources.request.cpu }}
36+
memory: {{ .Values.resources.request.memory }}
3737
limits:
38-
cpu: 1
39-
memory: 2Gi
38+
cpu: {{ .Values.resources.limit.cpu }}
39+
memory: {{ .Values.resources.limit.memory }}
4040
{{ end }}
4141
ports:
4242
- name: http-port

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ spec:
3333
value: {{ .Values.MSE_DEBUG_HOST }}
3434
{{ end }}
3535
resources:
36-
{{ if .Values.resources.enableRequests }}
36+
{{ if .Values.resources.enable }}
3737
requests:
38-
cpu: 1
39-
memory: 2Gi
38+
cpu: {{ .Values.resources.request.cpu }}
39+
memory: {{ .Values.resources.request.memory }}
4040
limits:
41-
cpu: 1
42-
memory: 2Gi
41+
cpu: {{ .Values.resources.limit.cpu }}
42+
memory: {{ .Values.resources.limit.memory }}
4343
{{ end }}
4444
ports:
4545
- name: http-port

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,10 @@ nacos:
1616
autoscaling: false
1717

1818
resources:
19-
enableRequests: false
19+
enable: true
20+
request:
21+
cpu: 0.75
22+
memory: 1.5Gi
23+
limit:
24+
cpu: 0.75
25+
memory: 1.5Gi

0 commit comments

Comments
 (0)