Merge remote-tracking branch 'origin/master'

infrastructure/superset/d8-ugmk-prod/superset.yaml

@@ -6,13 +6,26 @@ metadata:
 spec:
   interval: 5m
   timeout: 20m
+  chart:
+    spec:
+      chart: superset-contour
+      version: "0.13.4"
   values:
+    global:
+      imagePullSecrets:
+        - regcred
     fullnameOverride: superset
     serviceAccount:
       create: true
     serviceAccountName: superset
     imagePullSecrets:
       - name: regcred
+    image:
+      repository: cr.yandex/crp3ccidau046kdj8g9q/contour/superset/superset
+      tag: 4.1.1
+    initImage:
+      repository: cr.yandex/crp3ccidau046kdj8g9q/contour/superset/superset
+      tag: dockerize
     vault:
       enabled: true
       role: superset
@@ -68,8 +81,8 @@ spec:
     redis:
       enabled: true
       image:
-        registry: docker.io
-        repository: bitnamilegacy/redis
+        registry: cr.yandex
+        repository: crp3ccidau046kdj8g9q/contour/superset/redis
         tag: 7.0.10-debian-11-r4
       architecture: standalone
       auth:

infrastructure/trino/d8-ugmk-prod/trino.yaml

@@ -6,12 +6,20 @@ metadata:
 spec:
   interval: 5m
   timeout: 20m
+  chart:
+    spec:
+      chart: trino-contour
+      version: "0.33.1"
   values:
     nameOverride: trino
     coordinatorNameOverride: trino-coordinator
     workerNameOverride: trino-worker
     imagePullSecrets:
       - name: regcred
+    image:
+      registry: cr.yandex
+      repository: crp3ccidau046kdj8g9q/contour/trino/trino
+      tag: "432"
     serviceAccount:
       create: true
       name: trino
@@ -83,6 +91,12 @@ spec:
         connection-user=${ENV:TRINO_POSTGRES_USER}
         connection-password=${ENV:TRINO_POSTGRES_PASSWORD}
         postgresql.array-mapping=AS_JSON
+      resources_db: |
+        connector.name=postgresql
+        connection-url=jdbc:postgresql://${ENV:TRINO_POSTGRES_HOST}:${ENV:TRINO_POSTGRES_PORT}/resources_db?sslmode=disable
+        connection-user=${ENV:TRINO_POSTGRES_USER}
+        connection-password=${ENV:TRINO_POSTGRES_PASSWORD}
+        postgresql.array-mapping=AS_JSON
       pm_db: |
         connector.name=postgresql
         connection-url=jdbc:postgresql://${ENV:TRINO_POSTGRES_HOST}:${ENV:TRINO_POSTGRES_PORT}/pm_db?sslmode=disable
@@ -107,6 +121,12 @@ spec:
         connection-user=${ENV:TRINO_POSTGRES_USER}
         connection-password=${ENV:TRINO_POSTGRES_PASSWORD}
         postgresql.array-mapping=AS_JSON
+      clickhouse_db: |
+        connector.name=tpch
+        tpch.splits-per-node=4
+      hive: |
+        connector.name=tpch
+        tpch.splits-per-node=4
     coordinator:
       jvm:
         maxHeapSize: 6G
@@ -121,6 +141,8 @@ spec:
           memory: 6Gi
         limits:
           memory: 8Gi
+      nodeSelector: null
+      tolerations: []
     worker:
       jvm:
         maxHeapSize: 24G
@@ -135,3 +157,10 @@ spec:
           memory: 24Gi
         limits:
           memory: 32Gi
+      nodeSelector:
+        kubernetes.io/hostname: um-sarex-k8s-worker-04
+      tolerations:
+        - key: dedicated.processing
+          operator: Equal
+          value: processing
+          effect: NoExecute