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.

Sign up for GitHub

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

expose collaboration product config #799

Merged
merged 3 commits into from
Nov 8, 2024
Merged

expose collaboration product config #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5707e85
expose collaboration product config
wkloucek Nov 7, 2024
d72ca28
fix onyloffice ip filter after the collaboration service name change
wkloucek Nov 8, 2024
7c85567
Merge branch 'main' into collaboration-product-config
wkloucek Nov 8, 2024
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
12 changes: 12 additions & 0 deletions charts/ocis/docs/values-desc-table.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@ a| [subs=-attributes]
a| [subs=-attributes]
`"Collabora"`
| Name of the office suite. Will be displayed to the users.
| features.appsIntegration.wopiIntegration.officeSuites[0].product
a| [subs=-attributes]
+string+
a| [subs=-attributes]
`"Collabora"`
| Product type of the office suite. Will be used to determine certain product specifics. Supports "Collabora", "OnlyOffice", "Microsoft365" or "MicrosoftOfficeOnline".
| features.appsIntegration.wopiIntegration.officeSuites[0].secureViewEnabled
a| [subs=-attributes]
+bool+
Expand Down Expand Up @@ -300,6 +306,12 @@ a| [subs=-attributes]
a| [subs=-attributes]
`"OnlyOffice"`
| Name of the office suite. Will be displayed to the users.
| features.appsIntegration.wopiIntegration.officeSuites[1].product
a| [subs=-attributes]
+string+
a| [subs=-attributes]
`"OnlyOffice"`
| Product type of the office suite. Will be used to determine certain product specifics. Supports "Collabora", "OnlyOffice", "Microsoft365" or "MicrosoftOfficeOnline".
| features.appsIntegration.wopiIntegration.officeSuites[1].secureViewEnabled
a| [subs=-attributes]
+bool+
Expand Down
6 changes: 6 additions & 0 deletions charts/ocis/docs/values.adoc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,9 @@ features:
officeSuites:
- # -- Name of the office suite. Will be displayed to the users.
name: Collabora
# -- Product type of the office suite. Will be used to determine certain product specifics.
# Supports "Collabora", "OnlyOffice", "Microsoft365" or "MicrosoftOfficeOnline".
product: Collabora
# -- Enables the office suite.
enabled: false
# -- URI of the office suite.
Expand Down Expand Up @@ -323,6 +326,9 @@ features:

- # -- Name of the office suite. Will be displayed to the users.
name: OnlyOffice
# -- Product type of the office suite. Will be used to determine certain product specifics.
# Supports "Collabora", "OnlyOffice", "Microsoft365" or "MicrosoftOfficeOnline".
product: OnlyOffice
# -- Enables the office suite.
enabled: false
# -- URI of the office suite.
Expand Down
2 changes: 2 additions & 0 deletions charts/ocis/templates/collaboration/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ spec:

- name: COLLABORATION_APP_NAME
value: {{ $officeSuite.name | quote }}
- name: COLLABORATION_APP_PRODUCT
value: {{ default $officeSuite.name $officeSuite.product | quote }}

- name: COLLABORATION_APP_LOCKNAME
value: com.github.owncloud.collaboration-{{ $officeSuite.name }}
Expand Down
6 changes: 6 additions & 0 deletions charts/ocis/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,9 @@ features:
officeSuites:
- # -- Name of the office suite. Will be displayed to the users.
name: Collabora
# -- Product type of the office suite. Will be used to determine certain product specifics.
# Supports "Collabora", "OnlyOffice", "Microsoft365" or "MicrosoftOfficeOnline".
product: Collabora
# -- Enables the office suite.
enabled: false
# -- URI of the office suite.
Expand Down Expand Up @@ -322,6 +325,9 @@ features:

- # -- Name of the office suite. Will be displayed to the users.
name: OnlyOffice
# -- Product type of the office suite. Will be used to determine certain product specifics.
# Supports "Collabora", "OnlyOffice", "Microsoft365" or "MicrosoftOfficeOnline".
product: OnlyOffice
# -- Enables the office suite.
enabled: false
# -- URI of the office suite.
Expand Down
2 changes: 1 addition & 1 deletion deployments/ocis-office/addons/onlyoffice/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ data:
"ipfilter": {
"rules": [
{
"address": "collaboration-onlyoffice.ocis.svc.cluster.local",
"address": "collaboration-demoonlyoffice.ocis.svc.cluster.local",
"allowed": true
},
{
Expand Down
6 changes: 4 additions & 2 deletions deployments/ocis-office/helmfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ releases:
enabled: true
wopiIntegration:
officeSuites:
- name: Collabora
- name: DemoCollabora
product: Collabora
enabled: true
uri: "https://collabora.kube.owncloud.test"
insecure: true
Expand All @@ -158,7 +159,8 @@ releases:
- secretName: ocis-dev-tls
hosts:
- wopi-collabora.kube.owncloud.test
- name: OnlyOffice
- name: DemoOnlyOffice
product: OnlyOffice
enabled: true
uri: "https://onlyoffice.kube.owncloud.test"
insecure: true
Expand Down