Rafael f2f65285de resolve: merge conflicts with beta branch ...

- Resolve ingress.yaml timeout annotation conflicts by keeping both configurations
- Resolve stg.yaml conflicts by merging affinity/resources config with restricted_ip
- Fix chart references in unimed-maestro and private-maestro sections
- Update all chart paths from ../maestro to ../helm-chart for consistency

This merge brings in the latest beta changes while preserving our Oracle migration
and affinity standardization configuration.

2025-07-09 13:00:52 -03:00

..

prd.yaml

resolve: merge conflicts with beta branch

2025-07-09 13:00:52 -03:00

stg.yaml

resolve: merge conflicts with beta branch

2025-07-09 13:00:52 -03:00