diff --git a/helm/dbrepo-mariadb-galera/Chart.yaml b/helm/dbrepo-mariadb-galera/Chart.yaml
index 4be4337885fe446add1835f3a5296bc2a42f9583..f39aa491579df5df8e147e1cdeb9a05441af624b 100644
--- a/helm/dbrepo-mariadb-galera/Chart.yaml
+++ b/helm/dbrepo-mariadb-galera/Chart.yaml
@@ -6,14 +6,14 @@ description: Helm Chart for installing DBRepo Data Database
sources:
- https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services
type: application
-version: "1.4.6"
-appVersion: "1.4.6"
+version: "1.4.7"
+appVersion: "1.4.7"
keywords:
- dbrepo
maintainers:
- name: Martin Weise
email: martin.weise@tuwien.ac.at
-home: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/
+home: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/
icon: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/master/dbrepo-ui/public/favicon.png
dependencies:
- name: mariadb-galera
diff --git a/helm/dbrepo-mariadb-galera/templates/configmap.yaml b/helm/dbrepo-mariadb-galera/templates/configmap.yaml
index 066a0d1afbbc5d46cd00a1f5315195365aef0c66..db67a0f76a18f8452fc26597763bd1041ce0ebd5 100644
--- a/helm/dbrepo-mariadb-galera/templates/configmap.yaml
+++ b/helm/dbrepo-mariadb-galera/templates/configmap.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: database-setup
- namespace: {{ .Values.namespace }}
+ namespace: {{ include "common.names.namespace" . | quote }}
data:
{{- with .Values.database.extraInitDbScripts }}
{{ toYaml . | nindent 2 }}
diff --git a/helm/dbrepo-mariadb-galera/templates/secret.yaml b/helm/dbrepo-mariadb-galera/templates/secret.yaml
index fc5a2a7c5ddaa757c9fc29dc75b24d787a3c0656..78dad5e3afa45da011caebe51af6c56a68b57593 100644
--- a/helm/dbrepo-mariadb-galera/templates/secret.yaml
+++ b/helm/dbrepo-mariadb-galera/templates/secret.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
kind: Secret
metadata:
name: sidecar-secret
- namespace: {{ .Values.namespace }}
+ namespace: {{ include "common.names.namespace" . | quote }}
stringData:
S3_ACCESS_KEY_ID: "{{ .Values.s3.auth.adminAccessKeyId }}"
S3_SECRET_ACCESS_KEY: "{{ .Values.s3.auth.adminSecretAccessKey }}"
diff --git a/helm/dbrepo-mariadb-galera/values.yaml b/helm/dbrepo-mariadb-galera/values.yaml
index f5026a3b5bdeb9f1ce83e1b4b79cb5e87bef6122..1dd16b367b3c8c4bbe048ad6a0ff78a0cb8e1fec 100644
--- a/helm/dbrepo-mariadb-galera/values.yaml
+++ b/helm/dbrepo-mariadb-galera/values.yaml
@@ -45,7 +45,7 @@ database:
# VALUES ('MariaDB Galera TEST', 'mariadb_11_1_3', 1, 'data-db', 3306, 'data-db', 80, 'root', 'dbrepo');
# COMMIT;
## @param database.replicaCount The number of cluster nodes, should be uneven i.e. 2n+1
- replicaCount: 3
+ replicaCount: 1
persistence:
## @param database.persistence.enabled Enable persistent storage.
enabled: true
@@ -59,7 +59,7 @@ database:
## @skip database.sidecars
sidecars:
- name: sidecar
- image: registry.datalab.tuwien.ac.at/dbrepo/data-db-sidecar:1.4.5
+ image: registry.datalab.tuwien.ac.at/dbrepo/data-db-sidecar:1.4.6
imagePullPolicy: Always
securityContext:
runAsUser: 1001
diff --git a/helm/dbrepo/Chart.lock b/helm/dbrepo/Chart.lock
index 0937dd527af328b079b719db542efa264c410368..da97fe0213905453bbfa64ff175ac380a3962a97 100644
--- a/helm/dbrepo/Chart.lock
+++ b/helm/dbrepo/Chart.lock
@@ -29,5 +29,5 @@ dependencies:
- name: prometheus
repository: https://charts.bitnami.com/bitnami
version: 1.3.22
-digest: sha256:840d2ea4b1e36fe8fa399fc4170b6274a3de161c13a4a1a3b18ce3107ab71f79
-generated: "2024-10-01T07:48:55.174297756+02:00"
+digest: sha256:10e81a48c99d3ff8bd04b735f3039d8ac0cb5eefe7b45c4096242ca988afad64
+generated: "2024-10-20T19:37:42.898952802+02:00"
diff --git a/helm/dbrepo/Chart.yaml b/helm/dbrepo/Chart.yaml
index 9e09e7f8e37033cc9c8ff2fa4f1776f43212c59c..a08ce5859e92b86f97cc795a92bac9a19799764b 100644
--- a/helm/dbrepo/Chart.yaml
+++ b/helm/dbrepo/Chart.yaml
@@ -13,7 +13,7 @@ keywords:
maintainers:
- name: Martin Weise
email: martin.weise@tuwien.ac.at
-home: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/
+home: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/
icon: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/master/dbrepo-ui/public/favicon.png
dependencies:
- name: opensearch
diff --git a/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.6.tgz b/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.6.tgz
deleted file mode 100644
index 4af22ff6e998199f69a8e1ff43fd96c3f55aa8ec..0000000000000000000000000000000000000000
Binary files a/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.6.tgz and /dev/null differ
diff --git a/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.7.tgz b/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.7.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..506d0c1563ecb1ee9b94b404e295860b1711d573
Binary files /dev/null and b/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.7.tgz differ
diff --git a/helm/dbrepo/tmpcharts-529887/opensearch-1.2.2.tgz b/helm/dbrepo/tmpcharts-529887/opensearch-1.2.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..0393bfc1aa2fa964c68e66af6da6f356ea84e29f
Binary files /dev/null and b/helm/dbrepo/tmpcharts-529887/opensearch-1.2.2.tgz differ
diff --git a/helm/dbrepo/values.schema.json b/helm/dbrepo/values.schema.json
index a8e7bbbf743a45c32d8a3a43c8785f4c279fc0ba..21928f6a3ae2102ff8c61a2c36f3aaa98fcb89ec 100644
--- a/helm/dbrepo/values.schema.json
+++ b/helm/dbrepo/values.schema.json
@@ -530,6 +530,21 @@
},
"type": "object"
},
+ "extraVolumes": {
+ "items": {
+ "properties": {
+ "emptyDir": {
+ "properties": {},
+ "type": "object"
+ },
+ "name": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "type": "array"
+ },
"image": {
"properties": {
"debug": {
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index 68c2e4e06fed820f6c5858efdce9bcf97550fada..cb60ce9de5fd89e1c2533aabe77a05200bc56fe6 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -857,11 +857,11 @@ metricdb:
- job_name: 'actuator scrape'
metrics_path: '/actuator/prometheus'
static_configs:
- - targets: [ 'data-service', 'metadata-service', 'ui' ]
+ - targets: [ 'data-service', 'metadata-service' ]
- job_name: 'metrics scrape'
metrics_path: '/metrics'
static_configs:
- - targets: [ 'auth-service-metrics:8080', 'analyse-service', 'search-service', 'data-db:8080', 'data-db-metrics:9104', 'broker-service:9419', 'metadata-db-metrics:9104', 'storage-service-master-metrics:9327', 'upload-service' ]
+ - targets: [ 'auth-service-metrics:8080', 'ui', 'analyse-service', 'search-service', 'data-db:8080', 'data-db-metrics:9104', 'broker-service:9419', 'metadata-db-metrics:9104', 'storage-service-master-metrics:9327', 'upload-service' ]
- job_name: 'dashboard scrape'
metrics_path: '/dashboard/metrics'
static_configs: