yonote-chart/Chart.lock

@@ -18,7 +18,10 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   version: 11.6.6
 - name: redis
-  repository: https://artifacts.wilix.dev/repository/helm-bitnami
+  repository: https://charts.bitnami.com/bitnami
   version: 16.12.1
-digest: sha256:b235eee18e9704d2eccffe52ea8a37d5431039378ae03ef2e2b738661f2a5711
+- name: minio
-generated: "2024-07-11T17:41:36.715623176+03:00"
+  repository: https://charts.bitnami.com/bitnami
+  version: 14.6.20
+digest: sha256:ac298eab717f006b97255703008f8d675b5e0603afa5b755673455012d6d3693
+generated: "2024-07-16T12:06:23.7878103+03:00"

yonote-chart/Chart.yaml

@@ -1,6 +1,13 @@
 apiVersion: v2
 name: yonote-chart
 version: 1.2.0
+description:
+  Generic application Helm chart.
+  This chart includes multiple dependencies. The base of this chart is derived from the Dynix app chart.
+maintainers:
+  - name: Dysnix
+    email: support@dysnix.com
+    url: https://github.com/dysnix/charts/tree/main/dysnix/app
 
 dependencies:
   - name: app
@@ -39,3 +46,9 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
     condition: yonote-redis.enabled
     alias: yonote-redis
+
+  - name: minio
+    version: "14.6.20"
+    repository: https://charts.bitnami.com/bitnami
+    condition: minio.enabled
+    alias: minio

yonote-chart/secret-values.yaml

@@ -3,19 +3,29 @@ global:
     config:
       secret:
         stringData:
-          AI_API_KEY: 
+          DATABASE_URL: 'postgres://{{ .Values.global.postgresql.auth.username }}:{{ .Values.global.postgresql.auth.password }}@yonote-db:5432/{{ .Values.global.postgresql.auth.database }}'
-          AWS_ACCESS_KEY_ID: 
+          POSTGRES_PASSWORD: wsGZ6kXhr5
-          AWS_SECRET_ACCESS_KEY: 
+          AWS_ACCESS_KEY_ID: ""  # Ваш идентификатор ключа доступа к AWS. Поведение в SelfHosted: устанавливает логин сервис аккаунта для доступа приложения к Minio S3 хранилищу
-          OIDC_CLIENT_SECRET: 
+          AWS_SECRET_ACCESS_KEY: "minioadmin" # Ваш секретный ключ доступа AWS. Поведение в SelfHosted: устанавливает пароль сервис аккаунта для доступа приложения к Minio S3 хранилищу
-          SECRET_KEY: 
+          OIDC_CLIENT_SECRET: "Kdq8rk5Pv5RW1c5kHXpnyfrmMRzI9xSD" 
-          SMTP_PASSWORD: 
+          SECRET_KEY: "659a8881b186198c3146e316f6dab67df25496534d1fa156d624b037260df688" # Сгенерируйте 32-байтовый случайный ключ в шестнадцатеричном коде. Вам следует использовать `openssl rand -hex 32` в вашем терминале для генерации случайного значения.
-          UTILS_SECRET: 
+          SMTP_PASSWORD: "1234"
-          YANDEX_METRIKA_ID: 
+          UTILS_SECRET: "7bd5e9ac4415dd0dbf6b7721e2a21e9427b268cd0140c7516d13dece5024d479" # Сгенерируйте уникальный случайный ключ. Формат не важен, но вы все равно можете использовать`openssl rand -hex 32` в вашем терминале, чтобы создать это.
-          TELEGRAM_BOT_TOKEN: 
+          TELEGRAM_BOT_TOKEN: "1234"
-          UNSPLASH_API_ACCESS_KEY: 
+          UNSPLASH_API_ACCESS_KEY: "a-yGo6HpRP6jNfravx4Bz-oiPrRnH_5-24Xa9ZPlePE" 
-          DATABASE_URL: "" #postgres://<username:password>@<postgresql>:5432/yonote
+          LICENSE_KEY: "" # Обратитесь в отдел продаж для получения
-          REDIS_URL: "" #redis://username:password>@<redis>:6379
+          SERVICE_WORKER_PUBLIC_KEY: "1234" 
-          LICENSE_KEY: ""
+          SERVICE_WORKER_PRIVATE_KEY: "1234"
-          SERVICE_WORKER_PUBLIC_KEY: ""
+          # Генерация ключей (web-push) Service Worker
-          SERVICE_WORKER_PRIVATE_KEY: ""
+          # 1) Установить Node.js и npm 
-          QUOTA_TOKEN:
+          # 2) Выполнить команду для генерации ключей
+          # npx web-push generate-vapid-keys
+          # 3) Полученные значения ввести в .env файл (SERVICE_WORKER_PUBLIC_KEY, SERVICE_WORKER_PRIVATE_KEY)
+          
+  postgresql:
+    auth:         
+      password: "wsGZ6kXhr5"
+      postgresPassword: "QQYw4UjOU"
+
+  
+    

yonote-chart/templates/ingress.yaml

@@ -0,0 +1,34 @@
+{{- if .Values.ingress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ .Values.ingress.name }}
+  namespace: {{ .Values.ingress.namespace }}
+  annotations:
+    {{- range $key, $value := .Values.ingress.annotations }}
+    {{ $key }}: "{{ $value }}"
+    {{- end }}
+spec:
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  tls:
+    - secretName: "{{ .Values.ingress.tls.secretName }}"
+      hosts:
+        {{- range .Values.ingress.tls.hosts }}
+        - "{{ . }}"
+        {{- end }}
+  rules:
+    {{- range .Values.ingress.rules }}
+    - host: "{{ .host }}"
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ .service.name }}
+                port:
+                  number: {{ .service.port | int }}
+          {{- end }}
+    {{- end }}
+{{- end }}

yonote-chart/traefic-http-to-https-redirect-middleware.yaml

@@ -2,7 +2,7 @@
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: redirect-https
+  name: yonote-onprem-redirect-https
 spec:
   redirectScheme:
     scheme: https

yonote-chart/traefik-wss-headers-middleware.yaml

@@ -2,7 +2,7 @@
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
-  name: wss-headers
+  name: yonote-onprem-wss-headers
 spec:
   headers:
     customRequestHeaders:

yonote-chart/values.yaml

@@ -1,59 +1,57 @@
 global:
+  name: yonote-app
   postgresql:
     auth:
       database: yonote
       username: yonote
 
   yonote:
-    ingress:
+    dbMigrationEnv: production-ssl-disabled # Режим подключения к базе данных при выполнении миграций. При использовании SSL подключения, установите значение `production`
-      ingressClassName: traefik
+    baseListenAddress: onprem-test.stands.wilix.dev
-
-    dbMigrationEnv: production-ssl-disabled
-
-    keycloak:
-      hostName: auth.example.com
-      realmName: yonote
-
-    baseListenAddress: example.com 
 
     config:
       plain:
         data:
           DEPLOYMENT: hosted
+          NODE_ENV: production
           FORCE_HTTPS: "false"
-          PGSSLMODE: disable
+          PGSSLMODE: disable # Отключает SSL подключение к базе данных. Уберите эту строку, если вы используете SSL подключение к PostgreSQL
 
-          BIND_HOST: 0.0.0.0
+          BIND_HOST: 0.0.0.0 # Хост по умолчанию
-          PORT: "3000"
+          PORT: "3000" # Порт по умолчанию
 
           REDIS_URL: redis://yonote-redis-master:6379
 
-          DEFAULT_LANGUAGE: ru_RU
+          DEFAULT_LANGUAGE: ru_RU # Язык по умолчанию 
           ENABLE_UPDATES: "false"
           
-          AI_URL: http://engate.wilix.dev:5001
+          AI_URL: "1234"
+          AI_API_KEY: "1234"
+          WEB_CONCURRENCY: "1"
 
-          URL: 'http://app.{{ .Values.global.yonote.baseListenAddress }}'
+          URL: 'https://app.{{ .Values.global.yonote.baseListenAddress }}' # Базовый url приложения
-          COLLABORATION_URL: 'wss://app.{{ .Values.global.yonote.baseListenAddress }}'
+          COLLABORATION_URL: 'wss://app.{{ .Values.global.yonote.baseListenAddress }}' # Cервер, для нормальной работы это не нужно устанавливать
           
           OIDC_DISPLAY_NAME: email
           OIDC_SCOPES: openid email
-          OIDC_CLIENT_ID: yonote
+          OIDC_CLIENT_ID: yonote-local
-          OIDC_AUTH_URI: 'http://{{ .Values.global.yonote.keycloak.hostName }}/realms/{{ .Values.global.yonote.keycloak.realmName }}/protocol/openid-connect/auth'
+          OIDC_AUTH_URI: 'https://auth.yonote.ru/realms/yonote-test/protocol/openid-connect/auth'
-          OIDC_LOGOUT_URI: 'http://{{ .Values.global.yonote.keycloak.hostName }}/realms/{{ .Values.global.yonote.keycloak.realmName }}/protocol/openid-connect/logout'
+          OIDC_LOGOUT_URI: 'https://auth.yonote.ru/realms/yonote-test/protocol/openid-connect/logout'
-          OIDC_TOKEN_URI: 'http://{{ .Values.global.yonote.keycloak.hostName }}/realms/{{ .Values.global.yonote.keycloak.realmName }}/protocol/openid-connect/token'
+          OIDC_TOKEN_URI: 'https://auth.yonote.ru/realms/yonote-test/protocol/openid-connect/token'
-          OIDC_USERINFO_URI: 'http://{{ .Values.global.yonote.keycloak.hostName }}/realms/{{ .Values.global.yonote.keycloak.realmName }}/protocol/openid-connect/userinfo'
+          OIDC_USERINFO_URI: 'https://auth.yonote.ru/realms/yonote-test/protocol/openid-connect/userinfo'
           
           AWS_S3_ACL: private
-          AWS_S3_UPLOAD_BUCKET_URL: example-url-s3
+          AWS_S3_UPLOAD_BUCKET_URL: yonote-minio:9000 # Адрес S3 хранилища
-          AWS_S3_UPLOAD_BUCKET_NAME: yonote-bucket
+          AWS_S3_UPLOAD_BUCKET_NAME: yonote-bucket # Имя хранилища 
           AWS_REGION: ""
-          AWS_S3_UPLOAD_MAX_SIZE: "226214400"
+          AWS_S3_UPLOAD_MAX_SIZE: "226214400" # Максимальный размер хранилища
-          AWS_S3_FORCE_PATH_STYLE: "false"
+          AWS_S3_FORCE_PATH_STYLE: "false" # Следует ли принудительно использовать URL-адреса стиля пути для объектов S3
+          S3_PROXY_ENABLED: "false" # Включает или выключает проксирование загрузки/выгрузки файлов на S3 через бэкенд, принимает boolean
+          S3_MULTIPART_PART_SIZE: "1000" # Настройка размера частей для multipart загрузки на S3 хранилище, принимает число, по умолчанию 1000 (1GB), значение в мегабайтах.
 
-          SUBDOMAINS_ENABLED: "true"
+          SUBDOMAINS_ENABLED: "true" # Поддержка поддоменов для команд
-          BASENAME_FOR_SUBDOMAIN: '{{ .Values.global.yonote.baseListenAddress }}'
+          BASENAME_FOR_SUBDOMAIN: '{{ .Values.global.yonote.baseListenAddress }}' # Имя хоста
-          NOT_ALLOWED_SUBDOMAINS: app,collaboration,auth,api,dev,docs,doc,admin,test,quota,billing,i,storage,host,updates
+          NOT_ALLOWED_SUBDOMAINS: app,collaboration,auth,api,dev,docs,doc,admin,test,quota,billing,i,storage,host,updates # Запрещенные поддомены
 
           TELEGRAM_API_URL: https://api.telegram.org
 
@@ -69,10 +67,6 @@ global:
           SMTP_SECURE: "" # connection will be upgraded: https://nodemailer.com/smtp/
           SMTP_REQUIRE_TLS: ""
 
-      secret:
-        stringData:
-          DATABASE_URL: 'postgres://{{ .Values.global.postgresql.auth.username }}:{{ .Values.global.postgresql.auth.password }}@yonote-db/{{ .Values.global.postgresql.auth.database }}'
-
   yonote_cron_calendar_events:
     cron_enabled: "true"
     url: http://yonote-web/api/cron.calendar_events
@@ -81,7 +75,103 @@ global:
     cron_enabled: "true"
     url: http://yonote-web/api/cron.schedule
 
-name: yonote
+  # ingress:
+  #   enabled: true
+  #   hostname: 'app.onprem-test.stands.wilix.dev'
+  #   ingressClassName: traefik
+  #   path: '/'
+  #   pathType: Prefix
+  #   annotations:
+  #     cert-manager.io/cluster-issuer: letsencrypt.rancher.wilix.dev
+  #     # nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
+  #     # nginx.ingress.kubernetes.io/configuration-snippet: |
+  #     #   more_set_headers "Host              $http_host";
+  #     #   more_set_headers "X-Real-IP         $remote_addr";
+  #     #   more_set_headers "X-Forwarded-Proto $scheme";
+  #     #   more_set_headers "X-Forwarded-For   $proxy_add_x_forwarded_for"; 
+
+ingress:
+  enabled: true
+  name: yonote-ingress
+  namespace: yonote-onprem
+  ingressClassName: traefik
+  # hostname: "*.onprem-test.stands.wilix.dev"
+  tls:
+    secretName: "wildcard.onprem-test.stands.wilix.dev"
+    hosts: 
+      - "*.onprem-test.stands.wilix.dev"
+      # - "tete.onprem-test.stands.wilix.dev"
+      # - "dada.onprem-test.stands.wilix.dev"
+  rules:
+  - host: "*.onprem-test.stands.wilix.dev"
+    paths: 
+      - path: /
+        pathType: Prefix
+        service:
+          name: yonote-web
+          port: 80
+      - path: /realtime
+        pathType: Prefix
+        service:
+          name: yonote-websockets
+          port: 80
+      - path: /whiteboard
+        pathType: Prefix
+        service:
+          name: yonote-whiteboard
+          port: 80
+      - path: /collaboration
+        pathType: Prefix
+        service:
+          name: yonote-collaboration
+          port: 80
+  # - host: "tete.onprem-test.stands.wilix.dev"
+  #   paths: 
+  #     - path: /
+  #       pathType: Prefix
+  #       service:
+  #         name: yonote-web
+  #         port: 80
+  #     - path: /realtime
+  #       pathType: Prefix
+  #       service:
+  #         name: yonote-websockets
+  #         port: 80
+  #     - path: /whiteboard
+  #       pathType: Prefix
+  #       service:
+  #         name: yonote-whiteboard
+  #         port: 80
+  #     - path: /collaboration
+  #       pathType: Prefix
+  #       service:
+  #         name: yonote-collaboration
+  #         port: 80
+  # - host: "dada.onprem-test.stands.wilix.dev"
+  #   paths: 
+  #     - path: /
+  #       pathType: Prefix
+  #       service:
+  #         name: yonote-web
+  #         port: 80
+  #     - path: /realtime
+  #       pathType: Prefix
+  #       service:
+  #         name: yonote-websockets
+  #         port: 80
+  #     - path: /whiteboard
+  #       pathType: Prefix
+  #       service:
+  #         name: yonote-whiteboard
+  #         port: 80
+  #     - path: /collaboration
+  #       pathType: Prefix
+  #       service:
+  #         name: yonote-collaboration
+  #         port: 80
+
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt.rancher.wilix.dev
     
 yonote-web:
   fullnameOverride: yonote-web
@@ -91,16 +181,15 @@ yonote-web:
   image:
     registry: images.updates.yonote.ru
     repository: yonote
-    tag: 1.19.5
+    tag: 1.19.8
     pullPolicy: IfNotPresent
 
-  args:
+  command: ["/bin/sh", "-c"]
-    - ./build/server/index.js
+  args: ['IS_COMPILED=true yarn bytenode ./build/server/main.jsc --services=web']
-    - '--services=web'
 
   initContainers:
     - name: yonote-migration
-      image: '{{ .Values.image.repository }}:{{ .Values.image.tag }}'
+      image: images.updates.yonote.ru/yonote:1.19.8
       imagePullPolicy: IfNotPresent
       command:
         - /bin/sh
@@ -117,8 +206,8 @@ yonote-web:
 
   resources:
     limits:
-      cpu: 350m
+      cpu: 1
-      memory: 512Mi
+      memory: 1Gi
     requests:
       cpu: 200m
       memory: 128Mi
@@ -139,13 +228,25 @@ yonote-web:
     - secretRef:
         name: yonote-secrets
   
-  ingress:
+  # ingress:
-    enabled: true
+  #   enabled: true
-    hostname: '"*.yonote.example.com"'
+  #   hostname: 'app.onprem-test.stands.wilix.dev'
-    ingressClassName: ""
+  #   ingressClassName: traefik
-    path: '/'
+  #   path: '/'
-    pathType: Prefix
+  #   pathType: Prefix
-    tls: false
+  #   annotations:
+  #     cert-manager.io/cluster-issuer: letsencrypt.rancher.wilix.dev
+  #     traefik.ingress.kubernetes.io/router.middlewares: '{{ .Release.Namespace }}-redirect-https@kubernetescrd,{{.Release.Namespace }}-wss-headers@kubernetescrd,kube-system-wilix-office-ipwhitelist@kubernetescrd'
+  #     # nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
+  #     # nginx.ingress.kubernetes.io/configuration-snippet: |
+  #     #   more_set_headers "Host              $http_host";
+  #     #   more_set_headers "X-Real-IP         $remote_addr";
+  #     #   more_set_headers "X-Forwarded-Proto $scheme";
+  #     #   more_set_headers "X-Forwarded-For   $proxy_add_x_forwarded_for"; 
+  #   extraTls:
+  #   - hosts:
+  #       - "app.onprem-test.stands.wilix.dev"
+  #     secretName: "app.onprem-test.stands.wilix.dev"
 
   podLabels:
     redis-client: 'true'
@@ -184,12 +285,11 @@ yonote-websocket:
   image:
     registry: images.updates.yonote.ru
     repository: yonote
-    tag: 1.19.5
+    tag: 1.19.8
     pullPolicy: IfNotPresent
  
-  args:
+  command: ["/bin/sh", "-c"]
-    - ./build/server/index.js
+  args: ['IS_COMPILED=true yarn bytenode ./build/server/main.jsc --services=websockets']
-    - '--services=websockets'
 
   resources:
     limits:
@@ -217,13 +317,25 @@ yonote-websocket:
     port: 80
     targetPort: app
   
-  ingress:
+  # ingress:
-    enabled: true
+  #   enabled: true
-    hostname: '"*.yonote.example.com"'
+  #   hostname: 'app.onprem-test.stands.wilix.dev'
-    ingressClassName: ""
+  #   ingressClassName: traefik
-    path: '/realtime'
+  #   path: '/realtime'
-    pathType: Prefix
+  #   pathType: Prefix
-    tls: false
+  #   annotations:
+  #     cert-manager.io/cluster-issuer: letsencrypt.rancher.wilix.dev
+  #     traefik.ingress.kubernetes.io/router.middlewares: '{{ .Release.Namespace }}-redirect-https@kubernetescrd,{{.Release.Namespace }}-wss-headers@kubernetescrd,kube-system-wilix-office-ipwhitelist@kubernetescrd'
+  #     # nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
+  #     # nginx.ingress.kubernetes.io/configuration-snippet: |
+  #     #   more_set_headers "Host              $http_host";
+  #     #   more_set_headers "X-Real-IP         $remote_addr";
+  #     #   more_set_headers "X-Forwarded-Proto $scheme";
+  #     #   more_set_headers "X-Forwarded-For   $proxy_add_x_forwarded_for"; 
+  #   extraTls:
+  #   - hosts:
+  #       - "app.onprem-test.stands.wilix.dev"
+  #     secretName: "app.onprem-test.stands.wilix.dev"
   
   podLabels:
     redis-client: 'true'
@@ -262,12 +374,11 @@ yonote-whiteboard:
   image:
     registry: images.updates.yonote.ru
     repository: yonote
-    tag: 1.19.5
+    tag: 1.19.8
     pullPolicy: IfNotPresent
 
-  args:
+  command: ["/bin/sh", "-c"]
-    - ./build/server/index.js
+  args: ['IS_COMPILED=true yarn bytenode ./build/server/main.jsc --services=whiteboard']
-    - '--services=whiteboard'
 
   resources:
     limits:
@@ -295,13 +406,26 @@ yonote-whiteboard:
     port: 80
     targetPort: app
 
-  ingress:
+  # ingress:
-    enabled: true
+  #   enabled: true
-    hostname: '"*.yonote.example.com"'
+  #   hostname: 'app.onprem-test.stands.wilix.dev'
-    ingressClassName: ""
+  #   ingressClassName: traefik
-    path: '/whiteboard'
+  #   path: '/whiteboard'
-    pathType: Prefix
+  #   pathType: Prefix
-    tls: false
+  #   annotations:
+  #     cert-manager.io/cluster-issuer: letsencrypt.rancher.wilix.dev
+  #     traefik.ingress.kubernetes.io/router.middlewares: '{{ .Release.Namespace }}-redirect-https@kubernetescrd,{{.Release.Namespace }}-wss-headers@kubernetescrd,kube-system-wilix-office-ipwhitelist@kubernetescrd'
+  #     # nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
+  #     # nginx.ingress.kubernetes.io/configuration-snippet: |
+  #     #   more_set_headers "Host              $http_host";
+  #     #   more_set_headers "X-Real-IP         $remote_addr";
+  #     #   more_set_headers "X-Forwarded-Proto $scheme";
+  #     #   more_set_headers "X-Forwarded-For   $proxy_add_x_forwarded_for"; 
+  #   extraTls:
+  #   - hosts:
+  #       - "app.onprem-test.stands.wilix.dev"
+  #     secretName: "app.onprem-test.stands.wilix.dev"
+
 
   podLabels:
     redis-client: 'true'
@@ -340,20 +464,19 @@ yonote-worker:
   image:
     registry: images.updates.yonote.ru
     repository: yonote
-    tag: 1.19.5
+    tag: 1.19.8
     pullPolicy: IfNotPresent
 
-  args:
+  command: ["/bin/sh", "-c"]
-    - ./build/server/index.js
+  args: ['IS_COMPILED=true yarn bytenode ./build/server/main.jsc --services=worker']
-    - '--services=worker'
 
   resources:
     limits:
-      cpu: 500m
+      cpu: 1
       memory: 1Gi
     requests:
-      cpu: 250m
+      cpu: 50m
-      memory: 256Mi
+      memory: 128Mi
 
   checksums: null
 
@@ -410,12 +533,11 @@ yonote-collaboration:
   image:
     registry: images.updates.yonote.ru
     repository: yonote
-    tag: 1.19.5
+    tag: 1.19.8
     pullPolicy: IfNotPresent
 
-  args:
+  command: ["/bin/sh", "-c"]
-    - ./build/server/index.js
+  args: ['IS_COMPILED=true yarn bytenode ./build/server/main.jsc --services=collaboration']
-    - '--services=collaboration'
 
   checksums: null
 
@@ -429,13 +551,25 @@ yonote-collaboration:
     port: 80
     targetPort: app
 
-  ingress:
+  # ingress:
-    enabled: true
+  #   enabled: true
-    hostname: '"*.yonote.example.com"'
+  #   hostname: 'app.onprem-test.stands.wilix.dev'
-    ingressClassName: ""
+  #   ingressClassName: traefik
-    path: '/collaboration'
+  #   path: '/collaboration'
-    pathType: Prefix
+  #   pathType: Prefix
-    tls: false
+  #   annotations:
+  #     cert-manager.io/cluster-issuer: letsencrypt.rancher.wilix.dev
+  #     traefik.ingress.kubernetes.io/router.middlewares: '{{ .Release.Namespace }}-redirect-https@kubernetescrd,{{.Release.Namespace }}-wss-headers@kubernetescrd,kube-system-wilix-office-ipwhitelist@kubernetescrd'
+  #     # nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
+  #     # nginx.ingress.kubernetes.io/configuration-snippet: |
+  #     #   more_set_headers "Host              $http_host";
+  #     #   more_set_headers "X-Real-IP         $remote_addr";
+  #     #   more_set_headers "X-Forwarded-Proto $scheme";
+  #     #   more_set_headers "X-Forwarded-For   $proxy_add_x_forwarded_for"; 
+  #   extraTls:
+  #   - hosts:
+  #       - "app.onprem-test.stands.wilix.dev"
+  #     secretName: "app.onprem-test.stands.wilix.dev"
  
   envFrom:
     - configMapRef:
@@ -476,9 +610,10 @@ yonote-database:
   enabled: true
   fullnameOverride: yonote-db
   nameOverride: db
+  
   primary:
     persistence:
-      size: 10Gi
+      size: 500Mi
     resources:
       limits:
         cpu: 250m
@@ -492,11 +627,13 @@ yonote-redis:
   fullnameOverride: yonote-redis
   nameOverride: redis
   architecture: standalone
+  
   auth:
     enabled: false
+  
   master:
     persistence:
-      size: 5Gi
+      size: 200Mi
     resources:
       limits:
         cpu: 250m
@@ -504,3 +641,41 @@ yonote-redis:
       requests:
         cpu: 50m
         memory: 128Mi
+   
+minio:
+  enabled: true
+  name: minio
+  fullnameOverride: yonote-minio
+  nameOverride: minio
+  accessKey: "minioadmin"
+  secretKey: "minioadminsecret"
+  
+  persistence:
+    enabled: true
+    size: 500Mi
+    
+  ingress:
+    enabled: true
+    hostname: 's3.onprem-test.stands.wilix.dev'
+    ingressClassName: traefik
+    path: '/'
+    pathType: ImplementationSpecific
+    annotations:
+      kubernetes.io/ingress.class: traefik
+      cert-manager.io/cluster-issuer: letsencrypt.rancher.wilix.dev
+    extraTls:
+    - hosts:
+        - "s3.onprem-test.stands.wilix.dev"
+      secretName: "s3.onprem-test.stands.wilix.dev"
+      
+    resources:
+      requests:
+        memory: 512Mi
+        cpu: 250m
+      limits:
+        memory: 1Gi
+        cpu: 500m
+    
+    buckets:
+      - name: yonote-bucket
+        policy: none

yonote-keycloak-chart/Chart.lock

@@ -0,0 +1,9 @@
+dependencies:
+- name: app
+  repository: https://dysnix.github.io/charts
+  version: 0.3.15
+- name: postgresql
+  repository: https://charts.bitnami.com/bitnami
+  version: 11.6.2
+digest: sha256:4ff512f4cf7c217961e59af3e2cb656f4d6fc8441f17ce3da96ca1a03f58bf58
+generated: "2024-07-16T12:04:39.863844193+03:00"

yonote-keycloak-chart/Chart.yaml

@@ -0,0 +1,13 @@
+apiVersion: v2
+name: yonote-keycloak-chart
+version: 1.0.0
+dependencies:
+- name: app
+  version: "0.3.15"
+  repository: https://dysnix.github.io/charts
+  alias: keycloak
+- name: postgresql
+  version: "11.6.2"
+  repository: https://charts.bitnami.com/bitnami
+  condition: keycloak-database.enabled
+  alias: keycloak-database

yonote-keycloak-chart/secret-values.yaml

@@ -0,0 +1,6 @@
+keycloak:
+  secrets:
+    secrets:
+      stringData:
+        KEYCLOAK_ADMIN_PASSWORD: "12345"
+        KC_DB_PASSWORD: "3fWAxP6ZYp"

yonote-keycloak-chart/values.yaml

@@ -0,0 +1,101 @@
+global:
+  postgresql:
+    auth:
+      database: keycloak
+      username: keycloak
+
+keycloak-database:
+  enabled: true
+  fullnameOverride: yonote-keycloak-db
+  nameOverride: db
+  primary:
+    persistence:
+      size: 512Mi
+
+keycloak:
+  name: yonote-keycloak
+  fullnameOverride: yonote-keycloak
+  image:
+    registry: images.updates.yonote.ru
+    repository: yonote-keycloak
+    tag: latest
+
+  command:
+    - /bin/sh
+    - -c
+    - |
+      "/opt/keycloak/bin/kc.sh" "start"    
+
+  configMaps:
+    configs:
+      data:
+        KEYCLOAK_ADMIN: root
+        KC_PROXY: edge
+        KC_HOSTNAME_STRICT: "false"
+        KC_HOSTNAME_ADMIN: auth.example.com/admin
+        KC_HOSTNAME: auth.example.com
+        KC_DB: postgres
+        KC_DB_URL: jdbc:postgresql://yonote-keycloak-db:5432/keycloak
+        KC_DB_URL_DATABASE: keycloak
+        KC_DB_USERNAME: keycloak
+        KC_HOSTNAME_STRICT_HTTPS: "false"
+        KC_HOSTNAME_PATH: "/"
+
+  envFrom:
+    - configMapRef:
+        name: '{{ template "app.fullname" . }}-configs'
+    - secretRef:
+        name: '{{ template "app.fullname" . }}-secrets'
+
+  checksums:
+    - secrets.yaml
+    - configmaps.yaml
+
+  containerPorts:
+    - containerPort: 8080
+      name: app
+      protocol: TCP
+      
+  resources:
+    limits:
+      cpu: 500m
+      memory: 512Mi
+    requests:
+      cpu: 150m
+      memory: 128Mi
+
+  service:
+    service:
+    type: ClusterIP
+    port: 8080
+    targetPort: 8080
+
+  ingress:
+    enabled: true
+    ingressClassName: nginx
+    pathType: ImplementationSpecific
+    hostname: auth.example.com
+    path: /
+    tls: false
+
+  livenessProbe:
+    enabled: true
+    failureThreshold: 6
+    initialDelaySeconds: 60
+    periodSeconds: 15
+    successThreshold: 1
+    timeoutSeconds: 5
+    httpGet:
+      path: /
+      port: app
+
+  readinessProbe:
+    enabled: true
+    failureThreshold: 6
+    initialDelaySeconds: 60
+    periodSeconds: 15
+    successThreshold: 1
+    timeoutSeconds: 5
+    httpGet:
+      path: /
+      port: app