diff --git a/apps/django/base/django-configmap.yaml b/apps/django/base/django-configmap.yaml index 9b7db5d..77ca238 100644 --- a/apps/django/base/django-configmap.yaml +++ b/apps/django/base/django-configmap.yaml @@ -296,6 +296,11 @@ data: "name": "Запросы", "uri": "/rfi" }, + { + "name": "Управление проектами", + "uri": "/management/projects" + }, + # { # "name": "Обзор", # "uri": "/projects" diff --git a/apps/django/base/nginx-configmap.yaml b/apps/django/base/nginx-configmap.yaml index e26a353..cf4eed8 100644 --- a/apps/django/base/nginx-configmap.yaml +++ b/apps/django/base/nginx-configmap.yaml @@ -62,11 +62,11 @@ data: if_modified_since off; expires off; } - # location ~^/api/pm/ { - # #rewrite /api/(.+) /$1 break; - # proxy_set_header Host $host; - # proxy_pass http://backend-svc.pm.svc.cluster.local:8000; - # } + location ~^/api/pm/ { + #rewrite /api/(.+) /$1 break; + proxy_set_header Host $host; + proxy_pass http://backend-svc.pm.svc.cluster.local:8000; + } # location ~^/api/v1/documents/ { # #rewrite /api/(.+) /$1 break; diff --git a/apps/pm/base/backend.yaml b/apps/pm/base/backend.yaml index 6f8576a..1a98551 100644 --- a/apps/pm/base/backend.yaml +++ b/apps/pm/base/backend.yaml @@ -42,7 +42,7 @@ spec: image: name: - _default: cr.yandex/crp3ccidau046kdj8g9q/pm-backend:production_0843a55d + _default: cr.yandex/crp3ccidau046kdj8g9q/pm-backend:production_a889f6a3 pullPolicy: _default: IfNotPresent diff --git a/apps/pm/base/celery.yaml b/apps/pm/base/celery.yaml index 8b94b02..b04f8a7 100644 --- a/apps/pm/base/celery.yaml +++ b/apps/pm/base/celery.yaml @@ -42,7 +42,7 @@ spec: image: name: - _default: cr.yandex/crp3ccidau046kdj8g9q/pm-backend:production_0843a55d + _default: cr.yandex/crp3ccidau046kdj8g9q/pm-backend:production_a889f6a3 pullPolicy: _default: IfNotPresent diff --git a/apps/pm/base/frontend.yaml b/apps/pm/base/frontend.yaml new file mode 100644 index 0000000..d52e7d9 --- /dev/null +++ b/apps/pm/base/frontend.yaml @@ -0,0 +1,90 @@ +--- +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: frontend + namespace: pm + +spec: + interval: 10m + + chart: + spec: + chart: universal-chart + version: "0.1.9" + sourceRef: + kind: HelmRepository + name: yc-oci-charts + namespace: flux-system + interval: 10m + + install: + remediation: + retries: 3 + + upgrade: + remediation: + retries: 3 + + values: + global: + env: _default + + services: + frontend: + enabled: true + + image: + name: + _default: cr.yandex/crp3ccidau046kdj8g9q/pm-frontend:contour_e5c3d387 + pullPolicy: + _default: IfNotPresent + + deployment: + enabled: true + + name: + _default: frontend + + replicaCount: + _default: 1 + + port: + _default: 80 + + resources: + requests: + cpu: + _default: 25m + memory: + _default: 100Mi + + probes: + liveness: + enabled: false + readiness: + enabled: false + + service: + enabled: true + + name: + _default: frontend-svc + + type: + _default: ClusterIP + + port: + _default: 80 + + targetPort: + _default: 80 + + portName: + _default: http + + imagePullSecrets: + enabled: + _default: true + name: + _default: regcred diff --git a/apps/pm/base/kustomization.yaml b/apps/pm/base/kustomization.yaml index f16efbf..aa00f14 100644 --- a/apps/pm/base/kustomization.yaml +++ b/apps/pm/base/kustomization.yaml @@ -6,4 +6,5 @@ resources: - namespace.yaml - backend.yaml - celery.yaml + - frontend.yaml - backend-configmap.yaml diff --git a/infrastructure/istio-config/d8-ugmk-prod/istio-config.yaml b/infrastructure/istio-config/d8-ugmk-prod/istio-config.yaml index d55ebe3..a689651 100644 --- a/infrastructure/istio-config/d8-ugmk-prod/istio-config.yaml +++ b/infrastructure/istio-config/d8-ugmk-prod/istio-config.yaml @@ -158,6 +158,24 @@ spec: rewrite: /api/ service: backend-svc.rfi.svc.cluster.local port: 80 + pm: + name: pm-virt-service + namespace: default + hosts: + - sarex.uralmine.com + gateways: + - default/platform-gateway + routes: + - path: + prefix: /pm/api/ + rewrite: /api/ + service: backend-svc.pm.svc.cluster.local + port: 8000 + - path: + prefix: /pm/ + rewrite: / + service: frontend-svc.pm.svc.cluster.local + port: 80 documentations-api: name: documentations-api-virt-service namespace: default