Skip to content

Commit 7a2f41a

Browse files
TarasKovalenkoTarasKovalenko
authored
Merge pull request dotnet-architecture#47 from dotnet-architecture/dev
eShopOnContainers fork
2 parents 6ce3769 + e05a876 commit 7a2f41a

31 files changed

Lines changed: 505 additions & 31 deletions

File tree

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# eShopOnContainers - Microservices Architecture and Containers based Reference Application (**BETA state** - Visual Studio 2017 and CLI environments compatible)
22
Sample .NET Core reference application, powered by Microsoft, based on a simplified microservices architecture and Docker containers.
33

4+
[![Build status (Linux images)](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/All%20Microservices%20Linux)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=184)
5+
6+
47
## IMPORTANT NOTES!
58
**You can use either the latest version of Visual Studio or simply Docker CLI and .NET CLI for Windows, Mac and Linux**.
69

‎k8s/helm/apigwmm/templates/deployment.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,27 @@ spec:
3636
path: configuration.json
3737
containers:
3838
- name: {{ .Chart.Name }}
39+
{{ if .Values.probes -}}
40+
{{- if .Values.probes.liveness -}}
41+
livenessProbe:
42+
httpGet:
43+
port: {{ .Values.probes.liveness.port }}
44+
path: {{ .Values.probes.liveness.path }}
45+
initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
46+
periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
47+
{{- end -}}
48+
{{- end -}}
49+
{{- if .Values.probes -}}
50+
{{- if .Values.probes.readiness }}
51+
readinessProbe:
52+
httpGet:
53+
port: {{ .Values.probes.readiness.port }}
54+
path: {{ .Values.probes.readiness.path }}
55+
initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
56+
periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
57+
timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
58+
{{- end -}}
59+
{{- end }}
3960
image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
4061
imagePullPolicy: {{ .Values.image.pullPolicy }}
4162
volumeMounts:

‎k8s/helm/apigwmm/values.yaml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,15 @@ env:
5050
values:
5151
- name: ASPNETCORE_ENVIRONMENT
5252
value: Development
53-
53+
probes:
54+
liveness:
55+
path: /liveness
56+
initialDelaySeconds: 10
57+
periodSeconds: 15
58+
port: 80
59+
readiness:
60+
path: /hc
61+
timeoutSeconds: 5
62+
initialDelaySeconds: 90
63+
periodSeconds: 60
64+
port: 80

‎k8s/helm/apigwms/templates/deployment.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,27 @@ spec:
3636
path: configuration.json
3737
containers:
3838
- name: {{ .Chart.Name }}
39+
{{ if .Values.probes -}}
40+
{{- if .Values.probes.liveness -}}
41+
livenessProbe:
42+
httpGet:
43+
port: {{ .Values.probes.liveness.port }}
44+
path: {{ .Values.probes.liveness.path }}
45+
initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
46+
periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
47+
{{- end -}}
48+
{{- end -}}
49+
{{- if .Values.probes -}}
50+
{{- if .Values.probes.readiness }}
51+
readinessProbe:
52+
httpGet:
53+
port: {{ .Values.probes.readiness.port }}
54+
path: {{ .Values.probes.readiness.path }}
55+
initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
56+
periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
57+
timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
58+
{{- end -}}
59+
{{- end }}
3960
image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
4061
imagePullPolicy: {{ .Values.image.pullPolicy }}
4162
volumeMounts:

‎k8s/helm/apigwms/values.yaml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,15 @@ env:
5050
values:
5151
- name: ASPNETCORE_ENVIRONMENT
5252
value: Development
53-
53+
probes:
54+
liveness:
55+
path: /liveness
56+
initialDelaySeconds: 10
57+
periodSeconds: 15
58+
port: 80
59+
readiness:
60+
path: /hc
61+
timeoutSeconds: 5
62+
initialDelaySeconds: 90
63+
periodSeconds: 60
64+
port: 80

