Refactor yc-ecp configuration: update HelmRelease affinity settings for frontend and re-enable commented Istio routes for main-gateway.
This commit is contained in:
parent
218d233eb7
commit
db0b8988f1
@ -89,18 +89,24 @@ spec:
|
||||
name:
|
||||
_default: dockerhub
|
||||
|
||||
# чарт прогоняет weight, key, operator и topologyKey через pluckEnv,
|
||||
# который читает только map вида {_default: …}; скаляры дают пустые значения
|
||||
affinity:
|
||||
podAntiAffinity:
|
||||
preferredDuringSchedulingIgnoredDuringExecution:
|
||||
- weight: 100
|
||||
- weight:
|
||||
_default: 100
|
||||
podAffinityTerm:
|
||||
labelSelector:
|
||||
matchExpressions:
|
||||
- key: app
|
||||
operator: In
|
||||
- key:
|
||||
_default: app
|
||||
operator:
|
||||
_default: In
|
||||
values:
|
||||
- frontend
|
||||
topologyKey: kubernetes.io/hostname
|
||||
topologyKey:
|
||||
_default: kubernetes.io/hostname
|
||||
|
||||
# ConfigMap'ы nginx-configmap и robots-txt-config создаются вне этого
|
||||
# релиза — чарт только монтирует их
|
||||
|
||||
@ -156,75 +156,75 @@ spec:
|
||||
service: dashboard-kong-proxy.kubernetes-dashboard.svc.cluster.local
|
||||
port: 80
|
||||
|
||||
# # --- aero.invest.sarex.io / main-gateway ---
|
||||
# backend-service-virt-service:
|
||||
# namespace: gateway
|
||||
# hosts:
|
||||
# - aero.invest.sarex.io
|
||||
# gateways:
|
||||
# - gateway/main-gateway
|
||||
# cors:
|
||||
# allowHeaders:
|
||||
# - Authorization
|
||||
# - Content-Type
|
||||
# allowMethods:
|
||||
# - GET
|
||||
# - POST
|
||||
# - PUT
|
||||
# - PATCH
|
||||
# - HEAD
|
||||
# - DELETE
|
||||
# routes:
|
||||
# - path:
|
||||
# prefix: /admin/
|
||||
# service: backend-service.django.svc.cluster.local
|
||||
# port: 8000
|
||||
# - path:
|
||||
# prefix: /api
|
||||
# service: backend-service.django.svc.cluster.local
|
||||
# port: 8000
|
||||
#
|
||||
# s3-proxy-virt-service:
|
||||
# namespace: gateway
|
||||
# hosts:
|
||||
# - aero.invest.sarex.io
|
||||
# gateways:
|
||||
# - gateway/main-gateway
|
||||
# cors:
|
||||
# allowHeaders:
|
||||
# - Authorization
|
||||
# - Content-Type
|
||||
# allowMethods:
|
||||
# - GET
|
||||
# - POST
|
||||
# - PUT
|
||||
# - PATCH
|
||||
# - HEAD
|
||||
# - DELETE
|
||||
# routes:
|
||||
# - path:
|
||||
# prefix: /s3/
|
||||
# rewrite: /
|
||||
# service: s3-bim-service.django.svc.cluster.local
|
||||
# port: 80
|
||||
# - path:
|
||||
# prefix: /media/
|
||||
# rewrite: /
|
||||
# service: s3-service.django.svc.cluster.local
|
||||
# port: 80
|
||||
#
|
||||
# frontend-vs:
|
||||
# namespace: gateway
|
||||
# noCors: true
|
||||
# hosts:
|
||||
# - aero.invest.sarex.io
|
||||
# gateways:
|
||||
# - gateway/main-gateway
|
||||
# routes:
|
||||
# # без path — маршрут без match, catch-all, как в кластере;
|
||||
# # он должен оставаться последним по порядку сопоставления
|
||||
# - service: frontend-service.django.svc.cluster.local
|
||||
# port: 80
|
||||
# --- aero.invest.sarex.io / main-gateway ---
|
||||
backend-service-virt-service:
|
||||
namespace: gateway
|
||||
hosts:
|
||||
- aero.invest.sarex.io
|
||||
gateways:
|
||||
- gateway/main-gateway
|
||||
cors:
|
||||
allowHeaders:
|
||||
- Authorization
|
||||
- Content-Type
|
||||
allowMethods:
|
||||
- GET
|
||||
- POST
|
||||
- PUT
|
||||
- PATCH
|
||||
- HEAD
|
||||
- DELETE
|
||||
routes:
|
||||
- path:
|
||||
prefix: /admin/
|
||||
service: backend-service.django.svc.cluster.local
|
||||
port: 8000
|
||||
- path:
|
||||
prefix: /api
|
||||
service: backend-service.django.svc.cluster.local
|
||||
port: 8000
|
||||
|
||||
s3-proxy-virt-service:
|
||||
namespace: gateway
|
||||
hosts:
|
||||
- aero.invest.sarex.io
|
||||
gateways:
|
||||
- gateway/main-gateway
|
||||
cors:
|
||||
allowHeaders:
|
||||
- Authorization
|
||||
- Content-Type
|
||||
allowMethods:
|
||||
- GET
|
||||
- POST
|
||||
- PUT
|
||||
- PATCH
|
||||
- HEAD
|
||||
- DELETE
|
||||
routes:
|
||||
- path:
|
||||
prefix: /s3/
|
||||
rewrite: /
|
||||
service: s3-bim-service.django.svc.cluster.local
|
||||
port: 80
|
||||
- path:
|
||||
prefix: /media/
|
||||
rewrite: /
|
||||
service: s3-service.django.svc.cluster.local
|
||||
port: 80
|
||||
|
||||
frontend-vs:
|
||||
namespace: gateway
|
||||
noCors: true
|
||||
hosts:
|
||||
- aero.invest.sarex.io
|
||||
gateways:
|
||||
- gateway/main-gateway
|
||||
routes:
|
||||
# без path — маршрут без match, catch-all, как в кластере;
|
||||
# он должен оставаться последним по порядку сопоставления
|
||||
- service: frontend-service.django.svc.cluster.local
|
||||
port: 80
|
||||
#
|
||||
# bim-api-gazpromcps-api-virt-service:
|
||||
# namespace: gateway
|
||||
|
||||
Loading…
Reference in New Issue
Block a user