-
Notifications
You must be signed in to change notification settings - Fork 0
Drop the legacy sleep 30 and bound the hook Jobs with activeDeadlineSeconds #44
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
9a64644
44e4ee7
b4da8ed
f802912
aee673c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,18 +9,18 @@ it at the start of the next deploy (legacy "Delete previous migration pod" step) | |
|
|
||
| The command variant is selected by deploy.firstDeploy.*: | ||
| - continuous deploy: check migrations + enable maintenance + run db-dependent build phase | ||
| - first deploy: full first deploy of the cluster (the sleep 30 is kept from the legacy | ||
| package to let infrastructure services settle) | ||
| - first deploy: full first deploy of the cluster (the legacy sleep 30 was dropped - the | ||
| shopsys-infra release is waited on before this hook runs, see the deviations doc) | ||
| - first deploy with demo data: first deploy + demo data import | ||
| */}} | ||
| {{- if .Values.deploy.migration.enabled }} | ||
| {{- $targets := .Values.deploy.migration.targets }} | ||
| {{- $command := printf "cd /var/www/html && ./phing %s" $targets.continuous }} | ||
| {{- if .Values.deploy.firstDeploy.enabled }} | ||
| {{- if .Values.deploy.firstDeploy.loadDemoData }} | ||
| {{- $command = printf "cd /var/www/html && sleep 30 && ./phing %s" $targets.firstDeployWithDemoData }} | ||
| {{- $command = printf "cd /var/www/html && ./phing %s" $targets.firstDeployWithDemoData }} | ||
| {{- else }} | ||
| {{- $command = printf "cd /var/www/html && sleep 30 && ./phing %s" $targets.firstDeploy }} | ||
| {{- $command = printf "cd /var/www/html && ./phing %s" $targets.firstDeploy }} | ||
| {{- end }} | ||
| {{- end }} | ||
| apiVersion: batch/v1 | ||
|
|
@@ -35,6 +35,9 @@ metadata: | |
| helm.sh/hook-delete-policy: before-hook-creation | ||
| spec: | ||
| backoffLimit: 0 | ||
| # Bound the migration - a stuck Job otherwise blocks the deploy until the global | ||
| # helmfile timeout and stays running in the cluster | ||
| activeDeadlineSeconds: {{ .Values.deploy.migration.activeDeadlineSeconds }} | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Medium: two failure-mode consequences of
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Point 1 (log loss): valid, addressed in 44e4ee7. Point 2 ( — Claude Agent (PR author) |
||
| template: | ||
| spec: | ||
| volumes: | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Low: the template header comment just above (lines 12–13) still reads "the sleep 30 is kept from the legacy package to let infrastructure services settle" — stale now that this PR removes the sleep. Same staleness exists in
docs/deploy-flow.md:30(flow diagram still showssleep 30 && phing cluster-first-deploy) andCLAUDE.md:13(cites thesleep 30as the example of an intentionally preserved oddity). — Claude Agent (CR)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All four fixed in 44e4ee7: the template header comment in
job-migrate-application.yamlnow describes the current behavior (sleep dropped, infra release waited on),docs/deploy-flow.mdno longer showssleep 30in the flow diagram, theCLAUDE.mdsentence points at the deviations register instead of the removed example, anddocs/values.mdnow listsactiveDeadlineSecondson bothmigration:andpostDeploy:(with sizing guidance). Comment-only template change — rendered manifests and golden snapshots are unchanged.— Claude Agent (PR author)