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

replace wopi server by collaboration service #567

Merged
merged 32 commits into from
Jul 12, 2024

Conversation

wkloucek
Copy link
Contributor

@wkloucek wkloucek commented May 14, 2024

Description

Replace the current wopi server setup by the collaboration service

Related Issue

Motivation and Context

How Has This Been Tested?

  • has been tested using the ocis-office deployment example

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation generated (make docs) and committed
  • Documentation ticket raised:
  • Documentation PR created:

@wkloucek
Copy link
Contributor Author

@micbar @jvillafanez currently I have this Deployment (see below). It always dies and logs the attached logs. Maybe you have an idea? I'm not sure why it fails because com.owncloud.api.gateway and the service registration of the collaboration service seems to work (from a code perspective this should happen before and cause a bail out!?)

collaboration-collabora-5779f854f-pgq46 collaboration-collabora {"level":"info","service":"collaboration","time":"2024-05-14T13:27:50Z","line":"github.com/owncloud/ocis/v2/ocis-pkg/registry/register.go:17","message":"registering external service com.owncloud.collaboration.collaboration-2c9b5312-7c66-44f3-826f-db74b7ea51b4@10.244.3.94:9301"}
collaboration-collabora-5779f854f-pgq46 collaboration-collabora com.owncloud.api.gateway: service not found
    ~/Pr/g/owncloud/ocis-charts/d/ocis-office    collaboration-service *7  k describe -n ocis deployments.apps collaboration-collabora        ✔  34s   minikube ⎈ 
Name:                   collaboration-collabora
Namespace:              ocis
CreationTimestamp:      Tue, 14 May 2024 14:35:29 +0200
Labels:                 app.kubernetes.io/instance=ocis
                        app.kubernetes.io/managed-by=Helm
                        app.kubernetes.io/name=ocis
                        app.kubernetes.io/version=5.0.3
                        helm.sh/chart=ocis-0.7.0
Annotations:            deployment.kubernetes.io/revision: 2
                        meta.helm.sh/release-name: ocis
                        meta.helm.sh/release-namespace: ocis
Selector:               app=collaboration-collabora
Replicas:               1 desired | 1 updated | 2 total | 0 available | 2 unavailable
StrategyType:           RollingUpdate
MinReadySeconds:        0
RollingUpdateStrategy:  25% max unavailable, 25% max surge
Pod Template:
  Labels:  app=collaboration-collabora
           app.kubernetes.io/instance=ocis
           app.kubernetes.io/managed-by=Helm
           app.kubernetes.io/name=ocis
           app.kubernetes.io/version=5.0.3
           helm.sh/chart=ocis-0.7.0
  Containers:
   collaboration-collabora:
    Image:       owncloud/ocis:latest@sha256:e499f3222a8b2e5b91a0a09bdea12cb4e810caa183718cd0a4de7891930e1a5d
    Ports:       9301/TCP, 9300/TCP, 9304/TCP
    Host Ports:  0/TCP, 0/TCP, 0/TCP
    Command:
      ocis
    Args:
      collaboration
      server
    Liveness:  exec [/bin/sh -c curl --silent --fail http://frontend:9140/app/list | grep '"name":"Collabora"'] delay=60s timeout=10s period=20s #success=1 #failure=3
    Environment:
      MICRO_REGISTRY:                             nats-js-kv
      MICRO_REGISTRY_ADDRESS:                     nats:9233
      COLLABORATION_LOG_COLOR:                    false
      COLLABORATION_LOG_LEVEL:                    info
      COLLABORATION_LOG_PRETTY:                   false
      COLLABORATION_TRACING_ENABLED:              false
      COLLABORATION_TRACING_TYPE:                 jaeger
      COLLABORATION_TRACING_ENDPOINT:             
      COLLABORATION_TRACING_COLLECTOR:            
      COLLABORATION_DEBUG_PPROF:                  false
      COLLABORATION_GRPC_ADDR:                    0.0.0.0:9301
      COLLABORATION_HTTP_ADDR:                    0.0.0.0:9300
      COLLABORATION_DEBUG_ADDR:                   0.0.0.0:9304
      COLLABORATION_APP_NAME:                     Collabora
      COLLABORATION_APP_DESCRIPTION:              Collabora
      COLLABORATION_WOPIAPP_INSECURE:             true
      COLLABORATION_CS3API_DATAGATEWAY_INSECURE:  true
      COLLABORATION_APP_LOCKNAME:                 com.github.owncloud.collaboration
      COLLABORATION_APP_ICON:                     https://collabora.kube.owncloud.test/favicon.ico
      COLLABORATION_WOPIAPP_ADDR:                 https://collabora.kube.owncloud.test
      COLLABORATION_WOPIAPP_ADDR:                 wopi-collabora.kube.owncloud.test
      COLLABORATION_JWT_SECRET:                   <set to the key 'jwt-secret' in secret 'jwt-secret'>  Optional: false
    Mounts:                                       <none>
  Volumes:                                        <none>

@wkloucek wkloucek mentioned this pull request May 15, 2024
9 tasks
@wkloucek
Copy link
Contributor Author

@micbar @jvillafanez currently I have this Deployment (see below). It always dies and logs the attached logs. Maybe you have an idea? I'm not sure why it fails because com.owncloud.api.gateway and the service registration of the collaboration service seems to work (from a code perspective this should happen before and cause a bail out!?)

collaboration-collabora-5779f854f-pgq46 collaboration-collabora {"level":"info","service":"collaboration","time":"2024-05-14T13:27:50Z","line":"github.com/owncloud/ocis/v2/ocis-pkg/registry/register.go:17","message":"registering external service com.owncloud.collaboration.collaboration-2c9b5312-7c66-44f3-826f-db74b7ea51b4@10.244.3.94:9301"}
collaboration-collabora-5779f854f-pgq46 collaboration-collabora com.owncloud.api.gateway: service not found

This was actually because I mixed oCIS versions. 5.0.5 seems to be somehow incompatible with latest.

@jvillafanez
Copy link
Member

owncloud/ocis#9253 should be coming "soon". I used the same approach of appending the app name to the service and it worked for me in my local docker environment.

In addition, owncloud/ocis#9366 also coming "soon". You might want to disable it in the short term. I'm not sure if the keys will be generated for collabora, at least not in my environment. I need to touch things in collabora in order to generate the keys

@wkloucek wkloucek force-pushed the collaboration-service branch from eae6b82 to 3fab750 Compare June 18, 2024 12:26
@wkloucek wkloucek force-pushed the collaboration-service branch from 5fe053f to 55c10f4 Compare June 18, 2024 14:24
@d7oc d7oc mentioned this pull request Jul 10, 2024
6 tasks
@case0sh case0sh mentioned this pull request Jul 11, 2024
16 tasks
@wkloucek wkloucek mentioned this pull request Jul 11, 2024
5 tasks
@wkloucek wkloucek requested review from d7oc, case0sh and dschmidt July 12, 2024 12:48
@wkloucek wkloucek marked this pull request as ready for review July 12, 2024 12:49
@wkloucek wkloucek merged commit 342807b into owncloud:main Jul 12, 2024
1 check passed
@wkloucek wkloucek deleted the collaboration-service branch July 12, 2024 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

use collaboration service
3 participants