From 7d999337945b54cdf86d796eb6764059541a5356 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 27 Oct 2023 12:36:10 +0200 Subject: [PATCH 1/5] use oCIS as of 27th October 2023, add some configuration options --- charts/ocis/docs/values-desc-table.adoc | 2 +- charts/ocis/docs/values.adoc.yaml | 2 +- charts/ocis/templates/frontend/deployment.yaml | 3 +++ charts/ocis/templates/search/deployment.yaml | 3 +++ charts/ocis/templates/sharing/deployment.yaml | 4 ++++ charts/ocis/values.yaml | 6 +++++- 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/charts/ocis/docs/values-desc-table.adoc b/charts/ocis/docs/values-desc-table.adoc index 0e541c39e..118fce1e2 100644 --- a/charts/ocis/docs/values-desc-table.adoc +++ b/charts/ocis/docs/values-desc-table.adoc @@ -802,7 +802,7 @@ a| [subs=-attributes] a| [subs=-attributes] +string+ a| [subs=-attributes] -`"7684100b5c469dbd311a92e2ce99c12f6f6dd390bb2088eb1c6a8b18a849c13e"` +`"8489c25825bae631c10adf843945291ac2c8da84b3f50826d897b25529dde4bb"` | Image sha / digest (optional). | image.tag a| [subs=-attributes] diff --git a/charts/ocis/docs/values.adoc.yaml b/charts/ocis/docs/values.adoc.yaml index 95c9e7479..c6ff25892 100644 --- a/charts/ocis/docs/values.adoc.yaml +++ b/charts/ocis/docs/values.adoc.yaml @@ -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: "8489c25825bae631c10adf843945291ac2c8da84b3f50826d897b25529dde4bb" # oCIS as of 27th October 2023 # -- Image pull policy pullPolicy: IfNotPresent # -- Names of the secret containing the credentials to pull an image from the registry. More diff --git a/charts/ocis/templates/frontend/deployment.yaml b/charts/ocis/templates/frontend/deployment.yaml index 377d7f1c8..afbf11b0c 100644 --- a/charts/ocis/templates/frontend/deployment.yaml +++ b/charts/ocis/templates/frontend/deployment.yaml @@ -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_READABLE_SHARE_MUST_HAVE_PASSWORD + value: {{ .Values.features.sharing.publiclink.readableShareMustHavePassword | quote }} + - name: FRONTEND_SEARCH_MIN_LENGTH value: {{ .Values.features.sharing.users.search.minLengthLimit | quote }} diff --git a/charts/ocis/templates/search/deployment.yaml b/charts/ocis/templates/search/deployment.yaml index 5e6005f96..f839c5a01 100644 --- a/charts/ocis/templates/search/deployment.yaml +++ b/charts/ocis/templates/search/deployment.yaml @@ -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 diff --git a/charts/ocis/templates/sharing/deployment.yaml b/charts/ocis/templates/sharing/deployment.yaml index def3bec6b..c7182b433 100644 --- a/charts/ocis/templates/sharing/deployment.yaml +++ b/charts/ocis/templates/sharing/deployment.yaml @@ -78,6 +78,10 @@ spec: - name: SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD value: {{ .Values.features.sharing.publiclink.writeableShareMustHavePassword | quote }} + - name: SHARING__PUBLIC_READABLE_SHARE_MUST_HAVE_PASSWORD + value: {{ .Values.features.sharing.publiclink.readableShareMustHavePassword | quote }} + + # user sharing - name: SHARING_USER_DRIVER value: jsoncs3 diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml index ad2c2d180..dfea4f84a 100644 --- a/charts/ocis/values.yaml +++ b/charts/ocis/values.yaml @@ -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: "8489c25825bae631c10adf843945291ac2c8da84b3f50826d897b25529dde4bb" # oCIS as of 27th October 2023 # -- Image pull policy pullPolicy: IfNotPresent # -- Names of the secret containing the credentials to pull an image from the registry. More @@ -203,6 +203,8 @@ features: publiclink: # -- Enforce a password on writable public link shares. writeableShareMustHavePassword: false + # -- Enforce a password on readable public link shares. + readableShareMustHavePassword: false # automatically accept incoming shares autoAcceptShares: true # password policies for share passwords @@ -1230,6 +1232,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: From 31cb2540f8889e4b2df8c0a5f053df1f493f03d0 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 27 Oct 2023 13:40:21 +0200 Subject: [PATCH 2/5] adapt public link sharing settings --- charts/ocis/docs/values-desc-table.adoc | 14 +++++++++++++- charts/ocis/docs/values.adoc.yaml | 8 +++++++- charts/ocis/templates/frontend/deployment.yaml | 4 ++-- charts/ocis/templates/sharing/deployment.yaml | 5 ++--- charts/ocis/values.yaml | 8 +++++--- 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/charts/ocis/docs/values-desc-table.adoc b/charts/ocis/docs/values-desc-table.adoc index 118fce1e2..abee17d70 100644 --- a/charts/ocis/docs/values-desc-table.adoc +++ b/charts/ocis/docs/values-desc-table.adoc @@ -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+ @@ -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+ diff --git a/charts/ocis/docs/values.adoc.yaml b/charts/ocis/docs/values.adoc.yaml index c6ff25892..b1527fe7c 100644 --- a/charts/ocis/docs/values.adoc.yaml +++ b/charts/ocis/docs/values.adoc.yaml @@ -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 @@ -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: diff --git a/charts/ocis/templates/frontend/deployment.yaml b/charts/ocis/templates/frontend/deployment.yaml index afbf11b0c..d0f9f78ae 100644 --- a/charts/ocis/templates/frontend/deployment.yaml +++ b/charts/ocis/templates/frontend/deployment.yaml @@ -94,8 +94,8 @@ spec: - name: FRONTEND_OCS_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD value: {{ .Values.features.sharing.publiclink.writeableShareMustHavePassword | quote }} - - name: FRONTEND_OCS_PUBLIC_READABLE_SHARE_MUST_HAVE_PASSWORD - value: {{ .Values.features.sharing.publiclink.readableShareMustHavePassword | 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 }} diff --git a/charts/ocis/templates/sharing/deployment.yaml b/charts/ocis/templates/sharing/deployment.yaml index c7182b433..e2b957fac 100644 --- a/charts/ocis/templates/sharing/deployment.yaml +++ b/charts/ocis/templates/sharing/deployment.yaml @@ -78,9 +78,8 @@ spec: - name: SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD value: {{ .Values.features.sharing.publiclink.writeableShareMustHavePassword | quote }} - - name: SHARING__PUBLIC_READABLE_SHARE_MUST_HAVE_PASSWORD - value: {{ .Values.features.sharing.publiclink.readableShareMustHavePassword | quote }} - + - name: SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD + value: {{ .Values.features.sharing.publiclink.shareMustHavePassword | quote }} # user sharing - name: SHARING_USER_DRIVER diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml index dfea4f84a..94cbbbb8e 100644 --- a/charts/ocis/values.yaml +++ b/charts/ocis/values.yaml @@ -201,10 +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 - # -- Enforce a password on readable public link shares. - readableShareMustHavePassword: false + # automatically accept incoming shares autoAcceptShares: true # password policies for share passwords From 172b151acc1f7d766efefcd51eeee2ee8302d8d0 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Thu, 2 Nov 2023 07:43:57 +0100 Subject: [PATCH 3/5] comment usage of SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD --- charts/ocis/templates/sharing/deployment.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/ocis/templates/sharing/deployment.yaml b/charts/ocis/templates/sharing/deployment.yaml index e2b957fac..c1ef0e7bc 100644 --- a/charts/ocis/templates/sharing/deployment.yaml +++ b/charts/ocis/templates/sharing/deployment.yaml @@ -78,8 +78,9 @@ spec: - name: SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD value: {{ .Values.features.sharing.publiclink.writeableShareMustHavePassword | quote }} - - name: SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD - value: {{ .Values.features.sharing.publiclink.shareMustHavePassword | quote }} + # TODO: does not exist currenlty. Probably should be there because we also have SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD!? + # - name: SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD + # value: {{ .Values.features.sharing.publiclink.shareMustHavePassword | quote }} # user sharing - name: SHARING_USER_DRIVER From d040aeb949c806764b5a3a395395b6fd2041fe96 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Thu, 2 Nov 2023 07:51:54 +0100 Subject: [PATCH 4/5] use 5.0.0-alpha.1 --- charts/ocis/Chart.yaml | 2 +- charts/ocis/README.md | 2 +- charts/ocis/docs/values-desc-table.adoc | 2 +- charts/ocis/docs/values.adoc.yaml | 2 +- charts/ocis/values.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/ocis/Chart.yaml b/charts/ocis/Chart.yaml index 44b54b30b..2ffd50920 100644 --- a/charts/ocis/Chart.yaml +++ b/charts/ocis/Chart.yaml @@ -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 diff --git a/charts/ocis/README.md b/charts/ocis/README.md index 9f9a937d7..2ef2cd806 100644 --- a/charts/ocis/README.md +++ b/charts/ocis/README.md @@ -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/). diff --git a/charts/ocis/docs/values-desc-table.adoc b/charts/ocis/docs/values-desc-table.adoc index abee17d70..31bd36947 100644 --- a/charts/ocis/docs/values-desc-table.adoc +++ b/charts/ocis/docs/values-desc-table.adoc @@ -808,7 +808,7 @@ a| [subs=-attributes] a| [subs=-attributes] +string+ a| [subs=-attributes] -`"8489c25825bae631c10adf843945291ac2c8da84b3f50826d897b25529dde4bb"` +`"7cc907469deb5a2712dba96c3d6985be321a43870fe5502fad1fdfbc27620fed"` | Image sha / digest (optional). | image.tag a| [subs=-attributes] diff --git a/charts/ocis/docs/values.adoc.yaml b/charts/ocis/docs/values.adoc.yaml index b1527fe7c..434eb4a46 100644 --- a/charts/ocis/docs/values.adoc.yaml +++ b/charts/ocis/docs/values.adoc.yaml @@ -7,7 +7,7 @@ image: # -- Image tag. Defaults to the chart's appVersion. tag: "latest" # -- Image sha / digest (optional). - sha: "8489c25825bae631c10adf843945291ac2c8da84b3f50826d897b25529dde4bb" # oCIS as of 27th 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 diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml index 94cbbbb8e..3a152d3d8 100644 --- a/charts/ocis/values.yaml +++ b/charts/ocis/values.yaml @@ -6,7 +6,7 @@ image: # -- Image tag. Defaults to the chart's appVersion. tag: "latest" # -- Image sha / digest (optional). - sha: "8489c25825bae631c10adf843945291ac2c8da84b3f50826d897b25529dde4bb" # oCIS as of 27th 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 From dd72f4f44e2bb729543beffcce9f1afb921d3aa0 Mon Sep 17 00:00:00 2001 From: Willy Kloucek <34452982+wkloucek@users.noreply.github.com> Date: Mon, 6 Nov 2023 12:59:32 +0100 Subject: [PATCH 5/5] Update charts/ocis/templates/sharing/deployment.yaml Co-authored-by: kobergj --- charts/ocis/templates/sharing/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ocis/templates/sharing/deployment.yaml b/charts/ocis/templates/sharing/deployment.yaml index c1ef0e7bc..7822dd7fe 100644 --- a/charts/ocis/templates/sharing/deployment.yaml +++ b/charts/ocis/templates/sharing/deployment.yaml @@ -78,7 +78,7 @@ 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!? + # TODO: does not exist currently. Probably should be there because we also have SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD!? # - name: SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD # value: {{ .Values.features.sharing.publiclink.shareMustHavePassword | quote }}