From 607d328d6d772daaec0b50b645eb333aab512779 Mon Sep 17 00:00:00 2001 From: Vladislav Agapov Date: Thu, 29 Oct 2026 17:20:14 +0300 Subject: [PATCH] fix: apply current image values and reserve S3 volume capacity --- Makefile | 2 +- REPORT.md | 2 +- charts/messenger/templates/s3.yaml | 2 +- docs/PLAN.md | 2 +- evidence/current/chart-final.txt | 4 ++++ evidence/current/dev-deploy-retry.txt | 15 +++++++++++++++ evidence/current/dev-deploy-volumes.txt | 15 +++++++++++++++ evidence/current/dev-deploy.txt | 4 ++++ evidence/current/dev-smoke-retry.txt | 3 +++ evidence/current/dev-smoke-volumes.txt | 2 ++ evidence/current/dev-smoke.txt | 3 +++ evidence/current/source.sha256 | 2 +- 12 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 evidence/current/chart-final.txt create mode 100644 evidence/current/dev-deploy-retry.txt create mode 100644 evidence/current/dev-deploy-volumes.txt create mode 100644 evidence/current/dev-smoke-retry.txt create mode 100644 evidence/current/dev-smoke-volumes.txt create mode 100644 evidence/current/dev-smoke.txt diff --git a/Makefile b/Makefile index dc0d82a..f906281 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,6 @@ build-push: docker buildx build --platform linux/amd64 --target runtime --tag $(IMAGE):$(TAG) --metadata-file image-build.json --push . @echo 'Copy containerimage.digest from image-build.json into charts/messenger/values.yaml before deploy.' deploy: chart-check - helm upgrade --install $(RELEASE) charts/messenger --kube-context $(KUBE_CONTEXT) --namespace $(NAMESPACE) --wait --wait-for-jobs --timeout 8m + helm upgrade --install $(RELEASE) --reset-values charts/messenger --kube-context $(KUBE_CONTEXT) --namespace $(NAMESPACE) --wait --wait-for-jobs --timeout 8m test-local: scripts/test-local.sh diff --git a/REPORT.md b/REPORT.md index 8e8b7e5..9aff07e 100644 --- a/REPORT.md +++ b/REPORT.md @@ -83,6 +83,6 @@ Worker отдельно публикует outbox в Streams, получает ## Ограничения и источники -Нет HA broker/PostgreSQL/S3. CPU-декодирование ограничено пикселями и числом worker, но Go decode не поддерживает прерывание посреди каждой операции; внешнему процессу WebP передан deadline, Pod имеет memory limit. Потеря диска требует backup, а не retry. Кластерное применение этой версии отдельно не подтверждено. Kubernetes вместо Compose/Swarm требует подтверждения преподавателя. +Нет HA broker/PostgreSQL/S3. CPU-декодирование ограничено пикселями и числом worker, но Go decode не поддерживает прерывание посреди каждой операции; внешнему процессу WebP передан deadline, Pod имеет memory limit. Потеря диска требует backup, а не retry. В dev применён release lab2 revision 43; публичный HTTPS smoke прошёл после исправления лимита SeaweedFS volumes. [Вывод](evidence/current/dev-smoke-volumes.txt). Первые попытки выявили сохранение старых Helm values (исправлено --reset-values) и занятие всех пяти volumes стандартной коллекцией SeaweedFS (лимит увеличен до 32, по 100 MiB, в пределах PVC 5 GiB). [Upgrade](evidence/current/dev-deploy-volumes.txt). Кратковременные ошибки DNS при rollout сохранены в диагностике; успешный smoke не доказывает отсутствие будущих сетевых отказов. Kubernetes вместо Compose/Swarm требует подтверждения преподавателя. Официальные источники: [imaging](https://pkg.go.dev/github.com/disintegration/imaging), [cwebp](https://developers.google.com/speed/webp/docs/cwebp), [Valkey XAUTOCLAIM](https://valkey.io/commands/xautoclaim/). При разработке использовалась помощь ИИ; проверки и ограничения перечислены явно. diff --git a/charts/messenger/templates/s3.yaml b/charts/messenger/templates/s3.yaml index dd8c13f..f015bab 100644 --- a/charts/messenger/templates/s3.yaml +++ b/charts/messenger/templates/s3.yaml @@ -27,7 +27,7 @@ spec: containers: - name: s3 image: {{ .Values.s3.image }} - args: [server, -dir=/data, -s3, -s3.port=9000, -s3.config=/identity/identities.json, -master.volumeSizeLimitMB=100, -volume.max=5] + args: [server, -dir=/data, -s3, -s3.port=9000, -s3.config=/identity/identities.json, -master.volumeSizeLimitMB=100, -volume.max=32] ports: [{containerPort: 9000}] readinessProbe: tcpSocket: {port: 9000} diff --git a/docs/PLAN.md b/docs/PLAN.md index 596b14a..563f7ea 100644 --- a/docs/PLAN.md +++ b/docs/PLAN.md @@ -4,5 +4,5 @@ 2. L5-03/04: отдельный worker, три варианта, bounded retry/replay/retention — выполнено. 3. L5-05: versioning/fencing и автоматическая fault matrix — выполнено; типы инъекций и ограничения в REPORT. 4. L5-06: HTTP, Helm, публичные smoke/failover/persistence, остановленный worker + полный restart, race, lint, покрытие каждого файла ≥90% — проверено локально. -5. Образ подготовлен к публикации; применение именно lab5 в dev не подтверждено. Удалённый CI не проверен. +5. Образ опубликован; dev release lab2 revision 43 применён, HTTPS smoke прошёл. Удалённый CI не проверен. 6. Commit/push main и описание PR — завершающий шаг; оценка зависит от проверки преподавателем. diff --git a/evidence/current/chart-final.txt b/evidence/current/chart-final.txt new file mode 100644 index 0000000..da8e6a6 --- /dev/null +++ b/evidence/current/chart-final.txt @@ -0,0 +1,4 @@ +==> Linting charts/messenger +[INFO] Chart.yaml: icon is recommended + +1 chart(s) linted, 0 chart(s) failed diff --git a/evidence/current/dev-deploy-retry.txt b/evidence/current/dev-deploy-retry.txt new file mode 100644 index 0000000..6d683d3 --- /dev/null +++ b/evidence/current/dev-deploy-retry.txt @@ -0,0 +1,15 @@ +helm lint charts/messenger +==> Linting charts/messenger +[INFO] Chart.yaml: icon is recommended + +1 chart(s) linted, 0 chart(s) failed +helm template lab2 charts/messenger >/dev/null +helm upgrade --install lab2 --reset-values charts/messenger --kube-context dev --namespace highload-applications --wait --wait-for-jobs --timeout 8m +Release "lab2" has been upgraded. Happy Helming! +NAME: lab2 +LAST DEPLOYED: Thu Oct 29 16:59:12 2026 +NAMESPACE: highload-applications +STATUS: deployed +REVISION: 42 +DESCRIPTION: Upgrade complete +TEST SUITE: None diff --git a/evidence/current/dev-deploy-volumes.txt b/evidence/current/dev-deploy-volumes.txt new file mode 100644 index 0000000..c399254 --- /dev/null +++ b/evidence/current/dev-deploy-volumes.txt @@ -0,0 +1,15 @@ +helm lint charts/messenger +==> Linting charts/messenger +[INFO] Chart.yaml: icon is recommended + +1 chart(s) linted, 0 chart(s) failed +helm template lab2 charts/messenger >/dev/null +helm upgrade --install lab2 --reset-values charts/messenger --kube-context dev --namespace highload-applications --wait --wait-for-jobs --timeout 8m +Release "lab2" has been upgraded. Happy Helming! +NAME: lab2 +LAST DEPLOYED: Thu Oct 29 17:15:29 2026 +NAMESPACE: highload-applications +STATUS: deployed +REVISION: 43 +DESCRIPTION: Upgrade complete +TEST SUITE: None diff --git a/evidence/current/dev-deploy.txt b/evidence/current/dev-deploy.txt index e1bbccf..e29c0ed 100644 --- a/evidence/current/dev-deploy.txt +++ b/evidence/current/dev-deploy.txt @@ -5,3 +5,7 @@ helm lint charts/messenger 1 chart(s) linted, 0 chart(s) failed helm template lab2 charts/messenger >/dev/null helm upgrade --install lab2 charts/messenger --kube-context dev --namespace highload-applications --wait --wait-for-jobs --timeout 8m +Release lab2 has been cancelled. +level=WARN msg="upgrade failed" name=lab2 error="context canceled" +Error: UPGRADE FAILED: context canceled +make: *** [deploy] Error 1 diff --git a/evidence/current/dev-smoke-retry.txt b/evidence/current/dev-smoke-retry.txt new file mode 100644 index 0000000..54d485f --- /dev/null +++ b/evidence/current/dev-smoke-retry.txt @@ -0,0 +1,3 @@ +python3 tests/smoke.py --base-url "https://hl.agapov.space" +FAIL: POST /api/v1/chats/668e71bb-cc33-44b8-950c-a5c758118172/attachments: expected [202], received 503 +make: *** [test] Error 1 diff --git a/evidence/current/dev-smoke-volumes.txt b/evidence/current/dev-smoke-volumes.txt new file mode 100644 index 0000000..384aeb7 --- /dev/null +++ b/evidence/current/dev-smoke-volumes.txt @@ -0,0 +1,2 @@ +python3 tests/smoke.py --base-url "https://hl.agapov.space" +PASS: lab5 public API scenario; infrastructure and grading evidence remain separate. diff --git a/evidence/current/dev-smoke.txt b/evidence/current/dev-smoke.txt new file mode 100644 index 0000000..a96c890 --- /dev/null +++ b/evidence/current/dev-smoke.txt @@ -0,0 +1,3 @@ +python3 tests/smoke.py --base-url "https://hl.agapov.space" +FAIL: POST /api/v1/chats/43ce1ae5-f9ae-42f1-9120-caa961a3f102/attachments: expected [202], received 503 +make: *** [test] Error 1 diff --git a/evidence/current/source.sha256 b/evidence/current/source.sha256 index 5e46284..d71d037 100644 --- a/evidence/current/source.sha256 +++ b/evidence/current/source.sha256 @@ -173,7 +173,7 @@ a5aba49edfb383bd892865349bbc9749769a61b0cc703374948b923a85fc650c charts/messeng 7dc488f92544b0d7a4bf1d6abcb807eb01ed8c41100983671752c630ff0626a0 charts/messenger/templates/network-policy.yaml a4fa258f575e01fba40dd0616d37e3defb43b84b5c83949420543621ac70af74 charts/messenger/templates/hpa.yaml 0fc92783f1a210eb5af8cf55ee531a8a474429e65fb37033d17b16f45f515658 charts/messenger/templates/postgres.yaml -0107fe18355448e60b819986d35bbe5f1816617265719d5be9f6616b3a1504f6 charts/messenger/templates/s3.yaml +58c4bb123e997054313db6b9044ba9f4f3659174c4dbaee4bb614364a8c8b846 charts/messenger/templates/s3.yaml 3ae360e746fba7cc0f17d8c64972cc5ba1caf4b747cc0805515c0ea660bdfabf charts/messenger/templates/_helpers.tpl 9e64fabb33291e5bfc55cc4f40e4e3ee3651e7d3151ca69b7c05e93165b63545 charts/messenger/templates/valkey.yaml 3b917fc87b39bab6d15a5e9d7877bb0771e2c052cb2b90409ed38010f2739814 charts/messenger/templates/load.yaml