Skip to content

improved probes and graceful shutdown for storefront #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
henzigo wants to merge 1 commit into
base: jg/rabbitmq-probes
Choose a base branch
from
Open

improved probes and graceful shutdown for storefront #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions UPGRADE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

## Upgrade from v5.0.0 to v5.1.0

- improved probes and graceful shutdown for storefront ([#76](https://github.com/shopsys/deployment/pull/76))
- added probes for RabbitMQ with graceful shutdown ([#75](https://github.com/shopsys/deployment/pull/75))
- changed container order for Redis ([#74](https://github.com/shopsys/deployment/pull/74))
- cache warmup is now run as an init container instead of a `postStart` lifecycle hook ([#73](https://github.com/shopsys/deployment/pull/73))
Expand Down
23 changes: 14 additions & 9 deletions kubernetes/deployments/storefront.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,29 +39,34 @@ spec:
lifecycle:
preStop:
exec:
command:
- sleep
- '10'
command: ["/bin/sh","-lc","sleep 10"]
resources:
limits:
memory: "1.5Gi"
requests:
cpu: "500m"
memory: "800Mi"
startupProbe:
httpGet:
path: /api/health
port: 3000
periodSeconds: 2
timeoutSeconds: 2
failureThreshold: 60
livenessProbe:
httpGet:
path: /api/health
port: 3000
initialDelaySeconds: 30
periodSeconds: 5
timeoutSeconds: 5
periodSeconds: 10
timeoutSeconds: 2
failureThreshold: 3
readinessProbe:
httpGet:
path: /api/health
port: 3000
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 5
periodSeconds: 3
timeoutSeconds: 2
failureThreshold: 1
terminationGracePeriodSeconds: 60
imagePullSecrets:
- name: dockerregistry
24 changes: 16 additions & 8 deletions tests/scenarios/basic-production/expected/webserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,33 +620,41 @@ spec:
preStop:
exec:
command:
- sleep
- "10"
- /bin/sh
- -lc
- sleep 10
livenessProbe:
failureThreshold: 3
httpGet:
path: /api/health
port: 3000
initialDelaySeconds: 30
periodSeconds: 5
timeoutSeconds: 5
periodSeconds: 10
timeoutSeconds: 2
name: storefront
ports:
- containerPort: 3000
name: storefront
protocol: TCP
readinessProbe:
failureThreshold: 1
httpGet:
path: /api/health
port: 3000
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 5
periodSeconds: 3
timeoutSeconds: 2
resources:
limits:
memory: 1.5Gi
requests:
cpu: 500m
memory: 800Mi
startupProbe:
failureThreshold: 60
httpGet:
path: /api/health
port: 3000
periodSeconds: 2
timeoutSeconds: 2
imagePullSecrets:
- name: dockerregistry
terminationGracePeriodSeconds: 60
Expand Down
24 changes: 16 additions & 8 deletions tests/scenarios/development-single-domain/expected/webserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,33 +614,41 @@ spec:
preStop:
exec:
command:
- sleep
- "10"
- /bin/sh
- -lc
- sleep 10
livenessProbe:
failureThreshold: 3
httpGet:
path: /api/health
port: 3000
initialDelaySeconds: 30
periodSeconds: 5
timeoutSeconds: 5
periodSeconds: 10
timeoutSeconds: 2
name: storefront
ports:
- containerPort: 3000
name: storefront
protocol: TCP
readinessProbe:
failureThreshold: 1
httpGet:
path: /api/health
port: 3000
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 5
periodSeconds: 3
timeoutSeconds: 2
resources:
limits:
memory: 1.5Gi
requests:
cpu: 500m
memory: 800Mi
startupProbe:
failureThreshold: 60
httpGet:
path: /api/health
port: 3000
periodSeconds: 2
timeoutSeconds: 2
imagePullSecrets:
- name: dockerregistry
terminationGracePeriodSeconds: 60
Expand Down
24 changes: 16 additions & 8 deletions tests/scenarios/escaping-env/expected/webserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,33 +625,41 @@ spec:
preStop:
exec:
command:
- sleep
- "10"
- /bin/sh
- -lc
- sleep 10
livenessProbe:
failureThreshold: 3
httpGet:
path: /api/health
port: 3000
initialDelaySeconds: 30
periodSeconds: 5
timeoutSeconds: 5
periodSeconds: 10
timeoutSeconds: 2
name: storefront
ports:
- containerPort: 3000
name: storefront
protocol: TCP
readinessProbe:
failureThreshold: 1
httpGet:
path: /api/health
port: 3000
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 5
periodSeconds: 3
timeoutSeconds: 2
resources:
limits:
memory: 1.5Gi
requests:
cpu: 500m
memory: 800Mi
startupProbe:
failureThreshold: 60
httpGet:
path: /api/health
port: 3000
periodSeconds: 2
timeoutSeconds: 2
imagePullSecrets:
- name: dockerregistry
terminationGracePeriodSeconds: 60
Expand Down
24 changes: 16 additions & 8 deletions tests/scenarios/production-with-cloudflare/expected/webserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,33 +621,41 @@ spec:
preStop:
exec:
command:
- sleep
- "10"
- /bin/sh
- -lc
- sleep 10
livenessProbe:
failureThreshold: 3
httpGet:
path: /api/health
port: 3000
initialDelaySeconds: 30
periodSeconds: 5
timeoutSeconds: 5
periodSeconds: 10
timeoutSeconds: 2
name: storefront
ports:
- containerPort: 3000
name: storefront
protocol: TCP
readinessProbe:
failureThreshold: 1
httpGet:
path: /api/health
port: 3000
initialDelaySeconds: 5
periodSeconds: 5
timeoutSeconds: 5
periodSeconds: 3
timeoutSeconds: 2
resources:
limits:
memory: 1.5Gi
requests:
cpu: 500m
memory: 800Mi
startupProbe:
failureThreshold: 60
httpGet:
path: /api/health
port: 3000
periodSeconds: 2
timeoutSeconds: 2
imagePullSecrets:
- name: dockerregistry
terminationGracePeriodSeconds: 60
Expand Down