‎k8s/helm/apigwwm/templates/deployment.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,27 @@ spec:
3636
path: configuration.json
3737
containers:
3838
- name: {{ .Chart.Name }}
39+
{{ if .Values.probes -}}
40+
{{- if .Values.probes.liveness -}}
41+
livenessProbe:
42+
httpGet:
43+
port: {{ .Values.probes.liveness.port }}
44+
path: {{ .Values.probes.liveness.path }}
45+
initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
46+
periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
47+
{{- end -}}
48+
{{- end -}}
49+
{{- if .Values.probes -}}
50+
{{- if .Values.probes.readiness }}
51+
readinessProbe:
52+
httpGet:
53+
port: {{ .Values.probes.readiness.port }}
54+
path: {{ .Values.probes.readiness.path }}
55+
initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
56+
periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
57+
timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
58+
{{- end -}}
59+
{{- end }}
3960
image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
4061
imagePullPolicy: {{ .Values.image.pullPolicy }}
4162
volumeMounts:

‎k8s/helm/apigwwm/values.yaml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,15 @@ env:
5050
values:
5151
- name: ASPNETCORE_ENVIRONMENT
5252
value: Development
53-
53+
probes:
54+
liveness:
55+
path: /liveness
56+
initialDelaySeconds: 10
57+
periodSeconds: 15
58+
port: 80
59+
readiness:
60+
path: /hc
61+
timeoutSeconds: 5
62+
initialDelaySeconds: 90
63+
periodSeconds: 60
64+
port: 80

‎k8s/helm/apigwws/templates/deployment.yaml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ kind: Deployment
66
metadata:
77
name: {{ template "apigwws.fullname" . }}
88
labels:
9-
ufo: {{ $cfgname}}
109
app: {{ template "apigwws.name" . }}
1110
chart: {{ template "apigwws.chart" . }}
1211
release: {{ .Release.Name }}
@@ -36,6 +35,27 @@ spec:
3635
path: configuration.json
3736
containers:
3837
- name: {{ .Chart.Name }}
38+
{{ if .Values.probes -}}
39+
{{- if .Values.probes.liveness -}}
40+
livenessProbe:
41+
httpGet:
42+
port: {{ .Values.probes.liveness.port }}
43+
path: {{ .Values.probes.liveness.path }}
44+
initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
45+
periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
46+
{{- end -}}
47+
{{- end -}}
48+
{{- if .Values.probes -}}
49+
{{- if .Values.probes.readiness }}
50+
readinessProbe:
51+
httpGet:
52+
port: {{ .Values.probes.readiness.port }}
53+
path: {{ .Values.probes.readiness.path }}
54+
initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
55+
periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
56+
timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
57+
{{- end -}}
58+
{{- end }}
3959
image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
4060
imagePullPolicy: {{ .Values.image.pullPolicy }}
4161
volumeMounts:

‎k8s/helm/apigwws/values.yaml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,15 @@ env:
5050
values:
5151
- name: ASPNETCORE_ENVIRONMENT
5252
value: Development
53-
53+
probes:
54+
liveness:
55+
path: /liveness
56+
initialDelaySeconds: 10
57+
periodSeconds: 15
58+
port: 80
59+
readiness:
60+
path: /hc
61+
timeoutSeconds: 5
62+
initialDelaySeconds: 90
63+
periodSeconds: 60
64+
port: 80

‎k8s/helm/basket-api/templates/deployment.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,27 @@ spec:
2828
{{- end }}
2929
containers:
3030
- name: {{ .Chart.Name }}
31+
{{ if .Values.probes -}}
32+
{{- if .Values.probes.liveness -}}
33+
livenessProbe:
34+
httpGet:
35+
port: {{ .Values.probes.liveness.port }}
36+
path: {{ .Values.probes.liveness.path }}
37+
initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
38+
periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
39+
{{- end -}}
40+
{{- end -}}
41+
{{- if .Values.probes -}}
42+
{{- if .Values.probes.readiness }}
43+
readinessProbe:
44+
httpGet:
45+
port: {{ .Values.probes.readiness.port }}
46+
path: {{ .Values.probes.readiness.path }}
47+
initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
48+
periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
49+
timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
50+
{{- end -}}
51+
{{- end }}
3152
image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}"
3253
imagePullPolicy: {{ .Values.image.pullPolicy }}
3354
env:

0 commit comments

Comments
 (0)