Merge branch 'dev' into 'master'

Dev

See merge request !244

.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.0"
-  CHART_VERSION: "1.4.0"
+  APP_VERSION: "1.4.1"
+  CHART_VERSION: "1.4.1"
 
 image: debian:12-slim
 
@@ -598,7 +598,7 @@ docs-registry:
       - release-v1.3
       - release-v1.4
   script:
-    - pip install -r ./requirements.txt
+    - pip install pipenv && pipenv install --dev --system --deploy
     - python3 .docs/docker/release.py
   cache:
     paths:
@@ -624,7 +624,7 @@ docs-latest:
   script:
     - apt-get update && apt-get install -y git make sed
     - git fetch && git checkout master
-    - pip install -r ./requirements.txt
+    - pip install pipenv && pipenv install --dev --system --deploy
     - mkdir -p ./final
     - sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" .docs/redirect.html
     - cp ./.docs/redirect.html ./final/index.html
@@ -684,7 +684,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 -r ./.docs/requirements.txt
+    - pip install pipenv && pipenv install --dev --system --deploy
     - 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,38 +16,38 @@ 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: search-db
+    alias: searchDb
     version: 2.15.0 # app version 2.10.0
     repository: https://opensearch-project.github.io/helm-charts/
   - name: opensearch-dashboards
-    alias: search-db-dashboard
+    alias: searchDbDashboard
     version: 2.13.0 # app version 2.10.0
     repository: https://opensearch-project.github.io/helm-charts/
   - name: keycloak
-    alias: auth-service
+    alias: authService
     version: 17.3.3
     repository: https://charts.bitnami.com/bitnami
   - name: mariadb-galera
-    alias: data-db
+    alias: dataDb
     version: 11.0.1
     repository: https://charts.bitnami.com/bitnami
   - name: mariadb-galera
-    alias: metadata-db
+    alias: metadataDb
     version: 11.0.1
     repository: https://charts.bitnami.com/bitnami
   - name: postgresql-ha
-    alias: auth-db
+    alias: authDb
     version: 12.1.7
     repository: https://charts.bitnami.com/bitnami
   - name: rabbitmq
-    alias: broker-service
+    alias: brokerService
     version: 12.5.1
     repository: https://charts.bitnami.com/bitnami
   - name: fluent-bit
-    alias: log-service
+    alias: logService
     version: 0.40.0
     repository: https://fluent.github.io/helm-charts
   - name: seaweedfs
-    alias: storage-service
+    alias: storageService
     version: 3.59.4
     repository: https://seaweedfs.github.io/seaweedfs/helm

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

@@ -4,8 +4,8 @@ metadata:
   name: auth-service-secret
   namespace: {{ .Values.namespace }}
 stringData:
-  db-host: "{{ index .Values "auth-db" "host" }}"
-  db-port: "{{ index .Values "auth-db" "port" }}"
-  db-name: "{{ index .Values "auth-db" "postgresql" "database" }}"
-  db-username: "{{ index .Values "auth-db" "postgresql" "username" }}"
-  db-password: "{{ index .Values "auth-db" "postgresql" "password" }}"
+  db-host: "{{ .Values.authDb.host }}"
+  db-port: "{{ .Values.authDb.port }}"
+  db-name: "{{ .Values.authDb.postgresql.database }}"
+  db-username: "{{ .Values.authDb.postgresql.username }}"
+  db-password: "{{ .Values.authDb.postgresql.password }}"

helm-charts/dbrepo/templates/data-db/pvc.yaml

@@ -3,7 +3,7 @@ kind: PersistentVolumeClaim
 metadata:
   name: data-db-shared
 spec:
-  storageClassName: {{ index .Values "data-db" "persistence" "sharedStorageClass" }}
+  storageClassName: {{ .Values.dataDb.persistence.sharedStorageClass }}
   accessModes:
     - ReadWriteMany
   resources:

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

@@ -7,25 +7,25 @@ metadata:
   name: data-service-secret
   namespace: {{ .Values.namespace }}
 stringData:
