Hotfix chart component values

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: searchDb
+    alias: search-db
     version: 2.15.0 # app version 2.10.0
     repository: https://opensearch-project.github.io/helm-charts/
   - name: opensearch-dashboards
-    alias: searchDbDashboard
+    alias: search-db-dashboard
     version: 2.13.0 # app version 2.10.0
     repository: https://opensearch-project.github.io/helm-charts/
   - name: keycloak
-    alias: authService
+    alias: auth-service
     version: 17.3.3
     repository: https://charts.bitnami.com/bitnami
   - name: mariadb-galera
-    alias: dataDb
+    alias: data-db
     version: 11.0.1
     repository: https://charts.bitnami.com/bitnami
   - name: mariadb-galera
-    alias: metadataDb
+    alias: metadata-db
     version: 11.0.1
     repository: https://charts.bitnami.com/bitnami
   - name: postgresql-ha
-    alias: authDb
+    alias: auth-db
     version: 12.1.7
     repository: https://charts.bitnami.com/bitnami
   - name: rabbitmq
-    alias: brokerService
+    alias: broker-service
     version: 12.5.1
     repository: https://charts.bitnami.com/bitnami
   - name: fluent-bit
-    alias: logService
+    alias: log-service
     version: 0.40.0
     repository: https://fluent.github.io/helm-charts
   - name: seaweedfs
-    alias: storageService
+    alias: storage-service
     version: 3.59.4
     repository: https://seaweedfs.github.io/seaweedfs/helm

helm-charts/dbrepo/templates/auth-service/env-configmap.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: auth-service-config
-  namespace: {{ $.Values.namespace }}
+  namespace: {{ .Values.namespace }}
 data:
   KC_HOSTNAME_PATH: "/api/auth"
   KC_HOSTNAME_ADMIN_URL: "https://{{ .Values.hostname }}/api/auth"
\ No newline at end of file

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

@@ -4,8 +4,8 @@ metadata:
   name: auth-service-secret
   namespace: {{ .Values.namespace }}
 stringData:
-  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 }}"
+  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" }}"

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

@@ -3,7 +3,7 @@ kind: PersistentVolumeClaim
 metadata:
   name: data-db-shared
 spec:
-  storageClassName: {{ .Values.dataDb.persistence.sharedStorageClass }}
+  storageClassName: {{ index .Values "data-db" "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: "{{ .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 }}"
+  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" }}"
   jwt-issuer: "{{ $jwtIssuer }}"
   jwt-pubkey: "{{ .Values.dataService.jwt.pubkey }}"
-  broker-username: "{{ .Values.brokerService.auth.username }}"
-  broker-password: "{{ .Values.brokerService.auth.password }}"
+  broker-username: "{{ index .Values "broker-service" "auth" "username" }}"
+  broker-password: "{{ index .Values "broker-service" "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: "{{ .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 }}"
+  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

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

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: data-service
-  namespace: {{ $.Values.namespace }}
+  namespace: {{ .Values.namespace }}
   labels:
     service: data-service
 spec:

helm-charts/dbrepo/templates/metadata-db/configmap.yaml

@@ -108,6 +108,7 @@ data:
         description    text,
         engine         character varying(20),
         is_public      boolean                NOT NULL DEFAULT TRUE,
+        image          longblob,
         created_by     character varying(36),
         owned_by       character varying(36),
         contact_person character varying(36),
@@ -191,7 +192,7 @@ data:
         id        bigint                 NOT NULL AUTO_INCREMENT,
         column_id bigint                 NOT NULL,
         value     CHARACTER VARYING(255) NOT NULL,
-        FOREIGN KEY (column_id) REFERENCES mdb_columns (ID),
+        FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
         PRIMARY KEY (id)
     ) WITH SYSTEM VERSIONING;
 
@@ -200,7 +201,7 @@ data:
         id        bigint                 NOT NULL AUTO_INCREMENT,
         column_id bigint                 NOT NULL,
         value     CHARACTER VARYING(255) NOT NULL,
-        FOREIGN KEY (column_id) REFERENCES mdb_columns (ID),
+        FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
         PRIMARY KEY (id)
     ) WITH SYSTEM VERSIONING;
 

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: "{{ .Values.brokerService.url }}"
-  broker-host: "{{ .Values.brokerService.host }}"
-  broker-port: "{{ .Values.brokerService.port }}"
+  broker-endpoint: "{{ index .Values "broker-service" "url" }}"
+  broker-host: "{{ index .Values "broker-service" "host" }}"
+  broker-port: "{{ index .Values "broker-service" "port" }}"
   gateway-endpoint: "{{ .Values.hostname }}"
   website: "{{ .Values.metadataService.website }}"
-  search-username: "{{ .Values.searchDb.username }}"
-  search-password: "{{ .Values.searchDb.password }}"
-  broker-username: "{{ .Values.brokerService.auth.username }}"
-  broker-password: "{{ .Values.brokerService.auth.password }}"
+  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" }}"
   log-level: "{{ ternary "trace" "info" .Values.metadataService.image.debug }}"
-  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 }}"
+  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" }}"
   keycloak-host: "{{ .Values.metadataService.authService.url }}"
-  keycloak-admin: "{{ .Values.authService.auth.adminUser }}"
-  keycloak-admin-password: "{{ .Values.authService.auth.adminPassword }}"
-  keycloak-client-secret: "{{ .Values.authService.client.secret }}"
+  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" }}"
   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: "{{ .Values.brokerService.virtualHost }}"
-  queue-name: "{{ .Values.brokerService.queueName }}"
-  exchange-name: "{{ .Values.brokerService.exchangeName }}"
-  routing-key: "{{ .Values.brokerService.routingKey }}"
-  connection-timeout: "{{ .Values.brokerService.connectionTimeout }}"
+  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" }}"
   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: "{{ .Values.storageService.s3.auth.username }}"
-  s3-secret-access-key: "{{ .Values.storageService.s3.auth.password }}"
+  s3-access-key-id: "{{ index .Values "storage-service" "s3" "auth" "username" }}"
+  s3-secret-access-key: "{{ index .Values "storage-service" "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: {{ index .Values "search-db" "username" }}
+      password: {{ index .Values "search-db" "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: "{{ 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" }}"
   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": "{{ index .Values "storage-service" "s3" "auth" "username" }}",
+              "secretKey": "{{ index .Values "storage-service" "s3" "auth" "password" }}"
             }
           ],
           "actions": [

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

@@ -4,7 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: upload-service
-  namespace: {{ $.Values.namespace }}
+  namespace: {{ .Values.namespace }}
   labels:
     app: upload-service
     service: upload-service

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: "{{ index .Values "storage-service" "s3" "auth" "username" }}"
+  aws-secret-access-key: "{{ index .Values "storage-service" "s3" "auth" "password" }}"
   aws-region: "default"
 {{- end }}
\ No newline at end of file

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

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: upload-service
-  namespace: {{ $.Values.namespace }}
+  namespace: {{ .Values.namespace }}
   labels:
     service: upload-service
 spec:

helm-charts/dbrepo/values.yaml

@@ -6,7 +6,7 @@ strategyType: RollingUpdate
 
 clusterDomain: cluster.local
 
-metadataDb:
+metadata-db:
   fullnameOverride: metadata-db
   image:
     debug: false
@@ -35,7 +35,7 @@ metadataDb:
     storageClass: default
   replicaCount: 3 # uneven 3,5,7
 
-authService:
+auth-service:
   fullnameOverride: auth-service
   image:
     debug: false
@@ -71,7 +71,7 @@ authService:
       mountPath: /opt/bitnami/keycloak/data/import
   replicaCount: 2
 
-authDb:
+auth-db:
   fullnameOverride: auth-db
   host: auth-db-pgpool
   port: 5432
@@ -96,7 +96,7 @@ authDb:
     size: 10Gi
     storageClass: default
 
-dataDb:
+data-db:
   fullnameOverride: data-db
   image:
     debug: false
@@ -156,7 +156,7 @@ dataDb:
     sharedStorageClass: default
   replicaCount: 3 # uneven
 
-searchDb:
+search-db:
   fullnameOverride: search-db
   host: search-db
   port: 9200
@@ -232,7 +232,7 @@ searchDb:
                 ".opendistro-asynchronous-search-response*",
               ]
 
-searchDbDashboard:
+search-db-dashboard:
   fullnameOverride: search-db-dashboard
   opensearchHosts: http://search-db:9200
   extraInitContainers:
@@ -267,7 +267,7 @@ uploadService:
     tag: v1.12
   replicaCount: 2
 
-brokerService:
+broker-service:
   fullnameOverride: broker-service
   image:
     debug: true
@@ -327,9 +327,6 @@ brokerService:
       secret:
         secretName: broker-service-secret
   extraPlugins: rabbitmq_prometheus rabbitmq_auth_backend_oauth2 rabbitmq_auth_mechanism_ssl
-  extraEnvVars:
-    - name: BITNAMI_DEBUG
-      value: "true"
   persistence:
     enabled: false
     size: 5Gi
@@ -400,13 +397,13 @@ searchService:
     debug: false
   replicaCount: 2
 
-storageService:
+storage-service:
   fullnameOverride: storage-service
   master:
     enabled: true
   filer:
     enabled: true
-    replicas: 1
+    replicas: 2
     enablePVC: false
     storage: 25Gi
     s3:
@@ -418,10 +415,10 @@ storageService:
       existingConfigSecret: seaweedfs-s3-secret
   volume:
     enabled: true
-    replicas: 1
+    replicas: 2
   s3:
     enabled: true
-    replicas: 1
+    replicas: 2
     port: 9000
     metricsPort: 9091
     enableAuth: true
@@ -431,7 +428,7 @@ storageService:
       username: seaweedfsadmin
       password: seaweedfsadmin
 
-logService:
+log-service:
   fullnameOverride: log-service
   config:
     outputs: |