diff --git a/dbrepo-logging-service/fluentbit.conf b/dbrepo-logging-service/fluentbit.conf
index ec9ca1a6e99be23e562ccec4b6f6b2daf8f2fdfa..344fa190cea697522acffb74a327f4acf7a55d0c 100644
--- a/dbrepo-logging-service/fluentbit.conf
+++ b/dbrepo-logging-service/fluentbit.conf
@@ -3,7 +3,7 @@
Daemon Off
Log_Level debug
Parsers_File parsers.conf
- Parsers_File fluentbit_parser.conf
+ Parsers_File dbrepo_parser.conf
[INPUT]
Name forward
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/ac/tuwien/ifs/dbrepo/repository/IdentifierRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/ac/tuwien/ifs/dbrepo/repository/IdentifierRepository.java
index d93cd3c75f35525f694f8b3ffb905d5ffdea136c..35eebe00f36c175043984c5d277aae7dcebaa3ab 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/ac/tuwien/ifs/dbrepo/repository/IdentifierRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/ac/tuwien/ifs/dbrepo/repository/IdentifierRepository.java
@@ -11,7 +11,6 @@ import java.util.UUID;
@Repository
public interface IdentifierRepository extends JpaRepository<Identifier, UUID> {
- @NotNull
List<Identifier> findAll();
/**
diff --git a/dbrepo-ui/components/ResourceStatus.vue b/dbrepo-ui/components/ResourceStatus.vue
index 2a28a8c4713871efed8d77a8d3865a23d9336d7f..e594883328234bf005e3e689a945fd11b45ac60b 100644
--- a/dbrepo-ui/components/ResourceStatus.vue
+++ b/dbrepo-ui/components/ResourceStatus.vue
@@ -16,11 +16,7 @@
</template>
<script>
-<<<<<<< Updated upstream
-import { useCacheStore } from '~/stores/cache.js';
-=======
import { useCacheStore } from '@/stores/cache.js'
->>>>>>> Stashed changes
export default {
props: {
@@ -69,11 +65,7 @@ export default {
return this.cacheStore.getUser
},
hasIdentifier () {
-<<<<<<< Updated upstream
- if (!this.resource.identifiers) {
-=======
if (!this.resource.identifiers || this.resource.identifiers.length === 0) {
->>>>>>> Stashed changes
return false
}
if (!this.cacheUser) {
diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md
index 45c00beca6f809bdc0db2fa88d27edcd861100d9..afe3dc9914bd005712f65002c354db078388c2a3 100644
--- a/helm/dbrepo/README.md
+++ b/helm/dbrepo/README.md
@@ -81,10 +81,9 @@ The command removes all the Kubernetes components associated with the chart and
| `metadatadb.galera.mariabackup.user` | The database backup username. | `backup` |
| `metadatadb.galera.mariabackup.password` | The database backup user password | `backup` |
| `metadatadb.jdbcExtraArgs` | The extra arguments for JDBC connections in the microservices. | `""` |
-| `metadatadb.configurationConfigMap` | The database configuration files. | `metadata-db-config` |
| `metadatadb.extraInitDbScripts` | Additional init.db scripts that are executed on the first start. | `{}` |
-| `metadatadb.replicaCount` | The number of cluster nodes, should be uneven i.e. 2n+1 | `3` |
-| `metadatadb.resourcesPreset` | The container resource preset | `nano-hm` |
+| `metadatadb.replicaCount` | The number of cluster nodes, should be uneven i.e. 2n+1 | `1` |
+| `metadatadb.resourcesPreset` | The container resource preset | `xlarge` |
| `metadatadb.persistence.enabled` | Enable persistent storage. | `true` |
### Auth Service
@@ -116,8 +115,8 @@ The command removes all the Kubernetes components associated with the chart and
| `datadb.galera.mariabackup.user` | The database backup username. | `backup` |
| `datadb.galera.mariabackup.password` | The database backup user password | `backup` |
| `datadb.jdbcExtraArgs` | The extra arguments for JDBC connections in the microservices. | `""` |
-| `datadb.replicaCount` | The number of cluster nodes, should be uneven i.e. 2n+1 | `3` |
-| `datadb.resourcesPreset` | The container resource preset | `nano-hm` |
+| `datadb.replicaCount` | The number of cluster nodes, should be uneven i.e. 2n+1 | `1` |
+| `datadb.resourcesPreset` | The container resource preset | `xlarge` |
| `datadb.initdbScriptsConfigMap` | The setup data to load into the database on first start. | `data-db-setup` |
| `datadb.persistence.enabled` | Enable persistent storage. | `true` |
@@ -426,13 +425,13 @@ mqtt.prefetch = 10
### Gateway Service
-| Name | Description | Value |
-| --------------------------------------------- | --------------------------------------------- | ----------------------- |
-| `gatewayservice.enabled` | Enable the Gateway Service. | `true` |
-| `gatewayservice.service.type` | The service type. | `ClusterIP` |
-| `gatewayservice.metrics.enabled` | Enable the Prometheus metrics sidecar. | `false` |
-| `gatewayservice.existingServerBlockConfigmap` | The extra configuration for the reverse proxy | `gateway-service-setup` |
-| `gatewayservice.replicaCount` | The number of replicas. | `3` |
+| Name | Description | Value |
+| --------------------------------------------- | --------------------------------------------- | ------------------------ |
+| `gatewayservice.enabled` | Enable the Gateway Service. | `true` |
+| `gatewayservice.service.type` | The service type. | `ClusterIP` |
+| `gatewayservice.metrics.enabled` | Enable the Prometheus metrics sidecar. | `false` |
+| `gatewayservice.existingServerBlockConfigmap` | The extra configuration for the reverse proxy | `gateway-service-config` |
+| `gatewayservice.replicaCount` | The number of replicas. | `3` |
### Analytics Service
@@ -440,6 +439,29 @@ mqtt.prefetch = 10
| ------------------------- | ------------------------------------------------------ | ---------- |
| `computeservice.endpoint` | Configure the number of parallel workers with local[n] | `local[2]` |
+### Logging Service
+
+| Name | Description | Value |
+| ------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------- | ---------------- |
+| `loggingservice.enabled` | Enable the Logging Service. | `false` |
+| `loggingservice.podSecurityContext.enabled` | Enable pods' Security Context | `true` |
+| `loggingservice.podSecurityContext.fsGroupChangePolicy` | Set filesystem group change policy | `Always` |
+| `loggingservice.podSecurityContext.sysctls` | Set kernel settings using the sysctl interface | `[]` |
+| `loggingservice.podSecurityContext.supplementalGroups` | Set filesystem extra groups | `[]` |
+| `loggingservice.podSecurityContext.fsGroup` | Set RabbitMQ pod's Security Context fsGroup | `0` |
+| `loggingservice.containerSecurityContext.enabled` | Enable containers' Security Context | `true` |
+| `loggingservice.containerSecurityContext.seLinuxOptions` | Set SELinux options in container | `{}` |
+| `loggingservice.containerSecurityContext.runAsUser` | Set RabbitMQ containers' Security Context runAsUser | `1001` |
+| `loggingservice.containerSecurityContext.runAsGroup` | Set RabbitMQ containers' Security Context runAsGroup | `1001` |
+| `loggingservice.containerSecurityContext.runAsNonRoot` | Set RabbitMQ container's Security Context runAsNonRoot | `true` |
+| `loggingservice.containerSecurityContext.allowPrivilegeEscalation` | Set container's privilege escalation | `false` |
+| `loggingservice.containerSecurityContext.readOnlyRootFilesystem` | Set container's Security Context readOnlyRootFilesystem | `false` |
+| `loggingservice.containerSecurityContext.capabilities.drop` | Set container's Security Context runAsNonRoot | `["ALL"]` |
+| `loggingservice.containerSecurityContext.seccompProfile.type` | Set container's Security Context seccomp profile | `RuntimeDefault` |
+| `loggingservice.resourcesPreset` | The container resource preset | `micro` |
+| `loggingservice.resources` | Set container requests and limits for different resources like CPU or memory (essential for production workloads) | `{}` |
+| `loggingservice.replicaCount` | The number of replicas. | `2` |
+
### Ingress
| Name | Description | Value |
diff --git a/helm/dbrepo/charts/seaweedfs-4.2.1.tgz b/helm/dbrepo/charts/seaweedfs-4.2.1.tgz
index 2d016e8e90aa3efc68fbec89788b84fccbb7663d..fd21ef4beb528cf8eb854a7e89752c5babdf97f9 100644
Binary files a/helm/dbrepo/charts/seaweedfs-4.2.1.tgz and b/helm/dbrepo/charts/seaweedfs-4.2.1.tgz differ
diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar
index cd556f4707e4480ce97a877183eda957bfed268a..ed1b2271b2a770fcbd5c65202e1168b6a6595843 100644
Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ
diff --git a/helm/dbrepo/values.schema.json b/helm/dbrepo/values.schema.json
index 804354f21deb634c5055f9c4cc2a310cef0f5db9..d3539d39c1e3f9fb372c66e2584739d74433747d 100644
--- a/helm/dbrepo/values.schema.json
+++ b/helm/dbrepo/values.schema.json
@@ -862,6 +862,42 @@
"existingServerBlockConfigmap": {
"type": "string"
},
+ "extraVolumeMounts": {
+ "items": {
+ "properties": {
+ "mountPath": {
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ },
+ "subPath": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "type": "array"
+ },
+ "extraVolumes": {
+ "items": {
+ "properties": {
+ "configMap": {
+ "properties": {
+ "name": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "name": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "type": "array"
+ },
"fullnameOverride": {
"type": "string"
},
@@ -1074,11 +1110,100 @@
},
"type": "object"
},
- "metadatadb": {
+ "loggingservice": {
"properties": {
- "configurationConfigMap": {
- "type": "string"
+ "containerSecurityContext": {
+ "properties": {
+ "allowPrivilegeEscalation": {
+ "type": "boolean"
+ },
+ "capabilities": {
+ "properties": {
+ "drop": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
+ "enabled": {
+ "type": "boolean"
+ },
+ "readOnlyRootFilesystem": {
+ "type": "boolean"
+ },
+ "runAsGroup": {
+ "type": "integer"
+ },
+ "runAsNonRoot": {
+ "type": "boolean"
+ },
+ "runAsUser": {
+ "type": "integer"
+ },
+ "seLinuxOptions": {
+ "properties": {},
+ "type": "object"
+ },
+ "seccompProfile": {
+ "properties": {
+ "type": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
+ },
+ "enabled": {
+ "type": "boolean"
+ },
+ "image": {
+ "properties": {
+ "name": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "podSecurityContext": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ },
+ "fsGroup": {
+ "type": "integer"
+ },
+ "fsGroupChangePolicy": {
+ "type": "string"
+ },
+ "supplementalGroups": {
+ "type": "array"
+ },
+ "sysctls": {
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
+ "replicaCount": {
+ "type": "integer"
+ },
+ "resources": {
+ "properties": {},
+ "type": "object"
},
+ "resourcesPreset": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "metadatadb": {
+ "properties": {
"db": {
"properties": {
"name": {
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index 0659b73e696cfd7f53a19cce2fb1518a4e584425..fe2278faea9487c6f0b635c11cb9fa44c045c618 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -1051,10 +1051,12 @@ gatewayservice:
enabled: false
## @param gatewayservice.existingServerBlockConfigmap The extra configuration for the reverse proxy
existingServerBlockConfigmap: gateway-service-config
+ ## @skip gatewayservice.extraVolumes
extraVolumes:
- name: config-map
configMap:
name: gateway-service-setup
+ ## @skip gatewayservice.extraVolumeMounts
extraVolumeMounts:
- name: config-map
mountPath: /etc/nginx/conf.d/nginx.conf
@@ -1071,6 +1073,7 @@ computeservice:
## @section Logging Service
loggingservice:
+ ## @param loggingservice.enabled Enable the Logging Service.
enabled: false
image:
## @skip loggingservice.image.name
diff --git a/helm/seaweedfs/Chart.lock b/helm/seaweedfs/Chart.lock
index 17e017ad74ed6bf94e0eb383ddf31c146912e945..bd7187708025bddd56e9f840f05aaa8c8a212205 100644
--- a/helm/seaweedfs/Chart.lock
+++ b/helm/seaweedfs/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
version: 20.4.3
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
- version: 16.6.4
+ version: 16.6.5
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.30.0
-digest: sha256:cf895fd3bc8c6715f0fae22d9f9e276a087fd6f39704348b1b8e84954659c548
-generated: "2025-04-24T11:15:12.075870224+02:00"
+digest: sha256:caad17722be72729e47ffc699f4de69463e71fdc2cdd5812c60f5119754743a2
+generated: "2025-04-25T09:10:19.697315063+02:00"
diff --git a/helm/seaweedfs/charts/postgresql-16.6.4.tgz b/helm/seaweedfs/charts/postgresql-16.6.4.tgz
deleted file mode 100644
index 385459186aca75ce1dd99abf0e9cdf97b9d5840b..0000000000000000000000000000000000000000
Binary files a/helm/seaweedfs/charts/postgresql-16.6.4.tgz and /dev/null differ
diff --git a/helm/seaweedfs/charts/postgresql-16.6.5.tgz b/helm/seaweedfs/charts/postgresql-16.6.5.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..5bb4086c3145d56441395d89a78c819dca468e8e
Binary files /dev/null and b/helm/seaweedfs/charts/postgresql-16.6.5.tgz differ