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

Add OCM support #701

Merged
merged 34 commits into from
Nov 8, 2024
Merged

Add OCM support #701

merged 34 commits into from
Nov 8, 2024

Conversation

d7oc
Copy link
Contributor

@d7oc d7oc commented Aug 29, 2024

Description

This PR adds OCM support.

Related Issue

Motivation and Context

Feature request

How Has This Been Tested?

Go to deployments/ocm-install, execute helmfile sync. Log in to the two systems, select app "ScienceMesh" and create a share on one system and add the invitation to the other system.

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:

d7oc added 7 commits October 8, 2024 17:22
- added persistant volume (RWO only)
- added configmap with configurable providers
- added OCIS_ENABLE_OCM to fronend and graph services
- added deployment example
- added OCM_JWT_SECRET
@d7oc
Copy link
Contributor Author

d7oc commented Oct 8, 2024

Update PR to lastest main.

@d7oc d7oc marked this pull request as ready for review October 9, 2024 09:01
- added working example deployment
@d7oc
Copy link
Contributor Author

d7oc commented Oct 9, 2024

Working now. Ready for review.

@d7oc d7oc requested review from wkloucek, case0sh and kobergj October 9, 2024 09:19
charts/ocis/values.yaml Outdated Show resolved Hide resolved
charts/ocis/values.yaml Outdated Show resolved Hide resolved
charts/ocis/values.yaml Show resolved Hide resolved
charts/ocis/values.yaml Outdated Show resolved Hide resolved
charts/ocis/values.yaml Outdated Show resolved Hide resolved
charts/ocis/templates/ocm/deployment.yaml Outdated Show resolved Hide resolved
charts/ocis/templates/ocm/deployment.yaml Show resolved Hide resolved
charts/ocis/templates/NOTES.txt Show resolved Hide resolved
deployments/ocm-install/helmfile.yaml Outdated Show resolved Hide resolved
charts/ocis/docs/values-desc-table.adoc Show resolved Hide resolved
@wkloucek
Copy link
Contributor

Looks to me like OCM invitations are stored in-memory: owncloud/ocis#10354

@butonic is that true?

@wkloucek
Copy link
Contributor

Also I couldn't find out what's wrong when setting OCM_OCM_PROVIDER_AUTHORIZER_VERIFY_REQUEST_HOSTNAME to true, see owncloud/ocis#10355

@wkloucek
Copy link
Contributor

Looks to me like OCM invitations are stored in-memory: owncloud/ocis#10354

fixed by enabling persistence in the deployment example: fb4b91b

@wkloucek
Copy link
Contributor

I couldn't even do basic testing beyond sharing files: owncloud/ocis#10358

@wkloucek
Copy link
Contributor

I couldn't even do basic testing beyond sharing files: owncloud/ocis#10358

will be fixed by adding OCM_OCM_STORAGE_DATA_SERVER_URL after owncloud/ocis#10440 was released

@wkloucek
Copy link
Contributor

we also need to remove OCM_OCM_PROVIDER_AUTHORIZER_VERIFY_REQUEST_HOSTNAME after owncloud/ocis#10425 was released

@wkloucek
Copy link
Contributor

By using the latest available oCIS code:

diff --git a/deployments/ocm-install/helmfile.yaml b/deployments/ocm-install/helmfile.yaml
index 7336329..e9db100 100644
--- a/deployments/ocm-install/helmfile.yaml
+++ b/deployments/ocm-install/helmfile.yaml
@@ -22,6 +22,9 @@ releases:
     chart: ../../charts/ocis
     namespace: ocis
     values:
+      - image:
+          tag: master
+          sha: 2b7aec0589617869ea6dcb30fbb805fbb93dabb489978a47c77653b8b99ed1bb
       - externalDomain: ocis.kube.owncloud.test
       - ingress:
           enabled: true
@@ -219,6 +222,9 @@ releases:
     chart: ../../charts/ocis
     namespace: ocis2
     values:
+      - image:
+          tag: master
+          sha: 2b7aec0589617869ea6dcb30fbb805fbb93dabb489978a47c77653b8b99ed1bb
       - externalDomain: ocis2.kube.owncloud.test
       - ingress:
           enabled: true

I was actually able to share and use shared files via OCM 👍

From my side this PR is in a merge able state when we have a oCIS 6.7.0 rolling release.

Copy link
Contributor

@wkloucek wkloucek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mergeable when we have a oCIS 6.7.0 rolling release

@wkloucek wkloucek mentioned this pull request Nov 8, 2024
11 tasks
Copy link
Contributor

@wkloucek wkloucek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also works with oCIS 7.0.0-rc.1

@wkloucek wkloucek merged commit 867e17c into main Nov 8, 2024
1 check passed
@wkloucek wkloucek deleted the ocm_support branch November 8, 2024 12:31
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.

OCM support
5 participants