Merge pull request #656 from wkloucek/stable-5-thumbnails-hardening

stable-5: thumbnails hardening
owncloud · Jul 24, 2024 · 3febf2b · 3febf2b
2 parents da776ba + 97cdc02
commit 3febf2b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/charts/ocis/docs/values-desc-table.adoc b/charts/ocis/docs/values-desc-table.adoc
@@ -4068,6 +4068,12 @@ a| [subs=-attributes]
 a| [subs=-attributes]
 `""`
 | Per-service priorityClassName configuration. Overrides the default setting from `priorityClassName` if set.
+| services.thumbnails.quota.maxConcurrencyRequests
+a| [subs=-attributes]
++int+
+a| [subs=-attributes]
+`0`
+| Number of maximum concurrent thumbnail requests. Default is 0 which is unlimited.
 | services.thumbnails.resources
 a| [subs=-attributes]
 +object+

diff --git a/charts/ocis/docs/values.adoc.yaml b/charts/ocis/docs/values.adoc.yaml
@@ -1913,6 +1913,9 @@ services:
   # -- THUMBNAILS service.
   # @default -- see detailed service configuration options below
   thumbnails:
+    quota:
+      # -- Number of maximum concurrent thumbnail requests. Default is 0 which is unlimited.
+      maxConcurrencyRequests: 0
     # -- Persistence settings.
     # @default -- see detailed persistence configuration options below
     persistence:

diff --git a/charts/ocis/templates/thumbnails/deployment.yaml b/charts/ocis/templates/thumbnails/deployment.yaml
@@ -66,6 +66,9 @@ spec:
             - name: THUMBNAILS_DATA_ENDPOINT
               value: http://{{ .appName }}:9186/thumbnails/data
 
+            - name: THUMBNAILS_MAX_CONCURRENT_REQUESTS
+              value: {{ .Values.services.thumbnails.quota.maxConcurrencyRequests | quote }}
+
             - name: THUMBNAILS_WEBDAVSOURCE_INSECURE
               value: {{ .Values.insecure.ocisHttpApiInsecure | quote }}
 

diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml
@@ -1912,6 +1912,9 @@ services:
   # -- THUMBNAILS service.
   # @default -- see detailed service configuration options below
   thumbnails:
+    quota:
+      # -- Number of maximum concurrent thumbnail requests. Default is 0 which is unlimited.
+      maxConcurrencyRequests: 0
     # -- Persistence settings.
     # @default -- see detailed persistence configuration options below
     persistence: