Hotfix the helm chart, added helm chart build

.docs/requirements.txt

-mkdocs==1.4.3
-mkdocs-material==9.1.17
-mkdocs-with-pdf==0.9.3
-mkdocs-material-extensions>=1.0.3
-requests>=2.27.0
-py-dotenv>=0.1
-python-dotenv==1.0.0

.gitlab-ci.yml

@@ -4,8 +4,8 @@ variables:
   TRIVY_CACHE_DIR: ".trivycache/"
   DOCKER_HOST: "unix:///var/run/dind/docker.sock"
   TESTCONTAINERS_RYUK_DISABLED: "false"
-  APP_VERSION: "1.4.1"
-  CHART_VERSION: "1.4.1"
+  APP_VERSION: "1.4.0"
+  CHART_VERSION: "1.4.0"
 
 image: debian:12-slim
 
@@ -71,6 +71,18 @@ build-docker:
     - "docker build -t dbrepo-data-service:build --target build dbrepo-data-service"
     - "docker compose build --parallel"
 
+build-helm:
+  image: docker.io/docker:24-dind
+  stage: build
+  before_script:
+    - echo "$CI_REGISTRY_PASSWORD" | docker login --username "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY_URL
+  script:
+    - apk add sed helm curl
+    - 'sed -i -e "s/^version:.*/version: \"${CHART_VERSION}\"/g" ./helm-charts/dbrepo/Chart.yaml'
+    - 'sed -i -e "s/^appVersion:.*/appVersion: \"${APP_VERSION}\"/g" ./helm-charts/dbrepo/Chart.yaml'
+    - find ./helm-charts -type f -exec sed -i -e "s/__CHARTVERSION__/${CHART_VERSION}/g" {} \;
+    - helm package ./helm-charts/dbrepo --destination ./build
+
 test-metadata-service:
   image: maven:3-openjdk-17
   stage: test
@@ -598,7 +610,7 @@ docs-registry:
       - release-v1.3
       - release-v1.4
   script:
-    - pip install pipenv && pipenv install --dev --system --deploy
+    - pip install -r ./requirements.txt
     - python3 .docs/docker/release.py
   cache:
     paths:
@@ -624,7 +636,7 @@ docs-latest:
   script:
     - apt-get update && apt-get install -y git make sed
     - git fetch && git checkout master
-    - pip install pipenv && pipenv install --dev --system --deploy
+    - pip install -r ./requirements.txt
     - mkdir -p ./final
     - sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" .docs/redirect.html
     - cp ./.docs/redirect.html ./final/index.html
@@ -655,7 +667,7 @@ docs-1.3:
   script:
     - apt-get update && apt-get install -y git make wget
     - git fetch && git checkout release-v1.3
-    - pip install -r ./.docs/requirements.txt
+    - pip install -r ./requirements.txt
     - wget https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/.docs/overrides/main.html -O .docs/overrides/main.html -q
     - mkdir -p ./final
     - mkdocs build && cp -r ./site ./final/1.3.0
@@ -684,7 +696,7 @@ docs-1.4:
   script:
     - apt-get update && apt-get install -y git make sed wget
     - git fetch && git checkout release-v1.4
-    - pip install pipenv && pipenv install --dev --system --deploy
+    - pip install -r ./requirements.txt
     - wget https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/.docs/overrides/main.html -O .docs/overrides/main.html -q
     - mkdir -p ./final
     - find .docs/ -type f -exec sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" {} \;

helm-charts/dbrepo/Chart.yaml

@@ -16,7 +16,7 @@ home: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/
 icon: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/master/.docs/images/signet_white.png
 dependencies:
   - name: opensearch
-    alias: searchDb
+    alias: searchdb
     version: 2.15.0 # app version 2.10.0
     repository: https://opensearch-project.github.io/helm-charts/
   - name: opensearch-dashboards
@@ -44,10 +44,10 @@ dependencies:
     version: 12.5.1
     repository: https://charts.bitnami.com/bitnami
   - name: fluent-bit
-    alias: logService
+    alias: logservice
     version: 0.40.0
     repository: https://fluent.github.io/helm-charts
   - name: seaweedfs
