Config rehaul for apps

sciencemesh · Apr 17, 2023 · ee0761a · ee0761a
1 parent 0b97a07
commit ee0761a
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 12 deletions.
diff --git a/iop/Chart.yaml b/iop/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: iop
 description: ScienceMesh IOP is the reference Federated Scientific Mesh platform
 type: application
-version: 0.3.0
+version: 0.4.0
 appVersion: 0.0.1
 icon: https://developer.sciencemesh.io/logo.svg
 home: https://developer.sciencemesh.io/
@@ -12,7 +12,6 @@ dependencies:
   version: "1.4.2"
   repository: "https://cs3org.github.io/charts"
   alias: gateway
-  condition: gateway.enabled
 - name: revad
   version: "1.4.2"
   repository: "https://cs3org.github.io/charts"
@@ -28,8 +27,18 @@ dependencies:
   repository: "https://cs3org.github.io/charts"
   alias: storageprovider-public
   condition: storageprovider-public.enabled
+- name: revad
+  version: "1.4.2"
+  repository: "https://cs3org.github.io/charts"
+  alias: appprovider-collabora
+  condition: appprovider-collabora.enabled
+- name: revad
+  version: "1.4.2"
+  repository: "https://cs3org.github.io/charts"
+  alias: appprovider-codimd
+  condition: appprovider-codimd.enabled
 - name: wopiserver
-  version: "0.5.2"
+  version: "0.9.0"
   repository: "https://cs3org.github.io/charts"
   condition: wopiserver.enabled
 maintainers:

diff --git a/iop/ci/complete-iop-values.yaml b/iop/ci/complete-iop-values.yaml
@@ -1,5 +1,4 @@
 gateway:
-  enabled: true
   configFiles:
     revad.toml: |
       [grpc.services.gateway]
@@ -108,3 +107,7 @@ storageprovider-public:
 
 wopiserver:
   enabled: true
+  config:
+    codimd:
+      enabled: true
+      inturl: http://meshapps-codimd
diff --git a/iop/templates/_helpers.tpl b/iop/templates/_helpers.tpl
@@ -0,0 +1,11 @@
+{{/*
+Configure the wopiserver if apps are enabled
+*/}}
+{{ if or (index .Values "appprovider-codimd").enabled (index .Values "appprovider-collabora").enabled }}
+wopiserver:
+  enabled: true
+  config:
+    codimd:
+      enabled: {{ (index .Values "appprovider-codimd").enabled }}
+      inturl: http://meshapps-codimd
+{{ end }}
diff --git a/iop/values.yaml b/iop/values.yaml
@@ -1,6 +1,3 @@
-gateway:
-  enabled: true
-
 storageprovider-home:
   enabled: false
 
@@ -10,5 +7,12 @@ storageprovider-reva:
 storageprovider-public:
   enabled: false
 
-wopiserver:
+# TODO not yet used
+shareprovider-ocm:
+  enabled: false
+
+appprovider-collabora:
+  enabled: false
+
+appprovider-codimd:
   enabled: false
diff --git a/meshapps/README.md b/meshapps/README.md
@@ -11,5 +11,5 @@ Colletion of apps supported by/compatible with the IOP and its adaptors.
 
 - **Integration reference:** https://developer.sciencemesh.io/docs/technical-documentation/integrations/codimd
 - **Requirements:**
-  - `iop.wopiserver.enabled=true` and `iop.wopiserver.wopibridge.enabled=true`
-  - `iop` chart version >= `0.1.1` (`wopiserver` chart >= `0.2.0`)
+  - `iop.wopiserver.enabled=true`
+  - `iop` chart version >= `0.1.1` (`wopiserver` chart >= `0.9.0`)
diff --git a/meshapps/values.yaml b/meshapps/values.yaml
@@ -1,4 +1,4 @@
-collabora-code:
+collabora:
   enabled: false
   image:
     tag: latest
@@ -20,9 +20,18 @@ codimd:
       CMD_ALLOW_ANONYMOUS: true
       CMD_ALLOW_ANONYMOUS_EDITS: true
       CMD_ALLOW_ANONYMOUS_VIEWS: true
+      CMD_ALLOW_FREEURL: true
+      CMD_EMAIL: false
       CMD_ALLOW_EMAIL_REGISTER: false
+      CMD_ALLOW_GRAVATAR: true
+      CMD_ALLOW_PDF_EXPORT: true
+      QT_QPA_PLATFORM:
+      NODE_TLS_REJECT_UNAUTHORIZED: 0
+      CMD_API_BODY_LIMIT: 210000
+      #CMD_DOMAIN: https://{{ .Values.ingress.hostname }}
+      #CMD_URL_ADDPORT: true
+      CMD_URL_PATH: codimd
       CMD_APPLIANCE_MODE: true
-      CMD_EMAIL: false
     versionCheck: false
     imageStorePersistentVolume:
       enabled: false