Compare commits

...

2 Commits

4 changed files with 343 additions and 132 deletions

View File

@ -4,4 +4,6 @@ kind: Kustomization
namespace: django namespace: django
resources: resources:
- frontend.yaml - frontend.yaml
- s3-proxy.yaml
- s3-proxy-bim.yaml
# - namespace.yaml # - namespace.yaml

View File

@ -0,0 +1,104 @@
---
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: s3-proxy-bim
namespace: django
spec:
interval: 5m
timeout: 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:
s3-proxy-bim:
enabled: true
# образ публичный, из Docker Hub — pull-секрет не нужен
image:
name:
_default: pottava/s3-proxy
pullPolicy:
_default: Always
deployment:
enabled: true
name:
_default: s3-proxy-bim
replicaCount:
_default: 2
port:
_default: 80
probes:
liveness:
enabled: false
readiness:
enabled: false
service:
enabled: true
name:
_default: s3-bim-service
type:
_default: ClusterIP
port:
_default: 80
targetPort:
_default: 80
portName:
_default: http
imagePullSecrets:
enabled:
_default: false
envs:
- name: AWS_API_ENDPOINT
value:
_default: "https://storage.yandexcloud.net"
# ключи S3 лежат в Secret/s3-proxy-bim-secret, созданном вне этого релиза
secretEnvs:
- name: AWS_ACCESS_KEY_ID
secretName:
_default: "s3-proxy-bim-secret"
secretKey: "login"
- name: AWS_SECRET_ACCESS_KEY
secretName:
_default: "s3-proxy-bim-secret"
secretKey: "password"
- name: AWS_S3_BUCKET
secretName:
_default: "s3-proxy-bim-secret"
secretKey: "bucket"

View File

@ -0,0 +1,105 @@
---
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: s3-proxy
namespace: django
spec:
interval: 5m
timeout: 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:
s3-proxy:
enabled: true
image:
name:
_default: cr.yandex/crp3ccidau046kdj8g9q/s3-proxy:stable
pullPolicy:
_default: Always
deployment:
enabled: true
name:
_default: s3-proxy
replicaCount:
_default: 2
port:
_default: 80
probes:
liveness:
enabled: false
readiness:
enabled: false
service:
enabled: true
name:
_default: s3-service
type:
_default: ClusterIP
port:
_default: 80
targetPort:
_default: 80
portName:
_default: http
imagePullSecrets:
enabled:
_default: true
name:
_default: dockerhub
envs:
- name: AWS_API_ENDPOINT
value:
_default: "https://storage.yandexcloud.net"
# ключи S3 лежат в Secret/s3-proxy-secret, созданном вне этого релиза
secretEnvs:
- name: AWS_ACCESS_KEY_ID
secretName:
_default: "s3-proxy-secret"
secretKey: "login"
- name: AWS_SECRET_ACCESS_KEY
secretName:
_default: "s3-proxy-secret"
secretKey: "password"
- name: AWS_S3_BUCKET
secretName:
_default: "s3-proxy-secret"
secretKey: "bucket"

View File