-    alias: storageService
+    alias: storageservice
     version: 3.59.4
     repository: https://seaweedfs.github.io/seaweedfs/helm

helm-charts/dbrepo/README.md

@@ -59,9 +59,9 @@ The Metadata Database uses the [Bitnami MariaDB Galera](https://artifacthub.io/p
 Helm chart. See their documentation for the remaining overridden values.
 
 | Name                       | Description                               | Value         |
-|-----------------------------|-------------------------------------------|---------------|
-| `metadata-db.host`          | Hostname.                                 | `metadata-db` |
-| `metadata-db.jdbcExtraArgs` | Extra arguments for the JDBC connections. | `""`          |
+|----------------------------|-------------------------------------------|---------------|
+| `metadataDb.host`          | Hostname.                                 | `metadata-db` |
+| `metadataDb.jdbcExtraArgs` | Extra arguments for the JDBC connections. | `""`          |
 
 ### Authentication Service
 
@@ -69,9 +69,9 @@ The Auth Service uses the [Bitnami Keycloak](https://artifacthub.io/packages/hel
 their documentation for the remaining overridden values.
 
 | Name                        | Description                                                     | Value                              |
-|------------------------------|-----------------------------------------------------------------|------------------------------------|
-| `auth-service.client.id`     | Client id. This value is publicly known.                        | `dbrepo-client`                    |
-| `auth-service.client.secret` | Client secret. This value should never be known outside DBRepo. | `MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG` |
+|-----------------------------|-----------------------------------------------------------------|------------------------------------|
+| `authService.client.id`     | Client id. This value is publicly known.                        | `dbrepo-client`                    |
+| `authService.client.secret` | Client secret. This value should never be known outside DBRepo. | `MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG` |
 
 ### Auth Database
 
@@ -79,9 +79,9 @@ The Auth Database uses the [Bitnami PostgreSQL HA](https://artifacthub.io/packag
 chart. See their documentation for the remaining overridden values.
 
 | Name          | Description                          | Value            |
-|----------------|--------------------------------------|------------------|
-| `auth-db.host` | Hostname. Needed for other services. | `auth-db-pgpool` |
-| `auth-db.port` | Port. Needed for other services.     | `5432`           |
+|---------------|--------------------------------------|------------------|
+| `authDb.host` | Hostname. Needed for other services. | `auth-db-pgpool` |
+| `authDb.port` | Port. Needed for other services.     | `5432`           |
 
 ### Data Database
 
@@ -96,11 +96,11 @@ the [OpenSearch](https://artifacthub.io/packages/helm/opensearch-project-helm-ch
 chart. See their documentation for the remaining overridden values.
 
 | Name                | Description                          | Value       |
-|----------------------|--------------------------------------|-------------|
-| `search-db.host`     | Hostname. Needed for other services. | `search-db` |
-| `search-db.port`     | Port. Needed for other services.     | `9200`      |
-| `search-db.username` | Username. Needed for other services. | `admin`     |
-| `search-db.password` | Password. Needed for other services. | `admin`     |
+|---------------------|--------------------------------------|-------------|
+| `searchdb.host`     | Hostname. Needed for other services. | `search-db` |
+| `searchdb.port`     | Port. Needed for other services.     | `9200`      |
+| `searchdb.username` | Username. Needed for other services. | `admin`     |
+| `searchdb.password` | Password. Needed for other services. | `admin`     |
 
 ### Search Database Dashboard
 
@@ -111,12 +111,12 @@ chart. See their documentation for the remaining overridden values.
 ### Upload Service
 
 | Name                             | Description                            | Value             |
-|-----------------------------------|----------------------------------------|-------------------|
-| `upload-service.enabled`          | Enables/disabled the deployment.       | `true`            |
-| `upload-service.image.registry`   | Registry to pull the image             | `docker.io`       |
-| `upload-service.image.repository` | Repository to pull the image           | `tusproject/tusd` |
-| `upload-service.image.tag`        | Tag of the image.                      | `v1.12`           |
-| `upload-service.replicaCount`     | Number of replicas for the deployment. | `2`               |
+|----------------------------------|----------------------------------------|-------------------|
+| `uploadService.enabled`          | Enables/disabled the deployment.       | `true`            |
+| `uploadService.image.registry`   | Registry to pull the image             | `docker.io`       |
+| `uploadService.image.repository` | Repository to pull the image           | `tusproject/tusd` |
+| `uploadService.image.tag`        | Tag of the image.                      | `v1.12`           |
+| `uploadService.replicaCount`     | Number of replicas for the deployment. | `2`               |
 
 ### Broker Service
 
@@ -124,15 +124,15 @@ The Broker Service uses the [Bitnami RabbitMQ](https://artifacthub.io/packages/h
 Helm chart. See their documentation for the remaining overridden values.
 
 | Name                              | Description                                                             | Value                         |
-|------------------------------------|-------------------------------------------------------------------------|-------------------------------|
-| `broker-service.url`               | Admin API endpoint. Needed for other services.                          | `http://broker-service:15672` |
-| `broker-service.host`              | Service hostname. Needed for other services.                            | `broker-service`              |
-| `broker-service.port`              | Service port. Needed for other services.                                | `5672`                        |
-| `broker-service.virtualHost`       | Virtual host on RabbitMQ. Needed for other services.                    | `dbrepo`                      |
-| `broker-service.queueName`         | Queue name on RabbitMQ. Needed for other services.                      | `dbrepo`                      |
-| `broker-service.exchangeName`      | Exchange name on RabbitMQ. Needed for other services.                   | `dbrepo`                      |
-| `broker-service.routingKey`        | Route binding for queue to exchange defined. Needed for other services. | `dbrepo.#`                    |
-| `broker-service.connectionTimeout` | Connection timeout. Needed for other services.                          | `60000`                       |
+|-----------------------------------|-------------------------------------------------------------------------|-------------------------------|
+| `brokerService.url`               | Admin API endpoint. Needed for other services.                          | `http://broker-service:15672` |
+| `brokerService.host`              | Service hostname. Needed for other services.                            | `broker-service`              |
+| `brokerService.port`              | Service port. Needed for other services.                                | `5672`                        |
+| `brokerService.virtualHost`       | Virtual host on RabbitMQ. Needed for other services.                    | `dbrepo`                      |
+| `brokerService.queueName`         | Queue name on RabbitMQ. Needed for other services.                      | `dbrepo`                      |
+| `brokerService.exchangeName`      | Exchange name on RabbitMQ. Needed for other services.                   | `dbrepo`                      |
+| `brokerService.routingKey`        | Route binding for queue to exchange defined. Needed for other services. | `dbrepo.#`                    |
+| `brokerService.connectionTimeout` | Connection timeout. Needed for other services.                          | `60000`                       |
 
 ### Analyse Service
 
@@ -205,9 +205,9 @@ The Storage Service uses the [SeaweedFS](https://artifacthub.io/packages/helm/se
 Helm chart. See their documentation for the remaining overridden values.
 
 | Name                           | Description                                 | Value            |
-|---------------------------------|---------------------------------------------|------------------|
-| `storage-service.auth.username` | Username for S3. Needed for other services. | `seaweedfsadmin` |
-| `storage-service.auth.password` | Password for S3. Needed for other services. | `seaweedfsadmin` |
+|--------------------------------|---------------------------------------------|------------------|
+| `storageservice.auth.username` | Username for S3. Needed for other services. | `seaweedfsadmin` |
+| `storageservice.auth.password` | Password for S3. Needed for other services. | `seaweedfsadmin` |
 
 ### User Interface
 

helm-charts/dbrepo/templates/data-service/secret.yaml

@@ -12,8 +12,8 @@ stringData:
   metadata-username: "{{ .Values.metadataDb.rootUser.user }}"
   metadata-password: "{{ .Values.metadataDb.rootUser.password }}"
   metadata-jdbc-extra-args: "{{ .Values.metadataDb.jdbcExtraArgs }}"
-  search-username: "{{ .Values.searchDb.username }}"
-  search-password: "{{ .Values.searchDb.password }}"
+  search-username: "{{ .Values.searchdb.username }}"
+  search-password: "{{ .Values.searchdb.password }}"
   jwt-issuer: "{{ $jwtIssuer }}"
   jwt-pubkey: "{{ .Values.dataService.jwt.pubkey }}"
   broker-username: "{{ .Values.brokerService.auth.username }}"

helm-charts/dbrepo/templates/metadata-service/secret.yaml

@@ -9,25 +9,25 @@ metadata:
 stringData:
   admin-email: "{{ .Values.metadataService.adminEmail }}"
   base-url: "{{ .Values.hostname }}"
-  broker-endpoint: "{{ index .Values "broker-service" "url" }}"
-  broker-host: "{{ index .Values "broker-service" "host" }}"
-  broker-port: "{{ index .Values "broker-service" "port" }}"
+  broker-endpoint: "{{ .Values.brokerService.url }}"
+  broker-host: "{{ .Values.brokerService.host }}"
+  broker-port: "{{ .Values.brokerService.port }}"
   gateway-endpoint: "{{ .Values.hostname }}"
   website: "{{ .Values.metadataService.website }}"
-  search-username: "{{ index .Values "search-db" "username" }}"
-  search-password: "{{ index .Values "search-db" "password" }}"
-  broker-username: "{{ index .Values "broker-service" "auth" "username" }}"
-  broker-password: "{{ index .Values "broker-service" "auth" "password" }}"
+  search-username: "{{ .Values.searchdb.username }}"
+  search-password: "{{ .Values.searchdb.password }}"
+  broker-username: "{{ .Values.brokerService.auth.username }}"
+  broker-password: "{{ .Values.brokerService.auth.password }}"
   log-level: "{{ ternary "trace" "info" .Values.metadataService.image.debug }}"
-  metadata-db: "{{ index .Values "metadata-db" "db" "name" }}"
-  metadata-host: "{{ index .Values "metadata-db" "host" }}"
-  metadata-username: "{{ index .Values "metadata-db" "rootUser" "user" }}"
-  metadata-password: "{{ index .Values "metadata-db" "rootUser" "password" }}"
-  metadata-jdbc-extra-args: "{{ index .Values "metadata-db" "jdbcExtraArgs" }}"
+  metadata-db: "{{ .Values.metadataDb.db.name }}"
+  metadata-host: "{{ .Values.metadataDb.host }}"
+  metadata-username: "{{ .Values.metadataDb.rootUser.user }}"
+  metadata-password: "{{ .Values.metadataDb.rootUser.password }}"
+  metadata-jdbc-extra-args: "{{ .Values.metadataDb.jdbcExtraArgs }}"
   keycloak-host: "{{ .Values.metadataService.authService.url }}"
-  keycloak-admin: "{{ index .Values "auth-service" "auth" "adminUser" }}"
-  keycloak-admin-password: "{{ index .Values "auth-service" "auth" "adminPassword" }}"
-  keycloak-client-secret: "{{ index .Values "auth-service" "client" "secret" }}"
+  keycloak-admin: "{{ .Values.authService.auth.adminUser }}"
+  keycloak-admin-password: "{{ .Values.authService.auth.adminPassword }}"
+  keycloak-client-secret: "{{ .Values.authService.client.secret }}"
   datacite-url: "{{ .Values.metadataService.datacite.url }}"
   datacite-prefix: "{{ .Values.metadataService.datacite.prefix | toString }}"
   datacite-username: "{{ .Values.metadataService.datacite.username }}"
@@ -35,17 +35,17 @@ stringData:
   repository-name: "{{ .Values.metadataService.repositoryName }}"
   pid-base: "{{ $pidBase }}"
   jwt-issuer: "{{ $jwtIssuer }}"
-  broker-virtualhost: "{{ index .Values "broker-service" "virtualHost" }}"
-  queue-name: "{{ index .Values "broker-service" "queueName" }}"
-  exchange-name: "{{ index .Values "broker-service" "exchangeName" }}"
-  routing-key: "{{ index .Values "broker-service" "routingKey" }}"
-  connection-timeout: "{{ index .Values "broker-service" "connectionTimeout" }}"
+  broker-virtualhost: "{{ .Values.brokerService.virtualHost }}"
+  queue-name: "{{ .Values.brokerService.queueName }}"
+  exchange-name: "{{ .Values.brokerService.exchangeName }}"
+  routing-key: "{{ .Values.brokerService.routingKey }}"
+  connection-timeout: "{{ .Values.brokerService.connectionTimeout }}"
   min-concurrent-consumers: "{{ .Values.dataService.consumerConcurrentMin }}"
   max-concurrent-consumers: "{{ .Values.dataService.consumerConcurrentMax }}"
   requeue-rejected: "{{ .Values.dataService.requeueRejected }}"
   s3-storage-endpoint: http://storage-service-s3:9000
-  s3-access-key-id: "{{ index .Values "storage-service" "s3" "auth" "username" }}"
-  s3-secret-access-key: "{{ index .Values "storage-service" "s3" "auth" "password" }}"
+  s3-access-key-id: "{{ .Values.storageservice.s3.auth.username }}"
+  s3-secret-access-key: "{{ .Values.storageservice.s3.auth.password }}"
   s3-import-bucket: "dbrepo-upload"
   s3-export-bucket: "dbrepo-download"
   delete-stale-files-rate: {{ .Values.metadataService.rates.deleteStaleFiles | quote }}

helm-charts/dbrepo/templates/search-db-dashboard/secret.yaml

@@ -17,5 +17,5 @@ stringData:
     opensearch:
       ssl:
         verificationMode: none
-      username: {{ .Values.searchDb.username }}
-      password: {{ .Values.searchDb.password }}
+      username: {{ .Values.searchdb.username }}
+      password: {{ .Values.searchdb.password }}

helm-charts/dbrepo/templates/search-service/secret.yaml

@@ -5,8 +5,8 @@ metadata:
   name: search-service-secret
   namespace: {{ .Values.namespace }}
 stringData:
-  opensearch-host: "{{ .Values.searchDb.host }}"
-  opensearch-port: "{{ .Values.searchDb.port }}"
-  opensearch-username: "{{ .Values.searchDb.username }}"
-  opensearch-password: "{{ .Values.searchDb.password }}"
+  opensearch-host: "{{ .Values.searchdb.host }}"
+  opensearch-port: "{{ .Values.searchdb.port }}"
+  opensearch-username: "{{ .Values.searchdb.username }}"
+  opensearch-password: "{{ .Values.searchdb.password }}"
   log-level: "{{ ternary "DEBUG" "INFO" .Values.searchService.image.debug }}"

helm-charts/dbrepo/templates/storage-service/secret.yaml

@@ -14,8 +14,8 @@ stringData:
           "name": "admin",
           "credentials": [
             {
-              "accessKey": "{{ .Values.storageService.s3.auth.username }}",
-              "secretKey": "{{ .Values.storageService.s3.auth.password }}"
+              "accessKey": "{{ .Values.storageservice.s3.auth.username }}",
+              "secretKey": "{{ .Values.storageservice.s3.auth.password }}"
             }
           ],
           "actions": [

helm-charts/dbrepo/templates/upload-service/secret.yaml

@@ -6,7 +6,7 @@ metadata:
   name: upload-service-secret
   namespace: {{ .Values.namespace }}
 stringData:
-  aws-access-key-id: "{{ .Values.storageService.s3.auth.username }}"
-  aws-secret-access-key: "{{ .Values.storageService.s3.auth.password }}"
+  aws-access-key-id: "{{ .Values.storageservice.s3.auth.username }}"
+  aws-secret-access-key: "{{ .Values.storageservice.s3.auth.password }}"
   aws-region: "default"
 {{- end }}
\ No newline at end of file

helm-charts/dbrepo/values.yaml

-namespace:
+namespace: ""
 
-hostname:
+hostname: ""
 
 strategyType: RollingUpdate
 
@@ -156,7 +156,7 @@ dataDb:
     sharedStorageClass: default
   replicaCount: 3 # uneven
 
-searchDb:
+searchdb:
   fullnameOverride: search-db
   host: search-db
   port: 9200
@@ -397,8 +397,7 @@ searchService:
     debug: false
   replicaCount: 2
 
-storageService:
-  fullnameOverride: storage-service
+storageservice:
   master:
     enabled: true
   filer:
@@ -428,7 +427,7 @@ storageService:
       username: seaweedfsadmin
       password: seaweedfsadmin
 
-logService:
+logservice:
   fullnameOverride: log-service
   config:
     outputs: |