ocis 5 adaptions

charts/ocis/ci/values.yaml

@@ -21,7 +21,7 @@ image:
     - name: some-pull-secret
 nodeSelector:
   kubernetes.io/arch: "amd64"
-hostAliases: 
+hostAliases:
 - ip: "192.168.4.2"
   hostnames:
   - "example.kube.owncloud.test"
@@ -148,20 +148,6 @@ services:
       purgeExpiredTrashBinItems:
         enabled: true
 
-  store:
-    persistence:
-      enabled: true
-      storageClassName: default-storage
-      accessModes:
-        - ReadWriteMany
-      size: 5Gi
-      annotations:
-        anno-1: test
-      finalizers:
-        - kubernetes.io/pvc-protection
-      selectorLabels:
-        selector1: foobar
-
   thumbnails:
     persistence:
       enabled: true

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

@@ -3792,6 +3792,12 @@ a| [subs=-attributes]
 a| [subs=-attributes]
 `"example-bucket"`
 | S3 bucket to use for the S3NG driver. Only used if driver is set to "s3ng".
+| services.storageusers.storageBackend.driverConfig.s3ng.disableContentSHA256
+a| [subs=-attributes]
++bool+
+a| [subs=-attributes]
+`false`
+| Disable sending content sha256 when copying objects to S3.
 | services.storageusers.storageBackend.driverConfig.s3ng.endpoint
 a| [subs=-attributes]
 +string+
@@ -3810,144 +3816,48 @@ a| [subs=-attributes]
 a| [subs=-attributes]
 `"messagepack"`
 | Metadata backend to use for the S3NG storage driver. Valid values are: "messagepack", "xattrs".
-| services.storageusers.storageBackend.driverConfig.s3ng.region
-a| [subs=-attributes]
-+string+
-a| [subs=-attributes]
-`"default"`
-| S3 region to use for the S3NG driver. Only used if driver is set to "s3ng".
-| services.storageusers.storageBackend.driverConfig.s3ng.secretKey
-a| [subs=-attributes]
-+string+
-a| [subs=-attributes]
-`""`
-| S3 secret key to use for the S3NG driver. Only used if driver is set to "s3ng". DEPRECATION WARNING: These values will be removed in the future. Predefine `secretRefs.s3CredentialsSecretRef` instead.
-| services.store
-a| [subs=-attributes]
-+object+
-a| [subs=-attributes]
-see detailed service configuration options below
-| STORE service.
-| services.store.affinity
-a| [subs=-attributes]
-+object+
-a| [subs=-attributes]
-`{}`
-| Affinity settings for the store service. See the documentation of this setting in approvider for examples.
-| services.store.extraLabels
-a| [subs=-attributes]
-+object+
-a| [subs=-attributes]
-`{}`
-| Per-service custom labels
-| services.store.image.pullPolicy
-a| [subs=-attributes]
-+string+
-a| [subs=-attributes]
-`nil`
-| Image pull policy
-| services.store.image.repository
-a| [subs=-attributes]
-+string+
-a| [subs=-attributes]
-`""`
-| Image repository
-| services.store.image.sha
-a| [subs=-attributes]
-+string+
-a| [subs=-attributes]
-`""`
-| Image sha / digest (optional).
-| services.store.image.tag
-a| [subs=-attributes]
-+string+
-a| [subs=-attributes]
-`""`
-| Image tag.
-| services.store.nodeSelector
-a| [subs=-attributes]
-+object+
-a| [subs=-attributes]
-`{}`
-| Per-service nodeSelector configuration. Overrides the default setting from `nodeSelector` if set.
-| services.store.persistence
-a| [subs=-attributes]
-+object+
-a| [subs=-attributes]
-see detailed persistence configuration options below
-| Persistence settings.
-| services.store.persistence.accessModes
-a| [subs=-attributes]
-+list+
-a| [subs=-attributes]
-`["ReadWriteMany"]`
-| Persistent volume access modes. Needs to be `["ReadWriteMany"]` when scaling this service beyond one instance.
-| services.store.persistence.annotations
-a| [subs=-attributes]
-+object+
-a| [subs=-attributes]
-`{}`
-| Persistent volume annotations.
-| services.store.persistence.chownInitContainer
+| services.storageusers.storageBackend.driverConfig.s3ng.putObject.concurrentStreamParts
 a| [subs=-attributes]
 +bool+
 a| [subs=-attributes]
-`false`
-| Enables an initContainer to chown the volume. The initContainer is run as root. This is not needed if the driver applies the fsGroup from the securityContext. The image specified in `initContainerImage` will be used for this container.
-| services.store.persistence.claimName
-a| [subs=-attributes]
-+string+
-a| [subs=-attributes]
-`""`
-| Use a custom name for the PVC instead of the default one.
-| services.store.persistence.enabled
+`true`
+| Always precreate parts when copying objects to S3.
+| services.storageusers.storageBackend.driverConfig.s3ng.putObject.disableMultipart
 a| [subs=-attributes]
 +bool+
 a| [subs=-attributes]
 `false`
