expose collaboration product config (#799)

* expose collaboration product config
owncloud · Nov 8, 2024 · b4dd2c6 · b4dd2c6
1 parent fc744d7
commit b4dd2c6
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 3 deletions.
diff --git a/charts/ocis/docs/values-desc-table.adoc b/charts/ocis/docs/values-desc-table.adoc
@@ -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+
@@ -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+

diff --git a/charts/ocis/docs/values.adoc.yaml b/charts/ocis/docs/values.adoc.yaml
@@ -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.
@@ -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.

diff --git a/charts/ocis/templates/collaboration/deployment.yaml b/charts/ocis/templates/collaboration/deployment.yaml
@@ -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 }}

diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml
@@ -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.
@@ -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.

diff --git a/deployments/ocis-office/addons/onlyoffice/configmap.yaml b/deployments/ocis-office/addons/onlyoffice/configmap.yaml
@@ -11,7 +11,7 @@ data:
           "ipfilter": {
             "rules": [
               {
-                "address": "collaboration-onlyoffice.ocis.svc.cluster.local",
+                "address": "collaboration-demoonlyoffice.ocis.svc.cluster.local",
                 "allowed": true
               },
               {

diff --git a/deployments/ocis-office/helmfile.yaml b/deployments/ocis-office/helmfile.yaml
@@ -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
@@ -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