Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch onlyoffice to sharded chart #765

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions deployments/ocis-office/addons/onlyoffice/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: doc-local.json
apiVersion: v1
data:
local.json: |-
local-production-linux.json: |-
{
"services": {
"CoAuthoring": {
Expand All @@ -22,13 +22,6 @@ data:
"useforrequest": false,
"errorcode": 403
},
"sql": {
"pgPoolExtraOptions": {
"ssl": {
"rejectUnauthorized": false
}
}
},
"autoAssembly": {
"enable": true,
"interval": "5m"
Expand Down
20 changes: 0 additions & 20 deletions deployments/ocis-office/addons/postgresql/postgresql.yaml

This file was deleted.

74 changes: 30 additions & 44 deletions deployments/ocis-office/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ repositories:
- name: bitnami
url: https://charts.bitnami.com/bitnami
- name: onlyoffice
url: https://download.onlyoffice.com/charts/stable
- name: postgres-operator
url: https://opensource.zalando.com/postgres-operator/charts/postgres-operator
url: git+https://github.com/ONLYOFFICE/Kubernetes-Docs-Shards?ref=bc77cf40efb84f469cf812a4760e97b2129d710b # release/v1.2.0 branch
#url: https://download.onlyoffice.com/charts/stable

releases:
- name: tika
Expand All @@ -23,71 +22,58 @@ releases:
chart: addons/onlyoffice
namespace: onlyoffice

- name: addons-postgresql
chart: addons/postgresql
namespace: onlyoffice
needs:
- onlyoffice/postgres-operator

- name: rabbitmq
namespace: onlyoffice
chart: bitnami/rabbitmq
version: 14.6.9

- name: redis
namespace: onlyoffice
chart: bitnami/redis
version: 20.1.0

- name: postgres-operator
namespace: onlyoffice
chart: postgres-operator/postgres-operator
version: 1.13.0
values:
- configConnectionPooler:
connection_pooler_max_db_connections: 300
connection_pooler_number_of_instances: 3
connection_pooler_mode: "session"
- replica:
replicaCount: 0

- name: onlyoffice
namespace: onlyoffice
chart: onlyoffice/docs
version: 4.2.1
chart: onlyoffice/docs-shards
# version: 1.0.1
needs:
- onlyoffice/addons-onlyoffice
- onlyoffice/rabbitmq
- onlyoffice/redis
- onlyoffice/postgres-operator
values:
- ingress-nginx:
enabled: false
- documentserver:
replicas: 3
converter:
count: 1
- wopi:
enabled: true
- ingress:
enabled: true
ingressClassName: nginx
host: onlyoffice.kube.owncloud.test
ssl:
enabled: true
secret: onlyoffice-tls
- extraConf:
configMap: "doc-local.json"
filename: local-production-linux.json
- connections:
dbHost: postgres-pooler
dbExistingSecret: postgres.postgres.credentials.postgresql.acid.zalan.do
dbSecretKeyName: password
redisHost: redis-master
amqpHost: rabbitmq
redisHost: redis-master.onlyoffice.svc.cluster.local
- persistence:
existingClaim: ds-files
jsonPatches:
# patch https://github.com/ONLYOFFICE/Kubernetes-Docs/blob/851362e5b96f5e86fe8cc9c3bdd86b5f217dd5d0/templates/jobs/pre-install.yaml#L16 to a higher number
# without this, OnlyOffice installation fails on the first time
- target:
kind: Job
namespace: onlyoffice
name: pre-install
patch:
- op: replace
path: /spec/backoffLimit
value: 20

# image overrides #TODO: remove when released chart is used
- documentserver:
initContainers:
image:
tag: 8.2.0-1
proxy:
image:
tag: 8.2.0-1
docservice:
image:
tag: 8.2.0-1
converter:
image:
tag: 8.2.0-1

- name: collabora
namespace: collabora
Expand Down