-| Enables persistence. Needs to be enabled on production installations. If not enabled, pod restarts will lead to data loss. Also scaling this service beyond one instance is not possible if the service instances don't share the same storage.
-| services.store.persistence.existingClaim
-a| [subs=-attributes]
-+string+
-a| [subs=-attributes]
-`nil`
-| Use an existing PersistentVolumeClaim for persistence.
-| services.store.persistence.finalizers
+| Disable multipart uploads when copying objects to S3
+| services.storageusers.storageBackend.driverConfig.s3ng.putObject.numThreads
 a| [subs=-attributes]
-+list+
++int+
 a| [subs=-attributes]
-`["kubernetes.io/pvc-protection"]`
-| Persistent volume finalizers.
-| services.store.persistence.selectorLabels
+`4`
+| Number of concurrent uploads to use when copying objects to S3.
+| services.storageusers.storageBackend.driverConfig.s3ng.putObject.partSize
 a| [subs=-attributes]
-+object+
++int+
 a| [subs=-attributes]
-`{}`
-| Persistent volume selector labels.
-| services.store.persistence.size
+`0`
+| Part size for concurrent uploads to S3.
+| services.storageusers.storageBackend.driverConfig.s3ng.putObject.sendContentMD5
 a| [subs=-attributes]
-+string+
++bool+
 a| [subs=-attributes]
-`"5Gi"`
-| Size of the persistent volume.
-| services.store.persistence.storageClassName
+`true`
+| Send a Content-MD5 header when copying objects to S3.
+| services.storageusers.storageBackend.driverConfig.s3ng.region
 a| [subs=-attributes]
 +string+
 a| [subs=-attributes]
-`nil`
-| Storage class to use. Uses the default storage class if not set.
-| services.store.priorityClassName
+`"default"`
+| S3 region to use for the S3NG driver. Only used if driver is set to "s3ng".
+| services.storageusers.storageBackend.driverConfig.s3ng.secretKey
 a| [subs=-attributes]
 +string+
 a| [subs=-attributes]
 `""`
-| Per-service priorityClassName configuration. Overrides the default setting from `priorityClassName` if set.
-| services.store.resources
-a| [subs=-attributes]
-+object+
-a| [subs=-attributes]
-`{}`
-| Per-service resources configuration. Overrides the default setting from `resources` if set.
+| S3 secret key to use for the S3NG driver. Only used if driver is set to "s3ng". DEPRECATION WARNING: These values will be removed in the future. Predefine `secretRefs.s3CredentialsSecretRef` instead.
 | services.thumbnails
 a| [subs=-attributes]
 +object+

charts/ocis/docs/values.adoc.yaml

@@ -1804,6 +1804,19 @@ services:
           # -- S3 secret key to use for the S3NG driver. Only used if driver is set to "s3ng".
           # DEPRECATION WARNING: These values will be removed in the future. Predefine `secretRefs.s3CredentialsSecretRef` instead.
           secretKey: ""
+          # -- Disable sending content sha256 when copying objects to S3.
+          disableContentSHA256: false
+          putObject:
+            # -- Disable multipart uploads when copying objects to S3
+            disableMultipart: false
+            # -- Send a Content-MD5 header when copying objects to S3.
+            sendContentMD5: true
+            # -- Always precreate parts when copying objects to S3.
+            concurrentStreamParts: true
+            # -- Number of concurrent uploads to use when copying objects to S3.
+            numThreads: 4
+            # -- Part size for concurrent uploads to S3.
+            partSize: 0
 
     maintenance:
       # Expired uploads can be cleaned up automatically by enabling the clean up job.
@@ -1904,62 +1917,6 @@ services:
       # -- Image pull policy
       pullPolicy:
 
-  # -- STORE service.
-  # @default -- see detailed service configuration options below
-  store:
-    # -- Persistence settings.
-    # @default -- see detailed persistence configuration options below
-    persistence:
-      # -- Enables persistence.
-      # Needs to be enabled on production installations.
-      # If not enabled, pod restarts will lead to data loss.
-      # Also scaling this service beyond one instance is not possible if the service instances don't share the same storage.
-      enabled: false
-      # -- Enables an initContainer to chown the volume.
-      # The initContainer is run as root.
-      # This is not needed if the driver applies the fsGroup from the securityContext.
-      # The image specified in `initContainerImage` will be used for this container.
-      chownInitContainer: false
-      # -- Storage class to use.
-      # Uses the default storage class if not set.
-      storageClassName:
-      # -- Persistent volume access modes. Needs to be `["ReadWriteMany"]` when scaling this service beyond one instance.
-      accessModes:
-        - ReadWriteMany
-      # -- Size of the persistent volume.
-      size: 5Gi
-      # -- Persistent volume annotations.
-      annotations: {}
-      # -- Persistent volume finalizers.
-      finalizers:
-        - kubernetes.io/pvc-protection
-      # -- Persistent volume selector labels.
-      selectorLabels: {}
-      # -- Use a custom name for the PVC instead of the default one.
-      claimName: ""
-      # -- Use an existing PersistentVolumeClaim for persistence.
-      existingClaim:
-    # -- Per-service resources configuration. Overrides the default setting from `resources` if set.
-    resources: {}
-    # -- Per-service nodeSelector configuration. Overrides the default setting from `nodeSelector` if set.
-    nodeSelector: {}
-    # -- Per-service priorityClassName configuration. Overrides the default setting from `priorityClassName` if set.
-    priorityClassName: ""
-    # -- Affinity settings for the store service. See the documentation of this setting in approvider for examples.
-    affinity: {}
-    # -- Per-service custom labels
-    extraLabels: {}
-    # Per-service image configuration. Overrides the default setting from `image` if set.
-    image:
-      # -- Image repository
-      repository: ""
-      # -- Image tag.
-      tag: ""
-      # -- Image sha / digest (optional).
-      sha: ""
-      # -- Image pull policy
-      pullPolicy:
-
   # -- THUMBNAILS service.
   # @default -- see detailed service configuration options below
   thumbnails:

charts/ocis/templates/NOTES.txt

@@ -71,9 +71,8 @@ kubectl -n {{ .Release.Namespace }} get secrets/admin-user --template='{{"{{"}}.
 {{- $storagesystemUnpersisted := not .Values.services.storagesystem.persistence.enabled -}}
 {{- $webUnpersisted := not .Values.services.web.persistence.enabled -}}
 {{- $storageusersUnpersisted := not .Values.services.storageusers.persistence.enabled -}}
-{{- $storeUnpersisted := not .Values.services.store.persistence.enabled -}}
 
-{{ if or $storagesystemUnpersisted $webUnpersisted $storageusersUnpersisted $storeUnpersisted $idmUnpersisted $searchUnpersisted $natsUnpersisted }}
+{{ if or $storagesystemUnpersisted $webUnpersisted $storageusersUnpersisted $idmUnpersisted $searchUnpersisted $natsUnpersisted }}
 #################################################################################
 ######   WARNING: Persistence is disabled for some services.                #####
 ######   You will lose your data when a service's pod is terminated.        #####
@@ -91,9 +90,6 @@ kubectl -n {{ .Release.Namespace }} get secrets/admin-user --template='{{"{{"}}.
 {{- if $idmUnpersisted }}
 ######     - idm                                                            #####
 {{- end }}
-{{- if $storeUnpersisted }}
-######     - store                                                          #####
-{{- end }}
 {{- if $searchUnpersisted }}
 ######     - search                                                         #####
 {{- end }}

charts/ocis/templates/ocs/deployment.yaml

@@ -25,6 +25,7 @@ spec:
           env:
             {{- include "ocis.serviceRegistry" . | nindent 12 }}
             {{- include "ocis.cors" . |nindent 12 }}
+            {{- include "ocis.cacheStore" . | nindent 12 }}
 
             - name: OCS_LOG_COLOR
               value: {{ .Values.logging.color | quote }}

charts/ocis/templates/storageusers/deployment.yaml

@@ -105,6 +105,19 @@ spec:
                   key: secretKey
             - name: STORAGE_USERS_S3NG_BUCKET
               value: {{ .Values.services.storageusers.storageBackend.driverConfig.s3ng.bucket | quote }}
+            - name: STORAGE_USERS_S3NG_PUT_OBJECT_DISABLE_CONTENT_SHA256
+              value: {{ .Values.services.storageusers.storageBackend.driverConfig.s3ng.disableContentSHA256 | quote }}
+            - name: STORAGE_USERS_S3NG_PUT_OBJECT_DISABLE_MULTIPART
+              value: {{ .Values.services.storageusers.storageBackend.driverConfig.s3ng.putObject.disableMultipart | quote }}
+            - name: STORAGE_USERS_S3NG_PUT_OBJECT_SEND_CONTENT_MD5
+              value: {{ .Values.services.storageusers.storageBackend.driverConfig.s3ng.putObject.sendContentMD5 | quote }}
+            - name: STORAGE_USERS_S3NG_PUT_OBJECT_CONCURRENT_STREAM_PARTS
+              value: {{ .Values.services.storageusers.storageBackend.driverConfig.s3ng.putObject.concurrentStreamParts | quote }}
+            - name: STORAGE_USERS_S3NG_PUT_OBJECT_NUM_THREADS
+              value: {{ .Values.services.storageusers.storageBackend.driverConfig.s3ng.putObject.numThreads | quote }}
+            - name: STORAGE_USERS_S3NG_PUT_OBJECT_PART_SIZE
+              value: {{ .Values.services.storageusers.storageBackend.driverConfig.s3ng.putObject.partSize | quote }}
+
             {{- end }}
 
             # Duration in seconds after which uploads will expire.