Skip to content

Commit bb1d4f8

Browse files
authored
Fixed defaults for personalDeleteBefore and personalDeleteBefore (#907)
* - fixed defaults for personalDeleteBefore and personalDeleteBefore * - added regex for validation
1 parent d4ca4ea commit bb1d4f8

4 files changed

Lines changed: 22 additions & 16 deletions

File tree

charts/ocis/docs/values-desc-table.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3982,14 +3982,14 @@ a| [subs=-attributes]
39823982
a| [subs=-attributes]
39833983
+string+
39843984
a| [subs=-attributes]
3985-
`"30d"`
3986-
| Setting that makes the command delete all trashed personal files older than the value. The value is a number and a unit "d", "h", "m", "s".
3985+
`"720h"`
3986+
| Setting that makes the command delete all trashed personal files older than the value. The value is a number and a unit "h", "m", "s", "ms".
39873987
| services.storageusers.maintenance.purgeExpiredTrashBinItems.projectDeleteBefore
39883988
a| [subs=-attributes]
39893989
+string+
39903990
a| [subs=-attributes]
3991-
`"30d"`
3992-
| Setting that makes the command delete all trashed project files older than the value. The value is a number and a unit "d", "h", "m", "s".
3991+
`"720h"`
3992+
| Setting that makes the command delete all trashed project files older than the value. The value is a number and a unit "h", "m", "s", "ms".
39933993
| services.storageusers.maintenance.purgeExpiredTrashBinItems.schedule
39943994
a| [subs=-attributes]
39953995
+string+

charts/ocis/docs/values.adoc.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4611,16 +4611,18 @@ services:
46114611
startingDeadlineSeconds: 600
46124612
# @schema
46134613
# type: string
4614+
# pattern: ^[0-9]*([hms]|ms)$
46144615
# required: true
46154616
# @schema
4616-
# -- Setting that makes the command delete all trashed personal files older than the value. The value is a number and a unit "d", "h", "m", "s".
4617-
personalDeleteBefore: 30d
4617+
# -- Setting that makes the command delete all trashed personal files older than the value. The value is a number and a unit "h", "m", "s", "ms".
4618+
personalDeleteBefore: 720h
46184619
# @schema
46194620
# type: string
4621+
# pattern: ^[0-9]*([hms]|ms)$
46204622
# required: true
46214623
# @schema
4622-
# -- Setting that makes the command delete all trashed project files older than the value. The value is a number and a unit "d", "h", "m", "s".
4623-
projectDeleteBefore: 30d
4624+
# -- Setting that makes the command delete all trashed project files older than the value. The value is a number and a unit "h", "m", "s", "ms".
4625+
projectDeleteBefore: 720h
46244626
# Uploads that were not postprocessed can be automatically processed again by enabling the restart job.
46254627
restartPostprocessing:
46264628
# @schema

charts/ocis/values.schema.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9932,15 +9932,17 @@
99329932
"type": "boolean"
99339933
},
99349934
"personalDeleteBefore": {
9935-
"default": "30d",
9936-
"description": "Setting that makes the command delete all trashed personal files older than the value. The value is a number and a unit \"d\", \"h\", \"m\", \"s\".",
9935+
"default": "720h",
9936+
"description": "Setting that makes the command delete all trashed personal files older than the value. The value is a number and a unit \"h\", \"m\", \"s\", \"ms\".",
9937+
"pattern": "^[0-9]*([hms]|ms)$",
99379938
"required": [],
99389939
"title": "personalDeleteBefore",
99399940
"type": "string"
99409941
},
99419942
"projectDeleteBefore": {
9942-
"default": "30d",
9943-
"description": "Setting that makes the command delete all trashed project files older than the value. The value is a number and a unit \"d\", \"h\", \"m\", \"s\".",
9943+
"default": "720h",
9944+
"description": "Setting that makes the command delete all trashed project files older than the value. The value is a number and a unit \"h\", \"m\", \"s\", \"ms\".",
9945+
"pattern": "^[0-9]*([hms]|ms)$",
99449946
"required": [],
99459947
"title": "projectDeleteBefore",
99469948
"type": "string"

charts/ocis/values.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4610,16 +4610,18 @@ services:
46104610
startingDeadlineSeconds: 600
46114611
# @schema
46124612
# type: string
4613+
# pattern: ^[0-9]*([hms]|ms)$
46134614
# required: true
46144615
# @schema
4615-
# -- Setting that makes the command delete all trashed personal files older than the value. The value is a number and a unit "d", "h", "m", "s".
4616-
personalDeleteBefore: 30d
4616+
# -- Setting that makes the command delete all trashed personal files older than the value. The value is a number and a unit "h", "m", "s", "ms".
4617+
personalDeleteBefore: 720h
46174618
# @schema
46184619
# type: string
4620+
# pattern: ^[0-9]*([hms]|ms)$
46194621
# required: true
46204622
# @schema
4621-
# -- Setting that makes the command delete all trashed project files older than the value. The value is a number and a unit "d", "h", "m", "s".
4622-
projectDeleteBefore: 30d
4623+
# -- Setting that makes the command delete all trashed project files older than the value. The value is a number and a unit "h", "m", "s", "ms".
4624+
projectDeleteBefore: 720h
46234625
# Uploads that were not postprocessed can be automatically processed again by enabling the restart job.
46244626
restartPostprocessing:
46254627
# @schema

0 commit comments

Comments
 (0)