Compare commits

...

11 Commits
aero ... master

Author SHA1 Message Date
ivan
8a0eee6538 ++ 2026-08-03 20:41:38 +05:00
ivan
f8a16fe423 ++ 2026-08-03 16:32:47 +05:00
ivan
48ec94afc9 ++ 2026-08-03 16:05:21 +05:00
ivan
30f669ed14 ++ 2026-08-03 15:59:05 +05:00
ivan
f55f25479a ++ 2026-08-03 15:46:41 +05:00
ivan
55c9f573c3 ++ 2026-08-03 15:30:37 +05:00
ivan
0dbe5dd0ac ++ 2026-08-03 14:57:06 +05:00
ivan
b84811a5b2 ++ 2026-08-03 14:52:09 +05:00
ivan
3b1878ca59 ++ 2026-08-03 14:48:27 +05:00
ivan
9c5dd7c860 ++ 2026-08-03 14:32:07 +05:00
ivan
bf5b04ace7 ++ 2026-08-03 14:27:22 +05:00
16 changed files with 112 additions and 36 deletions

View File

@ -42,7 +42,7 @@ spec:
image:
name:
_default: cr.yandex/crp3ccidau046kdj8g9q/bim-api:contour_f9f2a39
_default: cr.yandex/crp3ccidau046kdj8g9q/bim-api:contour_f9f2a39-dirty
pullPolicy:
_default: IfNotPresent

View File

@ -144,7 +144,7 @@ spec:
_default: sarex.contour.infra.sarex.tech
- name: DOCUMENTATION_URL
value:
_default: http://documentations-api.documentations.svc.cluster.local:80/
_default: http://backend-api-svc.documentations.svc.cluster.local:80/
- name: WORKFLOW_URL
value:
_default: http://backend-svc.processing.svc.cluster.local:80/

View File

@ -102,6 +102,23 @@ spec:
name:
_default: regcred
volumes:
_default:
- name: iam-zitadel-org-rules
mountPath:
_default: /config/zitadel/org-rules-prod.json
subPath:
_default: org-rules-prod.json
readOnly:
_default: true
configMap:
name:
_default: iam-zitadel-org-rules
items:
- key: org-rules-prod.json
path:
_default: org-rules-prod.json
labels:
monitoring: prometheus
@ -132,11 +149,11 @@ spec:
- name: ZITADEL_ENABLED
value:
_default: "false"
_default: "true"
- name: ZITADEL_HOST
value:
_default: "https://login.sarex.io"
_default: "https://sarex-login.uralmine.com"
- name: ZITADEL_ORG_RULES_FILE
value:
@ -187,10 +204,10 @@ spec:
{{- with secret "secrets/data/apps/iam/postgres" -}}
DB_DSN=postgres://{{ index .Data.data "username" }}:{{ index .Data.data "password" }}@{{ index .Data.data "host" }}:{{ index .Data.data "port" }}/{{ index .Data.data "database" }}
{{- end -}}
vault.hashicorp.com/agent-inject-secret-iam-zitadel: secrets/data/apps/iam/zitadel
vault.hashicorp.com/agent-inject-secret-iam-zitadel: secrets/data/vault/common/django_auth
vault.hashicorp.com/agent-inject-template-iam-zitadel: |-
{{- with secret "secrets/data/apps/iam/zitadel" -}}
ZITADEL_ACCESS_TOKEN={{ index .Data.data "access_token" }}
{{- with secret "secrets/data/vault/common/django_auth" -}}
ZITADEL_ACCESS_TOKEN={{ index .Data.data "django_zitadel_access_token" }}
{{- end -}}
vault.hashicorp.com/agent-inject-secret-iam-kafka: secrets/data/kafka/apps/iam
vault.hashicorp.com/agent-inject-template-iam-kafka: |-

View File

@ -5,3 +5,4 @@ namespace: iam
resources:
- namespace.yaml
- backend.yaml
- zitadel-org-rules-configmap.yaml

View File

@ -0,0 +1,12 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
name: iam-zitadel-org-rules
namespace: iam
data:
org-rules-prod.json: |
{
"default_org_id": "383923292894987370",
"rules": []
}

View File

