diff --git a/helm/dbrepo/Chart.lock b/helm/dbrepo/Chart.lock index 714bbb14065300fbbc4c811b2f8963d552831552..665683f8b3386741ef5eedc460725ffcfe9012b6 100644 --- a/helm/dbrepo/Chart.lock +++ b/helm/dbrepo/Chart.lock @@ -1,7 +1,7 @@ dependencies: - name: opensearch repository: https://charts.bitnami.com/bitnami - version: 1.2.2 + version: 1.4.0 - name: keycloak repository: https://charts.bitnami.com/bitnami version: 21.6.1 @@ -17,14 +17,11 @@ dependencies: - name: seaweedfs repository: https://charts.bitnami.com/bitnami version: 0.4.5 -- name: tusd - repository: https://charts.sagikazarmark.dev - version: 0.1.2 - name: grafana repository: https://charts.bitnami.com/bitnami version: 10.1.1 - name: prometheus repository: https://charts.bitnami.com/bitnami version: 1.3.22 -digest: sha256:aa9cee8efad6f30ad296c7908cf4d9a5c50e1d87bcf2dde3b2e02306a686e1fd -generated: "2024-11-22T19:46:10.620698662+01:00" +digest: sha256:0e28a6dfb459d9475920cdfa33b814e2cec5b5299c9c858aeebd4afefeb24684 +generated: "2024-11-23T09:36:23.467879782+01:00" diff --git a/helm/dbrepo/Chart.yaml b/helm/dbrepo/Chart.yaml index 82ecce5354b3934e4bc5cc48d4f8c9576632fd9e..fa7e122240250febacbe59429ac9f3db2f3c5d85 100644 --- a/helm/dbrepo/Chart.yaml +++ b/helm/dbrepo/Chart.yaml @@ -18,7 +18,7 @@ icon: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/ dependencies: - name: opensearch alias: searchdb - version: 1.2.2 + version: 1.4.0 repository: https://charts.bitnami.com/bitnami condition: searchdb.enabled - name: keycloak diff --git a/helm/dbrepo/charts/opensearch-1.2.2.tgz b/helm/dbrepo/charts/opensearch-1.2.2.tgz deleted file mode 100644 index 0393bfc1aa2fa964c68e66af6da6f356ea84e29f..0000000000000000000000000000000000000000 Binary files a/helm/dbrepo/charts/opensearch-1.2.2.tgz and /dev/null differ diff --git a/helm/dbrepo/charts/opensearch-1.4.0.tgz b/helm/dbrepo/charts/opensearch-1.4.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..f63fa3c969d7f299e12718b4a0ab7dfc6be9dfca Binary files /dev/null and b/helm/dbrepo/charts/opensearch-1.4.0.tgz differ diff --git a/helm/dbrepo/templates/search-deployment.yaml b/helm/dbrepo/templates/search-deployment.yaml index 40e3e89c1317ce177f9407311d66a4bb6b26e337..a842f794dd6cf1a4a463d3673477499af0b39aa8 100644 --- a/helm/dbrepo/templates/search-deployment.yaml +++ b/helm/dbrepo/templates/search-deployment.yaml @@ -35,20 +35,18 @@ spec: envFrom: - secretRef: name: search-service-secret + {{- if .Values.searchservice.init.resources }} + resources: {{- toYaml .Values.searchservice.init.resources | nindent 12 }} + {{- else if ne .Values.searchservice.init.resourcesPreset "none" }} + resources: {{- include "common.resources.preset" (dict "type" .Values.searchservice.init.resourcesPreset) | nindent 12 }} + {{- end }} containers: - name: search-service image: {{ .Values.searchservice.image.name }} imagePullPolicy: {{ .Values.searchservice.image.pullPolicy | default "IfNotPresent" }} - securityContext: - allowPrivilegeEscalation: false - runAsNonRoot: true - runAsUser: 1001 - runAsGroup: 1001 - seccompProfile: - type: {{ .Values.searchservice.profileType | default "RuntimeDefault" }} - capabilities: - drop: - - ALL + {{- if .Values.searchservice.containerSecurityContext.enabled }} + securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.searchservice.containerSecurityContext "context" $) | nindent 12 }} + {{- end }} ports: - containerPort: 8080 protocol: TCP @@ -73,7 +71,7 @@ spec: periodSeconds: 10 {{- if .Values.searchservice.resources }} resources: {{- toYaml .Values.searchservice.resources | nindent 12 }} + {{- else if ne .Values.searchservice.resourcesPreset "none" }} + resources: {{- include "common.resources.preset" (dict "type" .Values.searchservice.resourcesPreset) | nindent 12 }} {{- end }} - volumeMounts: [ ] - volumes: [ ] {{- end }} diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml index 7dbfd42dee0e2ba2b73a85d70e003685dd4f9915..bba4ab0cc95fb252f8edfa15d6226db091d40e3a 100644 --- a/helm/dbrepo/values.yaml +++ b/helm/dbrepo/values.yaml @@ -645,20 +645,23 @@ searchservice: ## limits: ## cpu: 500m ## memory: 1024Mi - ## @skip searchservice.resources - resources: - requests: - cpu: 250m - memory: 512Mi - limits: - cpu: 1000m - memory: 2048Mi ## @skip searchservice.init init: image: name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.5.1 pullPolicy: Always - ## @param searchservice.replicaCount The number of replicas. + ## @param searchservice.init.resourcesPreset The container resource preset + resourcesPreset: "nano" + ## @param searchservice.init.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads) + ## Example: + ## resources: + ## requests: + ## cpu: 250m + ## memory: 64Mi + ## limits: + ## cpu: 500m + ## memory: 1024Mi + ## @param searchservice.replicaCount The number of replicas. replicaCount: 2 ## @section Storage Service @@ -705,6 +708,10 @@ storageservice: adminAccessKeyId: seaweedfsadmin ## @param storageservice.s3.auth.adminSecretAccessKey The S3 secret access key for the admin user. In some systems this is named `password`. adminSecretAccessKey: seaweedfsadmin + ## @param storageservice.s3.auth.readAccessKeyId The S3 access key id for the read only user. + readAccessKeyId: seaweedfsuser + ## @param storageservice.s3.auth.readSecretAccessKey The S3 secret access key for the read only user. + readSecretAccessKey: seaweedfsuser ## @skip storageservice.init init: image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.5.1