@ -225,135 +225,135 @@ spec:
# он должен оставаться последним по порядку сопоставления # он должен оставаться последним по порядку сопоставления
- service: frontend-service.django.svc.cluster.local - service: frontend-service.django.svc.cluster.local
port: 80 port: 80
#
# bim-api-gazpromcps-api-virt-service: bim-api-gazpromcps-api-virt-service:
# namespace: gateway namespace: gateway
# hosts: hosts:
# - aero.invest.sarex.io - aero.invest.sarex.io
# gateways: gateways:
# - gateway/main-gateway - gateway/main-gateway
# cors: cors:
# allowHeaders: allowHeaders:
# - Authorization - Authorization
# - Content-Type - Content-Type
# allowMethods: allowMethods:
# - GET - GET
# - POST - POST
# - PUT - PUT
# - PATCH - PATCH
# - HEAD - HEAD
# - DELETE - DELETE
# routes: routes:
# - path: - path:
# prefix: /bim-gazpromcps/api/ prefix: /bim-gazpromcps/api/
# rewrite: /api/ rewrite: /api/
# service: bim-api-gazpromcps-service.bim.svc.cluster.local service: bim-api-gazpromcps-service.bim.svc.cluster.local
# port: 80 port: 80
# - path: - path:
# prefix: /bim-gazpromcps/files/ prefix: /bim-gazpromcps/files/
# rewrite: /files/ rewrite: /files/
# service: bim-api-gazpromcps-service.bim.svc.cluster.local service: bim-api-gazpromcps-service.bim.svc.cluster.local
# port: 80 port: 80
#
# bim-backend-v2-api-virt-service: bim-backend-v2-api-virt-service:
# namespace: gateway namespace: gateway
# hosts: hosts:
# - aero.invest.sarex.io - aero.invest.sarex.io
# gateways: gateways:
# - gateway/main-gateway - gateway/main-gateway
# cors: cors:
# allowHeaders: allowHeaders:
# - Authorization - Authorization
# - Content-Type - Content-Type
# allowMethods: allowMethods:
# - GET - GET
# - POST - POST
# - PUT - PUT
# - PATCH - PATCH
# - HEAD - HEAD
# - DELETE - DELETE
# routes: routes:
# - path: - path:
# prefix: /bim2-gazpromcps/api/ prefix: /bim2-gazpromcps/api/
# rewrite: /api/ rewrite: /api/
# service: bim-backend-v2-service.bim.svc.cluster.local service: bim-backend-v2-service.bim.svc.cluster.local
# port: 80 port: 80
#
# eav-virt-service: eav-virt-service:
# namespace: gateway namespace: gateway
# hosts: hosts:
# - aero.invest.sarex.io - aero.invest.sarex.io
# gateways: gateways:
# - gateway/main-gateway - gateway/main-gateway
# cors: cors:
# allowHeaders: allowHeaders:
# - Authorization - Authorization
# - Content-Type - Content-Type
# allowMethods: allowMethods:
# - POST - POST
# - GET - GET
# - PATCH - PATCH
# - DELETE - DELETE
# - HEAD - HEAD
# - PUT - PUT
# - OPTIONS - OPTIONS
# routes: routes:
# - path: - path:
# prefix: /eav/api/ prefix: /eav/api/
# rewrite: /api/ rewrite: /api/
# service: eav-service.eav.svc.cluster.local service: eav-service.eav.svc.cluster.local
# port: 8000 port: 8000
# noCors: true noCors: true
# - path: - path:
# prefix: /eav/admin/ prefix: /eav/admin/
# rewrite: /eav/admin/ rewrite: /eav/admin/
# service: eav-service.eav.svc.cluster.local service: eav-service.eav.svc.cluster.local
# port: 8000 port: 8000
#
# api-virt-service: api-virt-service:
# namespace: gateway namespace: gateway
# hosts: hosts:
# - aero.invest.sarex.io - aero.invest.sarex.io
# gateways: gateways:
# - gateway/main-gateway - gateway/main-gateway
# cors: cors:
# allowHeaders: allowHeaders:
# - Authorization - Authorization
# - Content-Type - Content-Type
# allowMethods: allowMethods:
# - GET - GET
# - POST - POST
# - PUT - PUT
# - PATCH - PATCH
# - HEAD - HEAD
# - DELETE - DELETE
# routes: routes:
# - path: - path:
# prefix: /workflows/api/ prefix: /workflows/api/
# rewrite: /api/ rewrite: /api/
# service: workflows-backend-service.processing.svc.cluster.local service: workflows-backend-service.processing.svc.cluster.local
# port: 80 port: 80
#
# projects-frontend-static-virt-service: projects-frontend-static-virt-service:
# namespace: gateway namespace: gateway
# hosts: hosts:
# - aero.invest.sarex.io - aero.invest.sarex.io
# gateways: gateways:
# - gateway/main-gateway - gateway/main-gateway
# cors: cors:
# allowHeaders: allowHeaders:
# - Authorization - Authorization
# - Content-Type - Content-Type
# allowMethods: allowMethods:
# - GET - GET
# - POST - POST
# - PUT - PUT
# - PATCH - PATCH
# - HEAD - HEAD
# - DELETE - DELETE
# routes: routes:
# - path: - path:
# prefix: /projects/static/ prefix: /projects/static/
# rewrite: / rewrite: /
# service: projects-frontend-static-service.projects.svc.cluster.local service: projects-frontend-static-service.projects.svc.cluster.local
# port: 80 port: 80