From 886478647b5230026eab90f2cd2f0cf81d093cd7 Mon Sep 17 00:00:00 2001 From: "artem.drozdov" Date: Fri, 12 Jul 2024 00:57:34 +0300 Subject: [PATCH] update --- yonote-chart/Chart.lock | 9 ++-- yonote-chart/Chart.yaml | 6 +++ yonote-chart/secret-values.yaml | 22 ++++----- yonote-chart/values.yaml | 83 +++++++++++++++++++++++++++------ 4 files changed, 92 insertions(+), 28 deletions(-) diff --git a/yonote-chart/Chart.lock b/yonote-chart/Chart.lock index 2584b69..27957fe 100644 --- a/yonote-chart/Chart.lock +++ b/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 -generated: "2024-07-11T17:41:36.715623176+03:00" +- name: keycloak + repository: https://charts.bitnami.com/bitnami + version: 10.1.4 +digest: sha256:3ae7e0501380a54b94f6de7d4073b44a5ef6de77333262b6161fa3ab30db4695 +generated: "2024-07-11T23:38:34.270659107+03:00" diff --git a/yonote-chart/Chart.yaml b/yonote-chart/Chart.yaml index 3a3f06b..68f06c6 100644 --- a/yonote-chart/Chart.yaml +++ b/yonote-chart/Chart.yaml @@ -39,3 +39,9 @@ dependencies: repository: https://charts.bitnami.com/bitnami condition: yonote-redis.enabled alias: yonote-redis + + - name: keycloak + version: "10.1.4" + repository: https://charts.bitnami.com/bitnami + condition: keycloak.enabled + alias: keycloak diff --git a/yonote-chart/secret-values.yaml b/yonote-chart/secret-values.yaml index ac58287..b7328b6 100644 --- a/yonote-chart/secret-values.yaml +++ b/yonote-chart/secret-values.yaml @@ -3,19 +3,19 @@ global: config: secret: stringData: - AI_API_KEY: - AWS_ACCESS_KEY_ID: - AWS_SECRET_ACCESS_KEY: - OIDC_CLIENT_SECRET: - SECRET_KEY: - SMTP_PASSWORD: + AI_API_KEY: 12355 + AWS_ACCESS_KEY_ID: 1234 + AWS_SECRET_ACCESS_KEY: 1234 + OIDC_CLIENT_SECRET: 1234 + SECRET_KEY: 1234 + SMTP_PASSWORD: 1234 UTILS_SECRET: YANDEX_METRIKA_ID: - TELEGRAM_BOT_TOKEN: - UNSPLASH_API_ACCESS_KEY: - DATABASE_URL: "" #postgres://@:5432/yonote - REDIS_URL: "" #redis://username:password>@:6379 - LICENSE_KEY: "" + TELEGRAM_BOT_TOKEN: 1234 + UNSPLASH_API_ACCESS_KEY: 1234 + DATABASE_URL: postgres://postgres:TQQYw4UjOU>@localhost:5432/yonote + REDIS_URL: #redis://username:password>@:6379 + LICENSE_KEY: "eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.eyJkdW1teSI6ImRhdGEiLCJkYXRhIjoiZHVtbXkiLCJpYXQiOjE2NjQ4OTUyNjUsImV4cCI6MTgyMjY4MzI2NX0.Qudc2d-MKc4DT-UBAVydgowiYQnzzWolvbJTjPB5dwEI32Wb64sgkXOfXKsRf9_wP3UK0-65QYVkMHM76ImhM9HCHv9LWJBQeD0q2rF243cMkMUNfKXAX8-SmLu9kMZzm0fL02IBnv5TCHIF7u6GgGRk3US6WbVhzqHGxrdJ2b3HwD_cI3mcLKCtTfO_GDiUfAv7u5Ddi-6tCfFRvH633BLPKIMO5cePh_AdHykO_2p7z_ypUfsVgqxHkq8KwNuuaI6CpwE48P-7mXuM9xEWu3-prSZpaI4rIZA6JFpGMWyiGs4GDvjRFssq4GUPvYJnkZ2w_W_liSMdC5hg0PFxcw" SERVICE_WORKER_PUBLIC_KEY: "" SERVICE_WORKER_PRIVATE_KEY: "" QUOTA_TOKEN: diff --git a/yonote-chart/values.yaml b/yonote-chart/values.yaml index 1b8592c..c58893a 100644 --- a/yonote-chart/values.yaml +++ b/yonote-chart/values.yaml @@ -3,6 +3,8 @@ global: auth: database: yonote username: yonote + password: wsGZ6kXhr5 + postgresPassword: QQYw4UjOU yonote: ingress: @@ -72,6 +74,21 @@ global: secret: stringData: DATABASE_URL: 'postgres://{{ .Values.global.postgresql.auth.username }}:{{ .Values.global.postgresql.auth.password }}@yonote-db/{{ .Values.global.postgresql.auth.database }}' + AI_API_KEY: "" + AWS_ACCESS_KEY_ID: "" + AWS_SECRET_ACCESS_KEY: "" + OIDC_CLIENT_SECRET: "" + SECRET_KEY: "" + SMTP_PASSWORD: "" + UTILS_SECRET: "" + YANDEX_METRIKA_ID: "" + TELEGRAM_BOT_TOKEN: "" + UNSPLASH_API_ACCESS_KEY: "" + REDIS_URL: "" #redis://username:password>@:6379 + LICENSE_KEY: "" + SERVICE_WORKER_PUBLIC_KEY: "" + SERVICE_WORKER_PRIVATE_KEY: "" + QUOTA_TOKEN: "" yonote_cron_calendar_events: cron_enabled: "true" @@ -95,12 +112,12 @@ yonote-web: pullPolicy: IfNotPresent args: - - ./build/server/index.js - - '--services=web' + #- ./build/server/index.js + #- '--services=web' initContainers: - name: yonote-migration - image: '{{ .Values.image.repository }}:{{ .Values.image.tag }}' + image: images.updates.yonote.ru/yonote:1.19.5 imagePullPolicy: IfNotPresent command: - /bin/sh @@ -188,8 +205,8 @@ yonote-websocket: pullPolicy: IfNotPresent args: - - ./build/server/index.js - - '--services=websockets' + #- ./build/server/index.js + #- '--services=websockets' resources: limits: @@ -266,8 +283,8 @@ yonote-whiteboard: pullPolicy: IfNotPresent args: - - ./build/server/index.js - - '--services=whiteboard' + #- ./build/server/index.js + #- '--services=whiteboard' resources: limits: @@ -344,8 +361,8 @@ yonote-worker: pullPolicy: IfNotPresent args: - - ./build/server/index.js - - '--services=worker' + #- ./build/server/index.js + #- '--services=worker' resources: limits: @@ -414,8 +431,8 @@ yonote-collaboration: pullPolicy: IfNotPresent args: - - ./build/server/index.js - - '--services=collaboration' + #- ./build/server/index.js + #- '--services=collaboration' checksums: null @@ -478,7 +495,8 @@ yonote-database: nameOverride: db primary: persistence: - size: 10Gi + storageClass: microk8s-hostpath + size: 500Mi resources: limits: cpu: 250m @@ -496,11 +514,48 @@ yonote-redis: enabled: false master: persistence: - size: 5Gi + size: 200Mi resources: limits: cpu: 250m memory: 256Mi requests: cpu: 50m - memory: 128Mi \ No newline at end of file + memory: 128Mi + +keycloak: + enabled: true + fullnameOverride: yonote-keycloak + nameOverride: keycloak + hostName: auth.example.com + auth: + adminUser: admin + adminPassword: "12345" + postgresql: + name: postgresql + enabled: true + postgresqlUsername: keycloak + postgresqlPassword: keycloak + postgresqlDatabase: keycloak + service: + type: ClusterIP + port: 8080 + persistence: + deployPostgres: true # Если используете встроенный PostgreSQL, оставьте true. + size: 500Mi + readinessProbe: + httpGet: + path: /realms/master + port: 8080 + initialDelaySeconds: 30 + timeoutSeconds: 5 + periodSeconds: 10 + failureThreshold: 6 + livenessProbe: + httpGet: + path: /realms/master + port: 8080 + initialDelaySeconds: 30 + timeoutSeconds: 5 + periodSeconds: 10 + failureThreshold: 6 \ No newline at end of file