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

prepare oCIS 5.0.0-rc.3 #474

Merged
merged 3 commits into from
Jan 30, 2024
Merged

prepare oCIS 5.0.0-rc.3 #474

merged 3 commits into from
Jan 30, 2024

Conversation

wkloucek
Copy link
Contributor

@wkloucek wkloucek commented Jan 29, 2024

Description

  • use 5.0.0-rc.3
  • expose request concurrency settings for Web
  • fix some documentation strings
  • add post processing restart jobs

Related Issue

Motivation and Context

How Has This Been Tested?

Test setup:

diff --git a/deployments/ocis-nats/helmfile.yaml b/deployments/ocis-nats/helmfile.yaml
index ec1f0e8..0ed6902 100644
--- a/deployments/ocis-nats/helmfile.yaml
+++ b/deployments/ocis-nats/helmfile.yaml
@@ -110,6 +110,10 @@ releases:
           nodes:
             - nats.ocis-nats.svc.cluster.local:4222
 
+      - features:
+          virusscan:
+            enabled: true
+
       - services:
           idm:
             persistence:
@@ -130,6 +134,18 @@ releases:
           storageusers:
             persistence:
               enabled: true
+            maintenance:
+              cleanUpExpiredUploads:
+                enabled: true
+              purgeExpiredTrashBinItems:
+                enabled: true
+
+          postprocessing:
+            maintenance:
+              restartPostprocessingFinished:
+                enabled: true
+              restartPostprocessingVirusscan:
+                enabled: true
 
           store:
             persistence:
@@ -138,7 +154,16 @@ releases:
           thumbnails:
             persistence:
               enabled: true
+            maintenance:
+              cleanUpOldThumbnails:
+                enabled: true
 
           web:
             persistence:
               enabled: true
+            config:
+              concurrency:
+                resourceBatchActionRequests: 1
+                sseRequests: 1
+                shareCreateRequests: 1
+                shareListRequests: 1
  • jobs, by subscribing to the main-queue in nats-box:
[#3] Received on "main-queue" with reply "_INBOX.IMNGj4x5eQToLmGdl8KLwB.5Wqj8jno"
{"ID":"91241888-a873-4091-aa4a-5f5a6ee0e4af","Topic":"main-queue","Timestamp":"2024-01-30T10:54:01.427013357Z","Metadata":{"eventid":"0a04049d-24bb-40b6-9ed6-ad8363600099","eventtype":"events.ResumePostprocessing","traceparent":""},"Payload":"eyJVcGxvYWRJRCI6IiIsIlN0ZXAiOiJ2aXJ1c3NjYW4iLCJUaW1lc3RhbXAiOnsic2Vjb25kcyI6MTcwNjYxMjA0MSwibmFub3MiOjQyNjk5Mzg0MH19"}


[#4] Received on "main-queue" with reply "_INBOX.sgaZVlefFO7Aq79k7WuAUU.kq1ON8Ps"
{"ID":"1f7a2f73-8eb2-49f7-adb2-2f418d5da296","Topic":"main-queue","Timestamp":"2024-01-30T10:54:01.467230399Z","Metadata":{"eventid":"a9b35b00-1081-4c2a-bbce-34d7901c6e8b","eventtype":"events.ResumePostprocessing","traceparent":""},"Payload":"eyJVcGxvYWRJRCI6IiIsIlN0ZXAiOiJmaW5pc2hlZCIsIlRpbWVzdGFtcCI6eyJzZWNvbmRzIjoxNzA2NjEyMDQxLCJuYW5vcyI6NDY3MjA5MDg4fX0="}


[#5] Received on "main-queue" with reply "_INBOX.xc9Qf6xIxJx3dR3VgQYl9G.2YCXr5Nz"
{"ID":"8cc328e8-697f-4396-b1b2-4f3f80fafb00","Topic":"main-queue","Timestamp":"2024-01-30T10:54:01.575920338Z","Metadata":{"eventid":"267fbcf9-fe82-4e2c-b73a-314839685743","eventtype":"event.PurgeTrashBin","traceparent":""},"Payload":"eyJFeGVjdXRhbnRJRCI6bnVsbCwiRXhlY3V0aW9uVGltZSI6IjIwMjQtMDEtMzBUMTA6NTQ6MDEuNTc1ODk3MTM0WiJ9"}

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 wkloucek marked this pull request as ready for review January 30, 2024 10:59
@wkloucek wkloucek requested review from d7oc, kobergj and butonic January 30, 2024 10:59
Copy link
Contributor

@kobergj kobergj left a comment

Choose a reason for hiding this comment

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

Looks good. Some configuration could be removed. But not critical

charts/ocis/templates/postprocessing/jobs.yaml Outdated Show resolved Hide resolved
charts/ocis/templates/postprocessing/jobs.yaml Outdated Show resolved Hide resolved
@wkloucek wkloucek merged commit ebbd8c0 into next Jan 30, 2024
1 check passed
@delete-merged-branch delete-merged-branch bot deleted the 5.0.0-rc.3 branch January 30, 2024 12:46
@wkloucek wkloucek mentioned this pull request Mar 18, 2024
11 tasks
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.

2 participants