⚠️ Sync upstream/integration (4abf058) -> main 2026-07-08 (deployment changes present)#439
Merged
Conversation
## Description Diworker: make csv_rewrite_days configurable ## Related issue number OSN-1519 ## Special notes <!-- Please provide additional information if required. --> ## Checklist * [ ] The pull request title is a good summary of the changes * [ ] Unit tests for the changes exist * [ ] New and existing unit tests pass locally
## Description Fixed images build ## Related issue number OSN-1528 ## Special notes <!-- Please provide additional information if required. --> ## Checklist * [ ] The pull request title is a good summary of the changes * [ ] Unit tests for the changes exist * [ ] New and existing unit tests pass locally
### Add Docker Compose deployment for OptScale #### Summary - Added a complete Docker Compose deployment stack that mirrors the Kubernetes Helm chart, enabling local evaluation and development without a K8s cluster. Includes two deployment variants: a default mode pulling ~40 separate per-service images, and a unified image mode that builds all first-party services into a single optscale_app Docker image selectable at runtime via OPTSCALE_MODE. - Introduced a multi-stage Dockerfile and mode-dispatching entrypoint.sh for the unified image, covering 60+ service modes (APIs, workers, schedulers, executors, maintenance jobs, and Node.js frontends). - Add all supporting infrastructure: nginx edge proxy config, etcd bootstrap config, Thanos object-store config, .env.example with documented defaults, pull.sh for rate-limit-safe image pulls, build-unified.sh for the unified image, and a comprehensive README.md. #### Motivation The existing Kubernetes/Helm deployment has a high barrier to entry for evaluation and development. Docker Compose provides a single-machine alternative with docker compose up -d. The unified image variant further reduces friction by consolidating ~40 application images into one, avoiding Docker Hub rate limits and simplifying air-gapped deployments. #### Architecture The stack is organized in layers: - Data plane — etcd, MariaDB, MongoDB, RabbitMQ, Redis, InfluxDB, ClickHouse, MinIO - Metrics — Thanos receive, store gateway, and query (backed by MinIO) - Application — all API services, workers, executors, and Node.js frontends - Cron-style schedulers — while true; sleep N loops approximating K8s CronJobs - Bootstrap — one-shot configurator that seeds etcd, creates databases, sets up queues A depends_on graph ensures correct startup ordering: datastores → configurator → API services → periodic schedulers. ### Excluded from scope - ELK stack, OpenTelemetry/Tempo, Grafana (not needed for evaluation) - Thanos compactor/web - Stripe-gated services (subsyncer, bailiff)
## Description <!-- Please give a summary of the changes. --> ## Related issue number <!-- Please link a pull request to an issue by using "fixes #10" style references to close the issue when this PR is merged. --> ## Special notes <!-- Please provide additional information if required. --> ## Checklist * [ ] The pull request title is a good summary of the changes * [ ] Unit tests for the changes exist * [ ] New and existing unit tests pass locally
* MPT-22777 Remove deprecated library msrest * Fix get_raw_usage types mismatch
antoniodimariano
approved these changes
Jul 8, 2026
michal-zielonka
approved these changes
Jul 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR syncs the latest changes from upstream to main.