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

oCIS as of 5.0.0-alpha.1 #419

Merged
merged 5 commits into from
Nov 6, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/ocis/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ maintainers:
url: https://owncloud.com
type: application
version: 0.5.0
appVersion: 4.0.1
appVersion: 5.0.0-alpha.1
kubeVersion: "" # please see https://doc.owncloud.com/ocis/next/deployment/container/orchestration/orchestration.html#get-the-chart for compatible Kubernetes versions
sources:
- https://github.com/owncloud/ocis-charts
Expand Down
2 changes: 1 addition & 1 deletion charts/ocis/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[comment]: # (DONT EDIT THIS FILE, it is autogenerated. Instead you need to edit README.md.gotmpl)

# ownCloud Infinite Scale (oCIS) Helm chart
![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.1](https://img.shields.io/badge/AppVersion-4.0.1-informational?style=flat-square)
![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.0.0-alpha.1](https://img.shields.io/badge/AppVersion-5.0.0--alpha.1-informational?style=flat-square)

Installs [ownCloud Infinite Scale](https://doc.owncloud.com/ocis/next/).

Expand Down
16 changes: 14 additions & 2 deletions charts/ocis/docs/values-desc-table.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -708,12 +708,18 @@ a| [subs=-attributes]
a| [subs=-attributes]
`0`
|
| features.sharing.publiclink.shareMustHavePassword
a| [subs=-attributes]
+bool+
a| [subs=-attributes]
`false`
| Enforce a password on all public link shares.
| features.sharing.publiclink.writeableShareMustHavePassword
a| [subs=-attributes]
+bool+
a| [subs=-attributes]
`false`
| Enforce a password on writable public link shares.
| Enforce a password only on writable public link shares. Is already enforced if `features.sharing.publiclink.shareMustHavePassword` option is set to `true``.
| features.sharing.users.resharing
a| [subs=-attributes]
+bool+
Expand Down Expand Up @@ -802,7 +808,7 @@ a| [subs=-attributes]
a| [subs=-attributes]
+string+
a| [subs=-attributes]
`"7684100b5c469dbd311a92e2ce99c12f6f6dd390bb2088eb1c6a8b18a849c13e"`
`"7cc907469deb5a2712dba96c3d6985be321a43870fe5502fad1fdfbc27620fed"`
| Image sha / digest (optional).
| image.tag
a| [subs=-attributes]
Expand Down Expand Up @@ -2322,6 +2328,12 @@ a| [subs=-attributes]
a| [subs=-attributes]
`nil`
| Configures the maximum file size in bytes that is allowed for content extraction. For the default value see https://doc.owncloud.com/ocis/next/deployment/services/s-list/search.html
| services.search.extractor.tika.cleanStopWords
a| [subs=-attributes]
+bool+
a| [subs=-attributes]
`true`
| Defines if stop words should be cleaned or not.
| services.search.extractor.tika.url
a| [subs=-attributes]
+string+
Expand Down
10 changes: 8 additions & 2 deletions charts/ocis/docs/values.adoc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ image:
# -- Image tag. Defaults to the chart's appVersion.
tag: "latest"
# -- Image sha / digest (optional).
sha: "7684100b5c469dbd311a92e2ce99c12f6f6dd390bb2088eb1c6a8b18a849c13e" # oCIS as of 18th October 2023
sha: "7cc907469deb5a2712dba96c3d6985be321a43870fe5502fad1fdfbc27620fed" # oCIS as of 5.0.0-alpha.1
# -- Image pull policy
pullPolicy: IfNotPresent
# -- Names of the secret containing the credentials to pull an image from the registry. More
Expand Down Expand Up @@ -202,8 +202,12 @@ features:
minLengthLimit: 3
# Sharing per public link related setings
publiclink:
# -- Enforce a password on writable public link shares.
# -- Enforce a password on all public link shares.
shareMustHavePassword: false
# -- Enforce a password only on writable public link shares.
# Is already enforced if `features.sharing.publiclink.shareMustHavePassword` option is set to `true``.
writeableShareMustHavePassword: false

# automatically accept incoming shares
autoAcceptShares: true
# password policies for share passwords
Expand Down Expand Up @@ -1231,6 +1235,8 @@ services:
tika:
# -- Set the URL to Tika. Only applicable if `services.search.extractor.type` == `tika`.
url: http://tika.tika.svc.cluster.local:9998
# -- Defines if stop words should be cleaned or not.
cleanStopWords: true
# -- Persistence settings.
# @default -- see detailed persistence configuration options below
persistence:
Expand Down
3 changes: 3 additions & 0 deletions charts/ocis/templates/frontend/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ spec:
- name: FRONTEND_OCS_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD
value: {{ .Values.features.sharing.publiclink.writeableShareMustHavePassword | quote }}

- name: FRONTEND_OCS_PUBLIC_SHARE_MUST_HAVE_PASSWORD
value: {{ .Values.features.sharing.publiclink.shareMustHavePassword | quote }}

- name: FRONTEND_SEARCH_MIN_LENGTH
value: {{ .Values.features.sharing.users.search.minLengthLimit | quote }}

Expand Down
3 changes: 3 additions & 0 deletions charts/ocis/templates/search/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ spec:

- name: SEARCH_EXTRACTOR_TIKA_TIKA_URL
value: {{ .Values.services.search.extractor.tika.url | quote }}

- name: SEARCH_EXTRACTOR_TIKA_CLEAN_STOP_WORDS
value: {{ .Values.services.search.extractor.tika.cleanStopWords | quote }}
{{- else }}
- name: SEARCH_EXTRACTOR_TYPE
value: basic
Expand Down
4 changes: 4 additions & 0 deletions charts/ocis/templates/sharing/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ spec:
- name: SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD
value: {{ .Values.features.sharing.publiclink.writeableShareMustHavePassword | quote }}

# TODO: does not exist currenlty. Probably should be there because we also have SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD!?
wkloucek marked this conversation as resolved.
Show resolved Hide resolved
# - name: SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD
# value: {{ .Values.features.sharing.publiclink.shareMustHavePassword | quote }}

# user sharing
- name: SHARING_USER_DRIVER
value: jsoncs3
Expand Down
10 changes: 8 additions & 2 deletions charts/ocis/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ image:
# -- Image tag. Defaults to the chart's appVersion.
tag: "latest"
# -- Image sha / digest (optional).
sha: "7684100b5c469dbd311a92e2ce99c12f6f6dd390bb2088eb1c6a8b18a849c13e" # oCIS as of 18th October 2023
sha: "7cc907469deb5a2712dba96c3d6985be321a43870fe5502fad1fdfbc27620fed" # oCIS as of 5.0.0-alpha.1
# -- Image pull policy
pullPolicy: IfNotPresent
# -- Names of the secret containing the credentials to pull an image from the registry. More
Expand Down Expand Up @@ -201,8 +201,12 @@ features:
minLengthLimit: 3
# Sharing per public link related setings
publiclink:
# -- Enforce a password on writable public link shares.
# -- Enforce a password on all public link shares.
shareMustHavePassword: false
# -- Enforce a password only on writable public link shares.
# Is already enforced if `features.sharing.publiclink.shareMustHavePassword` option is set to `true``.
writeableShareMustHavePassword: false

# automatically accept incoming shares
autoAcceptShares: true
# password policies for share passwords
Expand Down Expand Up @@ -1230,6 +1234,8 @@ services:
tika:
# -- Set the URL to Tika. Only applicable if `services.search.extractor.type` == `tika`.
url: http://tika.tika.svc.cluster.local:9998
# -- Defines if stop words should be cleaned or not.
cleanStopWords: true
# -- Persistence settings.
# @default -- see detailed persistence configuration options below
persistence:
Expand Down