@ -8,3 +8,5 @@ resources:
- celery.yaml
- frontend.yaml
- production-configmap.yaml
- redis-deployment.yaml
- redis-service.yaml

View File

@ -46,7 +46,7 @@ data:
WORKFLOWS_HOST = "http://workflows-api-service.workflow.svc.cluster.local:8000"
WORKFLOWS_URL = "http://workflows-api-service.workflow.svc.cluster.local:8000"
DOCUMENTATIONS_URL = "http://documentations-api.documentations.svc.cluster.local:8080"
DOCUMENTATIONS_URL = "http://backend-api-svc.documentations.svc.cluster.local:80"
RESOURCES_API_HOST = os.getenv("RESOURCES_API_HOST", default="http://resources-service.resources.svc.cluster:8000")
KAFKA_HOST = "wb-stage-kafka-bootstrap.kafka.svc.cluster.local:9093"
KAFKA_USERNAME = "sarex"

View File

@ -0,0 +1,27 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: redis
namespace: issues
labels:
app: redis
spec:
replicas: 1
selector:
matchLabels:
app: redis
template:
metadata:
labels:
app: redis
spec:
containers:
- name: redis
image: cr.yandex/crp3ccidau046kdj8g9q/redis:latest
imagePullPolicy: Always
ports:
- containerPort: 6379
protocol: TCP
imagePullSecrets:
- name: regcred

View File

@ -0,0 +1,13 @@
---
apiVersion: v1
kind: Service
metadata:
name: redis
namespace: issues
spec:
selector:
app: redis
ports:
- port: 6379
targetPort: 6379
protocol: TCP

View File

@ -42,7 +42,8 @@ spec:
image:
name:
_default: cr.yandex/crp3ccidau046kdj8g9q/workflows-engine:contour_3ef5b462
_default: cr.yandex/crp3ccidau046kdj8g9q/workflows-engine:contour_a03d37da-dirty2
pullPolicy:
_default: IfNotPresent
@ -161,23 +162,25 @@ spec:
- name: INTERNAL_PDM_URL
value:
_default: "http://documentations-api.documentations.svc.cluster.local:8080"
_default: "http://backend-api-svc.documentations.svc.cluster.local:80"
- name: INTERNAL_FILESTREAM_URL
value:
_default: "http://documentations-filestream.documentations.svc.cluster.local:8080"
_default: "http://backend-filestream-svc.documentations.svc.cluster.local:80"
- name: IGNORE_TAINTS_AND_NODE_SELECTOR
value:
_default: "true"
- name: EXTERNAL_PDM_URL
value:
_default: "http://documentations-api.documentations.svc.cluster.local:8080"
_default: "http://backend-api-svc.documentations.svc.cluster.local:80"
- name: EXTERNAL_FILESTREAM_URL
value:
_default: "http://documentations-filestream-service.documentations.svc.cluster.local:8080"
_default: "http://backend-filestream-svc.documentations.svc.cluster.local:80"
- name: RESOURCES_API_INTERNAL_HOST
value:
_default: "http://resources-service.resources.svc.cluster.local:8000"
_default: "http://iam-backend.iam.svc.cluster.local:8000"
- name: ENABLE_SQL_QUERY
value:

View File

@ -165,7 +165,7 @@ spec:
- name: INTERNAL_FILESTREAM_URL
value:
_default: "http://documentations-filestream.documentations.svc.cluster.local:8080"
_default: "http://backend-filestream-svc.documentations.svc.cluster.local:80"
- name: EXTERNAL_PDM_URL
value:

View File

@ -253,7 +253,7 @@ spec:
- name: TRANSMITTAL_SERVICE_DOCUMENTATIONS_REPOSITORY__BASE_URL
value:
_default: "http://documentations-api.documentations.svc.cluster.local:8080"
_default: "http://backend-api-svc.documentations.svc.cluster.local:80"
- name: TRANSMITTAL_SERVICE_DOCUMENTATIONS_REPOSITORY__MAX_CONNECTIONS
value:

View File

@ -238,7 +238,7 @@ spec:
- name: TRANSMITTAL_SERVICE_DOCUMENTATIONS_REPOSITORY__BASE_URL
value:
_default: "http://documentations-api.documentations.svc.cluster.local:8080"
_default: "http://backend-api-svc.documentations.svc.cluster.local:80"
- name: TRANSMITTAL_SERVICE_DOCUMENTATIONS_REPOSITORY__MAX_CONNECTIONS
value:

View File

@ -4,8 +4,9 @@ metadata:
name: sarex-wildcard
namespace: d8-ingress-istio
spec:
commonName: "*.uralmine.com"
commonName: "*.sarex-k8s.uralmine.com"
dnsNames:
- "*.sarex-k8s.uralmine.com"
- "*.uralmine.com"
issuerRef:
group: cert-manager.io

View File

@ -164,15 +164,15 @@ spec:
- name: regcred
identity:
auth:
publicIssuerUrl: "https://sarex-camunda-keycloak.uralmine.com/auth/realms/camunda-platform"
publicIssuerUrl: "https://camunda-keycloak.sarex-k8s.uralmine.com/auth/realms/camunda-platform"
identity:
redirectUrl: "https://sarex-camunda-identity.uralmine.com"
redirectUrl: "https://camunda-identity.sarex-k8s.uralmine.com"
operate:
redirectUrl: "https://sarex-camunda-operate.uralmine.com"
redirectUrl: "https://camunda-operate.sarex-k8s.uralmine.com"
tasklist:
redirectUrl: "https://sarex-camunda-tasklist.uralmine.com"
redirectUrl: "https://camunda-tasklist.sarex-k8s.uralmine.com"
optimize:
redirectUrl: "https://sarex-camunda-optimize.uralmine.com"
redirectUrl: "https://camunda-optimize.sarex-k8s.uralmine.com"
webModeler:
redirectUrl: "https://camunda-web-modeler.contour.infra.sarex.tech"
console:

View File

@ -23,12 +23,12 @@ spec:
- hosts:
- sarex.uralmine.com
- sarex-login.uralmine.com
- sarex-rabbitmq.uralmine.com
- sarex-camunda-keycloak.uralmine.com
- sarex-camunda-identity.uralmine.com
- sarex-camunda-operate.uralmine.com
- sarex-camunda-tasklist.uralmine.com
- sarex-camunda-optimize.uralmine.com
- rabbitmq.sarex-k8s.uralmine.com
- camunda-keycloak.sarex-k8s.uralmine.com
- camunda-identity.sarex-k8s.uralmine.com
- camunda-operate.sarex-k8s.uralmine.com
- camunda-tasklist.sarex-k8s.uralmine.com
- camunda-optimize.sarex-k8s.uralmine.com
tls:
credentialName: istio-ingress-tls
virtualServices:
@ -383,7 +383,7 @@ spec:
camunda-keycloak:
namespace: default
hosts:
- sarex-camunda-keycloak.uralmine.com
- camunda-keycloak.sarex-k8s.uralmine.com
gateways:
- default/platform-gateway
routes:
@ -394,7 +394,7 @@ spec:
camunda-identity:
namespace: default
hosts:
- sarex-camunda-identity.uralmine.com
- camunda-identity.sarex-k8s.uralmine.com
gateways:
- default/platform-gateway
routes:
@ -405,7 +405,7 @@ spec:
camunda-operate:
namespace: default
hosts:
- sarex-camunda-operate.uralmine.com
- camunda-operate.sarex-k8s.uralmine.com
gateways:
- default/platform-gateway
routes:
@ -416,7 +416,7 @@ spec:
camunda-tasklist:
namespace: default
hosts:
- sarex-camunda-tasklist.uralmine.com
- camunda-tasklist.sarex-k8s.uralmine.com
gateways:
- default/platform-gateway
routes:
@ -427,7 +427,7 @@ spec:
camunda-optimize:
namespace: default
hosts:
- sarex-camunda-optimize.uralmine.com
- camunda-optimize.sarex-k8s.uralmine.com
gateways:
- default/platform-gateway
routes:
@ -438,7 +438,7 @@ spec:
rabbitmq:
namespace: default
hosts:
- sarex-rabbitmq.uralmine.com
- rabbitmq.sarex-k8s.uralmine.com
gateways:
- default/platform-gateway
routes: