diff --git a/loop-enterprise-edition/secret-values.yaml b/loop-enterprise-edition/secret-values.yaml index b1d1072..b23206c 100644 --- a/loop-enterprise-edition/secret-values.yaml +++ b/loop-enterprise-edition/secret-values.yaml @@ -1,8 +1,9 @@ secrets: secrets: stringData: - MM_SQLSETTINGS_DATASOURCE: "postgres://loopuser:looppassword@loop-database.loopent.svc.cluster.local:5432/loopdb?sslmode=disable" #Data source for connecting to the PostgreSQL database + MM_SQLSETTINGS_DATASOURCE: "postgres://:@:5432/loopdb?sslmode=disable" #Data source for connecting to the PostgreSQL database #MM_SQLSETTINGS_DATASOURCEREPLICAS: "" MM_FILESETTINGS_AMAZONS3ACCESSKEYID: "accesskey-minio" #Access Key ID to access s3 storage MM_FILESETTINGS_AMAZONS3SECRETACCESSKEY: "secretkey-minio" #The secret key for accessing S3 storage MM_LICENSE: "" + MM_CONFIG: "postgres://:@:5432/loopdb?sslmode=disable" #Store the configuration in the database. Use MM_SQLSETTINGS_DATASOURCE diff --git a/loop-enterprise-edition/values.yaml b/loop-enterprise-edition/values.yaml index a809bfd..a8e8437 100644 --- a/loop-enterprise-edition/values.yaml +++ b/loop-enterprise-edition/values.yaml @@ -85,9 +85,6 @@ service: labels: {} ports: - #- name: api - # port: 8065 - # targetPort: api - name: metrics port: 8067 targetPort: metrics @@ -103,11 +100,11 @@ ingress: certManager: false apiVersion: ingressClassName: traefik - hostname: loop.modo.local + hostname: loop.example.com path: / pathType: ImplementationSpecific annotations: {} - + # cert-manager.io/cluster-issuer: "" tls: false ## extraHosts: @@ -259,11 +256,10 @@ configMaps: MM_SERVICESETTINGS_ENABLECUSTOMEMOJI: "true" # Поддержка пользовательских эмодзи MM_SERVICESETTINGS_ENABLELINKPREVIEWS: "true" # Предпросмотр ссылок MM_SERVICESETTINGS_ENABLEOAUTHSERVICEPROVIDER: "true" #Используется для определения, разрешено ли использование сторонних провайдеров OAuth-сервисов - MM_SERVICESETTINGS_ENABLETESTING: "true" #Флаг указывает, разрешены ли тесты MM_SERVICESETTINGS_ENABLEUSERACCESSTOKENS: "true" #Флаг указывает, разрешены ли токены доступа пользователей MM_SERVICESETTINGS_GIPHYSDKKEY: "" #Ключ Giphy SDK для интеграции с Giphy MM_SERVICESETTINGS_LISTENADDRESS: ":8065" #Адрес и порт, на котором служба прослушивает - MM_SERVICESETTINGS_SITEURL: "https://loop.modo.local" #Публичный URL службы + MM_SERVICESETTINGS_SITEURL: "https://loop.example.com" #Публичный URL службы MM_SQLSETTINGS_DRIVERNAME: "postgres" #Имя драйвера базы данных MM_TEAMSETTINGS_MAXUSERSPERTEAM: "500" #Максимальное количество пользователей в команде MM_EMAILSETTINGS_REQUIREMAILVERIFICATION: "true" # Требовать подтверждение email @@ -277,3 +273,17 @@ configMaps: MM_EMAILSETTINGS_SMTPPORT: "" # SMTP порт для подключения (например, 25, 465, 587) MM_EMAILSETTINGS_REPLYTOADDRESS: "" # Адрес для ответа (куда будут приходить ответы на письма) MM_EMAILSETTINGS_SMTPSERVER: "" # SMTP сервер для отправки писем (например, smtp.gmail.com) + ## Для запуска Loop Calls OnPrem + MM_CLOUD_INSTALLATION_ID: "loop.example.com" # В качестве значения укажите домен вашего рабочего пространства, MM_SERVICESETTINGS_SITEURL. + + ## The following environment variables are required to use Elasticsearch for searching in loop. + # MM_ELASTICSEARCHSETTINGS_CONNECTIONURL: "" + # MM_ELASTICSEARCHSETTINGS_ENABLEINDEXING: "false" + # MM_ELASTICSEARCHSETTINGS_ENABLESEARCHING: "false" + + ## The following environment variables are required to run loop in clustered mode. + # MM_CLUSTERSETTINGS_ENABLE: "true" + # MM_CLUSTERSETTINGS_CLUSTERNAME: "loop-example-cluster" + # MM_CLUSTERSETTINGS_ENABLEEXPERIMENTALGOSSIPENCRYPTION: "true" + # MM_CLUSTERSETTINGS_ENABLEGOSSIPCOMPRESSION: "false" + # MM_CLUSTERSETTINGS_READONLYCONFIG: "false" diff --git a/loop-enterprise-stack/secret-values.yaml b/loop-enterprise-stack/secret-values.yaml index b87a200..fc292e5 100644 --- a/loop-enterprise-stack/secret-values.yaml +++ b/loop-enterprise-stack/secret-values.yaml @@ -2,8 +2,9 @@ loop-enterprise-edition: secrets: secrets: stringData: - MM_SQLSETTINGS_DATASOURCE: "postgres://loopuser:looppassword@loop-database.lpent2.svc.cluster.local:5432/loopdb?sslmode=disable" #Data source for connecting to the PostgreSQL database + MM_SQLSETTINGS_DATASOURCE: "postgres://loopuser:looppassword@loop-database..svc.cluster.local:5432/loopdb?sslmode=disable" #Data source for connecting to the PostgreSQL database #MM_SQLSETTINGS_DATASOURCEREPLICAS: "" MM_FILESETTINGS_AMAZONS3ACCESSKEYID: "accesskey-minio" #Access Key ID to access s3 storage MM_FILESETTINGS_AMAZONS3SECRETACCESSKEY: "secretkey-minio" #The secret key for accessing S3 storage - MM_LICENSE: "" #ewogICJpZCI6ICIxNmpkdWtmaGlwOGU5cXQ5aWg4aTF0dXkzYSIsCiAgImlzc3VlZF9hdCI6IDE2ODcxMzI4MDAwMDAsCiAgInN0YXJ0c19hdCI6IDE2ODcxODMyMDAwMDAsCiAgImV4cGlyZXNfYXQiOiAxNjkyNDUzNjAwMDAwLAogICJjdXN0b21lciI6IHsKICAgICJpZCI6ICIxNmpkdWtmaGlwOGU5cXQ5aWg4aTF0dXkzYSIsCiAgICAibmFtZSI6ICJMT09QIiwKICAgICJlbWFpbCI6ICJzdXBwb3J0QGxvb3AucnUiLAogICAgImNvbXBhbnkiOiAiTk1MSyIsCiAgICAicGhvbmVfbnVtYmVyIjogbnVsbAogIH0sCiAgImZlYXR1cmVzIjogewogICAgInVzZXJzIjogMjAwLAogICAgImxkYXAiOiB0cnVlLAogICAgImxkYXBfZ3JvdXBzIjogdHJ1ZSwKICAgICJtZmEiOiBmYWxzZSwKICAgICJnb29nbGVfb2F1dGgiOiB0cnVlLAogICAgIm9mZmljZTM2NV9vYXV0aCI6IGZhbHNlLAogICAgIk9mZmljZTM2NU9BdXRoIjogZmFsc2UsCiAgICAib3BlbmlkIjogdHJ1ZSwKICAgICJjb21wbGlhbmNlIjogZmFsc2UsCiAgICAiY2x1c3RlciI6IGZhbHNlLAogICAgIm1ldHJpY3MiOiB0cnVlLAogICAgIm1ocG5zIjogdHJ1ZSwKICAgICJzYW1sIjogZmFsc2UsCiAgICAiZWxhc3RpY19zZWFyY2giOiB0cnVlLAogICAgImFubm91bmNlbWVudCI6IHRydWUsCiAgICAidGhlbWVfbWFuYWdlbWVudCI6IHRydWUsCiAgICAiZW1haWxfbm90aWZpY2F0aW9uX2NvbnRlbnRzIjogdHJ1ZSwKICAgICJkYXRhX3JldGVudGlvbiI6IHRydWUsCiAgICAibWVzc2FnZV9leHBvcnQiOiBmYWxzZSwKICAgICJjdXN0b21fcGVybWlzc2lvbnNfc2NoZW1lcyI6IHRydWUsCiAgICAiY3VzdG9tX3Rlcm1zX29mX3NlcnZpY2UiOiB0cnVlLAogICAgImd1ZXN0X2FjY291bnRzIjogdHJ1ZSwKICAgICJndWVzdF9hY2NvdW50c19wZXJtaXNzaW9ucyI6IHRydWUsCiAgICAiaWRfbG9hZGVkIjogdHJ1ZSwKICAgICJsb2NrX3RlYW1tYXRlX25hbWVfZGlzcGxheSI6IHRydWUsCiAgICAiZW50ZXJwcmlzZV9wbHVnaW5zIjogdHJ1ZSwKICAgICJhZHZhbmNlZF9sb2dnaW5nIjogdHJ1ZSwKICAgICJjbG91ZCI6IGZhbHNlLAogICAgInNoYXJlZF9jaGFubmVscyI6IGZhbHNlLAogICAgInJlbW90ZV9jbHVzdGVyX3NlcnZpY2UiOiBmYWxzZSwKICAgICJmdXR1cmVfZmVhdHVyZXMiOiB0cnVlCiAgfSwKICAic2t1X25hbWUiOiAiZW50ZXJwcmlzZSIsCiAgInNrdV9zaG9ydF9uYW1lIjogImVudGVycHJpc2UiCn0KLYbL8WZeGa81qrVkiAsSWg8j6 + MM_LICENSE: "" + MM_CONFIG: "postgres://loopuser:looppassword@loop-database..svc.cluster.local:5432/loopdb?sslmode=disable" #Store the configuration in the database. Use MM_SQLSETTINGS_DATASOURCE diff --git a/loop-enterprise-stack/values.yaml b/loop-enterprise-stack/values.yaml index e379fd3..56cb927 100644 --- a/loop-enterprise-stack/values.yaml +++ b/loop-enterprise-stack/values.yaml @@ -34,9 +34,6 @@ loop-enterprise-edition: labels: {} ports: - #- name: api - # port: 8065 - # targetPort: api - name: metrics port: 8067 targetPort: metrics @@ -49,10 +46,12 @@ loop-enterprise-edition: ingress: enabled: true + # annotations: + # cert-manager.io/cluster-issuer: "" certManager: false apiVersion: ingressClassName: traefik - hostname: loop.modo.local + hostname: loop.example.com path: / pathType: ImplementationSpecific annotations: {} @@ -135,11 +134,10 @@ loop-enterprise-edition: MM_SERVICESETTINGS_ENABLECUSTOMEMOJI: "true" # Поддержка пользовательских эмодзи MM_SERVICESETTINGS_ENABLELINKPREVIEWS: "true" # Предпросмотр ссылок MM_SERVICESETTINGS_ENABLEOAUTHSERVICEPROVIDER: "true" #Используется для определения, разрешено ли использование сторонних провайдеров OAuth-сервисов - MM_SERVICESETTINGS_ENABLETESTING: "true" #Флаг указывает, разрешены ли тесты MM_SERVICESETTINGS_ENABLEUSERACCESSTOKENS: "true" #Флаг указывает, разрешены ли токены доступа пользователей MM_SERVICESETTINGS_GIPHYSDKKEY: "" #Ключ Giphy SDK для интеграции с Giphy MM_SERVICESETTINGS_LISTENADDRESS: ":8065" #Адрес и порт, на котором служба прослушивает - MM_SERVICESETTINGS_SITEURL: "https://loop.modo.local" #Публичный URL службы + MM_SERVICESETTINGS_SITEURL: "https://loop.example.com" #Публичный URL службы MM_SQLSETTINGS_DRIVERNAME: "postgres" #Имя драйвера базы данных MM_TEAMSETTINGS_MAXUSERSPERTEAM: "500" #Максимальное количество пользователей в команде MM_EMAILSETTINGS_REQUIREMAILVERIFICATION: "true" # Требовать подтверждение email @@ -153,6 +151,8 @@ loop-enterprise-edition: MM_EMAILSETTINGS_SMTPPORT: "" # SMTP порт для подключения (например, 25, 465, 587) MM_EMAILSETTINGS_REPLYTOADDRESS: "" # Адрес для ответа (куда будут приходить ответы на письма) MM_EMAILSETTINGS_SMTPSERVER: "" # SMTP сервер для отправки писем (например, smtp.gmail.com) + ## Для запуска Loop Calls OnPrem + MM_CLOUD_INSTALLATION_ID: "loop.example.com" # В качестве значения укажите домен вашего рабочего пространства, MM_SERVICESETTINGS_SITEURL. ## The following environment variables are required to use Elasticsearch for searching in loop. # MM_ELASTICSEARCHSETTINGS_CONNECTIONURL: "" @@ -187,8 +187,8 @@ postgresql: value: "looppassword" storage: - requestedSize: 5Gi - className: "microk8s-hostpath" + requestedSize: 10Gi + className: "" resources: limits: @@ -223,8 +223,10 @@ minio: persistence: enabled: true - storageClass: "microk8s-hostpath" - size: 1Gi + annotations: + helm.sh/resource-policy: keep + storageClass: "" + size: 10Gi mcJob: enabled: true