-  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" }}"
-  search-username: "{{ index .Values "search-db" "username" }}"
-  search-password: "{{ index .Values "search-db" "password" }}"
+  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 }}"
+  search-username: "{{ .Values.searchDb.username }}"
+  search-password: "{{ .Values.searchDb.password }}"
   jwt-issuer: "{{ $jwtIssuer }}"
   jwt-pubkey: "{{ .Values.dataService.jwt.pubkey }}"
-  broker-username: "{{ index .Values "broker-service" "auth" "username" }}"
-  broker-password: "{{ index .Values "broker-service" "auth" "password" }}"
+  broker-username: "{{ .Values.brokerService.auth.username }}"
+  broker-password: "{{ .Values.brokerService.auth.password }}"
   min-concurrent-consumers: "{{ .Values.dataService.consumerConcurrentMin }}"
   max-concurrent-consumers: "{{ .Values.dataService.consumerConcurrentMax }}"
   requeue-rejected: "{{ .Values.dataService.requeueRejected }}"
   log-level: "{{ ternary "debug" "info" .Values.dataService.image.debug }}"
-  broker-host: "{{ index .Values "broker-service" "host" }}"
-  broker-port: "{{ index .Values "broker-service" "port" }}"
-  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" }}"
\ No newline at end of file
+  broker-host: "{{ .Values.brokerService.host }}"
+  broker-port: "{{ .Values.brokerService.port }}"
+  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 }}"
\ No newline at end of file

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

@@ -17,5 +17,5 @@ stringData:
     opensearch:
       ssl:
         verificationMode: none
-      username: {{ index .Values "search-db" "username" }}
-      password: {{ index .Values "search-db" "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: "{{ index .Values "search-db" "host" }}"
-  opensearch-port: "{{ index .Values "search-db" "port" }}"
-  opensearch-username: "{{ index .Values "search-db" "username" }}"
-  opensearch-password: "{{ index .Values "search-db" "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": "{{ index .Values "storage-service" "s3" "auth" "username" }}",
-              "secretKey": "{{ index .Values "storage-service" "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: "{{ index .Values "storage-service" "s3" "auth" "username" }}"
-  aws-secret-access-key: "{{ index .Values "storage-service" "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

@@ -6,7 +6,7 @@ strategyType: RollingUpdate
 
 clusterDomain: cluster.local
 
-metadata-db:
+metadataDb:
   fullnameOverride: metadata-db
   image:
     debug: false
@@ -35,7 +35,7 @@ metadata-db:
     storageClass: default
   replicaCount: 3 # uneven 3,5,7
 
-auth-service:
+authService:
   fullnameOverride: auth-service
   image:
     debug: false
@@ -71,7 +71,7 @@ auth-service:
       mountPath: /opt/bitnami/keycloak/data/import
   replicaCount: 2
 
-auth-db:
+authDb:
   fullnameOverride: auth-db
   host: auth-db-pgpool
   port: 5432
@@ -96,7 +96,7 @@ auth-db:
     size: 10Gi
     storageClass: default
 
-data-db:
+dataDb:
   fullnameOverride: data-db
   image:
     debug: false
@@ -156,7 +156,7 @@ data-db:
     sharedStorageClass: default
   replicaCount: 3 # uneven
 
-search-db:
+searchDb:
   fullnameOverride: search-db
   host: search-db
   port: 9200
@@ -232,7 +232,7 @@ search-db:
                 ".opendistro-asynchronous-search-response*",
               ]
 
-search-db-dashboard:
+searchDbDashboard:
   fullnameOverride: search-db-dashboard
   opensearchHosts: http://search-db:9200
   extraInitContainers:
@@ -267,7 +267,7 @@ uploadService:
     tag: v1.12
   replicaCount: 2
 
-broker-service:
+brokerService:
   fullnameOverride: broker-service
   image:
     debug: true
@@ -397,7 +397,7 @@ searchService:
     debug: false
   replicaCount: 2
 
-storage-service:
+storageService:
   fullnameOverride: storage-service
   master:
     enabled: true
@@ -428,7 +428,7 @@ storage-service:
       username: seaweedfsadmin
       password: seaweedfsadmin
 
-log-service:
+logService:
   fullnameOverride: log-service
   config:
     outputs: |