Updated helm chart values

.docs/api/data-db.md

@@ -24,24 +24,10 @@ Library.
 
 ## Data
 
-The procedures require the user-generated databases to have the same collation (because of comparison operations).
-Ensure that the Data Database has the character set `utf8mb4` and collation `utf8mb4_general_ci` in your `my.cfg`:
-
-```ini
-[mysqld]
-character_set_server=utf8mb4
-collation_server=utf8mb4_general_ci
-```
-
-We observed this unexpected behavior for
+The procedures requires the in parameter of the `hash_table` stored procedure to have the same collation as the
+`information_schema.columns` table. We observed this unexpected behavior for
 the [MariaDB Galera chart](https://artifacthub.io/packages/helm/bitnami/mariadb-galera) powered by Bitnami and had to
-set extra flags. We could not observe this behavior with
-the [MariaDB Galera container image](https://hub.docker.com/r/bitnami/mariadb-galera) itself.
-
-```yaml
-mariadb-galera:
-  extraFlags: "--character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci"
-```
+set extra flags.
 
 ### Backup
 

.gitlab-ci.yml

@@ -415,9 +415,9 @@ release-docs:
     refs:
       - /^release-.*/
   before_script:
+    - "apk add --no-cache alpine-sdk bash sed wget openssh jq curl gcc"
     - "pip install pipenv"
     - "pipenv install --dev --system --deploy"
-    - "apk add --no-cache alpine-sdk bash sed wget openssh jq curl gcc"
     - "mkdir -p ./final/${DOC_VERSION}/rest"
   script:
     - "make gen-lib-doc gen-docs-doc package-config"

README.md

-![Java 21](https://img.shields.io/badge/Java-21-white?style=flat)
-![Python 3.11](https://img.shields.io/badge/Python-3.11-white?style=flat)
-![RabbitMQ 3.12](https://img.shields.io/badge/RabbitMQ-3.12-white?style=flat)
-![MariaDB 11.2](https://img.shields.io/badge/MariaDB-11.2-white?style=flat)
-![OpenSearch 2.10](https://img.shields.io/badge/OpenSearch-2.10-white?style=flat)
-![SeaweedFS 3.59](https://img.shields.io/badge/SeaweedFS-3.59-white?style=flat)
-![OpenLDAP 2.6](https://img.shields.io/badge/OpenLDAP-2.6-white?style=flat)
-![Spark 3.4](https://img.shields.io/badge/Spark-3.4-white?style=flat)
-![Keycloak 24.0](https://img.shields.io/badge/Keycloak-24.0-white?style=flat)
+[![CI/CD Status](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/badges/master/pipeline.svg)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services)
+[![CI/CD Coverage](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/badges/master/coverage.svg)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services)
+[![Latest Release](https://img.shields.io/gitlab/v/release/fair-data-austria-db-repository%2Ffda-services?gitlab_url=https%3A%2F%2Fgitlab.phaidra.org&display_name=release&style=flat)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services)
+[![PyPI Library version](https://img.shields.io/pypi/v/dbrepo)](https://pypi.org/project/dbrepo/)
+[![Image Pulls](https://img.shields.io/docker/pulls/dbrepo/data-service?style=flat)](https://hub.docker.com/u/dbrepo)
+[![Helm Chart version](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/dbrepo)](https://artifacthub.io/packages/helm/dbrepo/dbrepo)
+[![GitLab License](https://img.shields.io/gitlab/license/fair-data-austria-db-repository%2Ffda-services?gitlab_url=https%3A%2F%2Fgitlab.phaidra.org%2F&style=flat&cacheSeconds=3600)](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services)
 
 <img src="./dbrepo-ui/public/logo.png" width="200" alt="DBRepo &mdash; Repository for Data in Databases" />
 

helm/dbrepo/values.schema.json

@@ -123,6 +123,9 @@
                     "properties": {
                         "endpoint": {
                             "type": "string"
+                        },
+                        "proto": {
+                            "type": "string"
                         }
                     },
                     "type": "object"
@@ -514,8 +517,20 @@
         },
         "datadb": {
             "properties": {
-                "database": {
+                "db": {
                     "properties": {
+                        "name": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "extraFlags": {
+                    "type": "string"
+                },
+                "fullnameOverride": {
+                    "type": "string"
+                },
                 "galera": {
                     "properties": {
                         "mariabackup": {
@@ -532,15 +547,21 @@
                     },
                     "type": "object"
                 },
-                        "image": {
+                "host": {
+                    "type": "string"
+                },
+                "jdbcExtraArgs": {
+                    "type": "string"
+                },
+                "metrics": {
                     "properties": {
-                                "debug": {
+                        "enabled": {
                             "type": "boolean"
                         }
                     },
                     "type": "object"
                 },
-                        "metrics": {
+                "persistence": {
                     "properties": {
                         "enabled": {
                             "type": "boolean"
@@ -548,6 +569,9 @@
                     },
                     "type": "object"
                 },
+                "replicaCount": {
+                    "type": "integer"
+                },
                 "rootUser": {
                     "properties": {
                         "password": {
@@ -562,15 +586,6 @@
             },
             "type": "object"
         },
-                "enabled": {
-                    "type": "boolean"
-                },
-                "fullnameOverride": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
         "dataservice": {
             "properties": {
                 "containerSecurityContext": {
@@ -619,20 +634,6 @@
                     },
                     "type": "object"
                 },
-                "default": {
-                    "properties": {
-                        "date": {
-                            "type": "integer"
-                        },
-                        "time": {
-                            "type": "integer"
-                        },
-                        "timestamp": {
-                            "type": "integer"
-                        }
-                    },
-                    "type": "object"
-                },
                 "enabled": {
                     "type": "boolean"
                 },
@@ -769,6 +770,14 @@
         },
         "identityservice": {
             "properties": {
+                "containerSecurityContext": {
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
                 "customSchemaFiles": {
                     "properties": {
                         "00-memberof.ldif": {
@@ -946,6 +955,9 @@
                 "enabled": {
                     "type": "boolean"
                 },
+                "extraFlags": {
+                    "type": "string"
+                },
                 "extraInitDbScripts": {
                     "properties": {},
                     "type": "object"

helm/dbrepo/values.yaml

@@ -33,6 +33,8 @@ metadatadb:
   fullnameOverride: metadata-db
   ## @param metadatadb.host The hostname for the microservices.
   host: metadata-db
+  ## @param metadatadb.extraFlags Extra flags to ensure the query store works as intended, ref https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5/api/data-db/#data
+  extraFlags: "--character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci"
   rootUser:
     ## @param metadatadb.rootUser.user The root username.
     user: root
@@ -126,6 +128,8 @@ datadb:
   fullnameOverride: data-db
   ## @param datadb.host The hostname for the microservices.
   host: data-db
+  ## @param datadb.extraFlags Extra flags to ensure the query store works as intended, ref https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5/api/data-db/#data
+  extraFlags: "--character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci"
   rootUser:
     ## @param datadb.rootUser.user The root username.
     user: root
@@ -772,7 +776,7 @@ ui:
       ## @param ui.public.broker.extra Extra metadata displayed.
       extra: ""
     database:
-      ## @param ui.public.datadb.extra Extra metadata displayed.
+      ## @param ui.public.database.extra Extra metadata displayed.
       extra: ""
     ## @skip ui.public.links
     links:

make/build.mk

@@ -32,8 +32,6 @@ build-lib: ## Build the Python Library.
 .PHONY: build-helm
 build-helm: ## Build the DBRepo and DBRepo MariaDB Galera Helm Charts.
 	./.scripts/check-helm.sh
-	helm package ./helm/dbrepo-mariadb-galera --destination ./build
-	helm schema -input ./helm/dbrepo-mariadb-galera/values.yaml -output ./helm/dbrepo-mariadb-galera/values.schema.json
 	helm dependency update ./helm/dbrepo
 	helm package ./helm/dbrepo --destination ./build
 	helm schema -input ./helm/dbrepo/values.yaml -output ./helm/dbrepo/values.schema.json

make/gen.mk

@@ -9,7 +9,7 @@ gen-swagger-doc: build-images ## Generate Swagger documentation and fetch.
 
 .PHONY: gen-helm-doc
 gen-helm-doc: build-helm ## Generate Helm documentation and schema
-	readme-generator-for-helm --readme ./helm/dbrepo/README.md --values ./helm/dbrepo/values.yaml
+	readme-generator --readme ./helm/dbrepo/README.md --values ./helm/dbrepo/values.yaml
 
 .PHONY: gen-dbrepo-doc
 gen-docs-doc: ## Generate DBRepo documentation.