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

Jump to bottom

Nextcloud collabora #245

Merged
merged 12 commits into from
Nov 14, 2024
Merged

Nextcloud collabora #245

merged 12 commits into from
Nov 14, 2024

Conversation

wejdross
Copy link
Member

@wejdross wejdross commented Oct 16, 2024 •
edited
Loading

Summary

  • Automatic installation of Collabora with splitted logic for Openshift and Kind clusters
  • Collabora works with SSL, Ingress/Route calls it using SSL, customers connects to Ingress/Route using SSL
  • There're many "tricky" hacks mostly because Collabora is not really a cloud native software and requires special handling.

Test case for LAB cluster:

apiVersion: vshn.appcat.vshn.io/v1
kind: VSHNNextcloud
metadata:
  name: nextcloud-app1-prod 
  namespace: wejdross-testing
spec:
  parameters:
    service:
      collabora:
        enabled: true
        fqdn: my-collabora-code.wejdross-testing.svc.cluster.local
      fqdn: nxcloud.apps.lab-cloudscale-rma-0.appuio.cloud
      version: "29" 
      useExternalPostgreSQL: true 
      postgreSQLParameters: {} 
    security:
      deletionProtection: false
    size: 
      plan: standard-4
  writeConnectionSecretToRef:
    name: nextcloud-creds

Checklist

  • Categorize the PR by setting a good title and adding one of the labels:
    bug, enhancement, documentation, change, breaking, dependency
    as they show up in the changelog
  • Update tests.
  • Link this PR to related issues.

@wejdross wejdross added enhancement New feature or request minor labels Oct 16, 2024
@wejdross wejdross force-pushed the nextcloud_collabora branch from cfd372d to 7d04bef Compare October 18, 2024 09:39
@TheBigLee TheBigLee force-pushed the nextcloud_collabora branch 2 times, most recently from 72b4b09 to 386f856 Compare October 22, 2024 11:34
@wejdross wejdross force-pushed the nextcloud_collabora branch 3 times, most recently from 76a6e22 to c744042 Compare November 4, 2024 15:18
@wejdross wejdross force-pushed the nextcloud_collabora branch from 61bf4bc to 2670afc Compare November 7, 2024 08:37
@wejdross wejdross requested review from zugao, Kidswiss and TheBigLee and removed request for zugao, Kidswiss and TheBigLee November 7, 2024 09:29
@wejdross wejdross force-pushed the nextcloud_collabora branch 2 times, most recently from 7ba9342 to d012a52 Compare November 7, 2024 09:46
zugao
zugao reviewed Nov 7, 2024
View reviewed changes
Copy link
Collaborator

@zugao zugao left a comment

Choose a reason for hiding this comment

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

Some small nitpicks but the RSA Private key exposed like that is a no go for me, there should be another way to handle this

apis/vshn/v1/vshn_nextcloud.go Show resolved Hide resolved
pkg/comp-functions/functions/vshnnextcloud/billing.go Outdated Show resolved Hide resolved
pkg/comp-functions/functions/vshnnextcloud/files/sample-key.rsa Outdated Show resolved Hide resolved
pkg/comp-functions/functions/vshnnextcloud/files/install-collabora.sh Outdated Show resolved Hide resolved
@wejdross wejdross force-pushed the nextcloud_collabora branch from d012a52 to 8fb2232 Compare November 7, 2024 13:40
@wejdross wejdross requested review from zugao and Kidswiss November 8, 2024 08:54
Kidswiss
Kidswiss requested changes Nov 8, 2024
View reviewed changes
apis/vshn/v1/vshn_nextcloud.go Show resolved Hide resolved
pkg/comp-functions/functions/vshnnextcloud/collabora.go Outdated Show resolved Hide resolved
pkg/comp-functions/functions/vshnnextcloud/collabora.go Outdated Show resolved Hide resolved
pkg/comp-functions/functions/vshnnextcloud/collabora.go Outdated Show resolved Hide resolved
pkg/comp-functions/functions/vshnnextcloud/collabora.go Outdated Show resolved Hide resolved
pkg/comp-functions/functions/vshnnextcloud/collabora.go Outdated Show resolved Hide resolved
pkg/comp-functions/functions/vshnnextcloud/collabora.go Outdated Show resolved Hide resolved
pkg/comp-functions/functions/vshnnextcloud/collabora.go Outdated Show resolved Hide resolved
@wejdross wejdross requested a review from zugao November 11, 2024 07:52
Kidswiss
Kidswiss requested changes Nov 11, 2024
View reviewed changes
apis/vshn/v1/vshn_nextcloud.go Show resolved Hide resolved
pkg/comp-functions/functions/vshnnextcloud/collabora.go Outdated Show resolved Hide resolved
pkg/comp-functions/functions/vshnnextcloud/collabora.go Outdated Show resolved Hide resolved
pkg/comp-functions/functions/vshnnextcloud/collabora.go Outdated Show resolved Hide resolved
@wejdross wejdross mentioned this pull request Nov 11, 2024
Merged
lukasz.widera@vshn.ch added 2 commits November 11, 2024 15:52
@wejdross wejdross force-pushed the nextcloud_collabora branch from 246cb07 to 84183b1 Compare November 11, 2024 16:16
@wejdross wejdross requested a review from Kidswiss November 11, 2024 16:17
wejdross
wejdross commented Nov 12, 2024
View reviewed changes
pkg/comp-functions/functions/vshnnextcloud/deploy.go
Comment on lines -138 to -143
func addPostgreSQL(svc *runtime.ServiceRuntime, comp *vshnv1.VSHNNextcloud) error {
// Unfortunately k8up and stackgres backups don't match up very well...
// if no daily backup is set we just do the default.
retention := 6
if comp.Spec.Parameters.Backup.Retention.KeepDaily != 0 {
retention = comp.Spec.Parameters.Backup.Retention.KeepDaily
Copy link
Member Author

Choose a reason for hiding this comment

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

I'm deleting this function as it's unused, we switched logic to "newPostgresqlDependencyBuilder"

zugao
zugao reviewed Nov 12, 2024
View reviewed changes
Copy link
Collaborator

@zugao zugao left a comment

Choose a reason for hiding this comment

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

The code looks ok now but I would like to play with it in the lab cluster. It seems for now it's not yet deployed

@wejdross wejdross requested a review from zugao November 12, 2024 09:36
Kidswiss
Kidswiss approved these changes Nov 12, 2024
View reviewed changes
pkg/comp-functions/runtime/function_mgr.go Show resolved Hide resolved
pkg/comp-functions/runtime/function_mgr.go Outdated Show resolved Hide resolved
pkg/comp-functions/runtime/function_mgr.go Show resolved Hide resolved
pkg/comp-functions/functions/common/rbac.go Show resolved Hide resolved
@wejdross wejdross requested review from zugao and Kidswiss November 12, 2024 13:29
zugao
zugao approved these changes Nov 12, 2024
View reviewed changes
Copy link
Collaborator

@zugao zugao left a comment

Choose a reason for hiding this comment

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

LGTM. But I would like to test this in lab, let me know

@wejdross wejdross requested a review from zugao November 13, 2024 14:00
@wejdross wejdross merged commit f615101 into master Nov 14, 2024
8 checks passed
@wejdross wejdross self-assigned this Nov 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheBigLee TheBigLee Awaiting requested review from TheBigLee

@Kidswiss Kidswiss Awaiting requested review from Kidswiss

@zugao zugao Awaiting requested review from zugao

Assignees

@wejdross wejdross

Labels
enhancement New feature or request minor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wejdross @Kidswiss @zugao