From 74334debf85360a5def583595c25cf6a0c8fb6f9 Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Tue, 9 Apr 2024 15:43:32 +0200 Subject: [PATCH] Added switch to disable dependencies --- helm-charts/dbrepo/Chart.tpl.yaml | 12 ++++++++++-- helm-charts/dbrepo/Chart.yaml | 12 ++++++++++-- helm-charts/dbrepo/values.dev.yaml | 8 ++++++++ helm-charts/dbrepo/values.yaml | 8 ++++++++ 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/helm-charts/dbrepo/Chart.tpl.yaml b/helm-charts/dbrepo/Chart.tpl.yaml index f6e08559f6..587bd52dee 100644 --- a/helm-charts/dbrepo/Chart.tpl.yaml +++ b/helm-charts/dbrepo/Chart.tpl.yaml @@ -16,33 +16,41 @@ icon: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/ dependencies: - name: opensearch alias: searchdb - version: 2.15.0 # app version 2.10.0 + version: 2.15.0 repository: https://opensearch-project.github.io/helm-charts/ + condition: searchdb.enabled - name: opensearch-dashboards alias: searchDbDashboard - version: 2.13.0 # app version 2.10.0 + version: 2.13.0 repository: https://opensearch-project.github.io/helm-charts/ + condition: searchDbDashboard.enabled - name: keycloak alias: authService version: 17.3.3 repository: https://charts.bitnami.com/bitnami + condition: authService.enabled - name: mariadb-galera alias: dataDb version: 11.0.1 repository: https://charts.bitnami.com/bitnami + condition: dataDb.enabled - name: mariadb-galera alias: metadataDb version: 11.0.1 repository: https://charts.bitnami.com/bitnami + condition: metadataDb.enabled - name: postgresql-ha alias: authDb version: 12.1.7 repository: https://charts.bitnami.com/bitnami + condition: authDb.enabled - name: rabbitmq alias: brokerService version: 12.5.1 repository: https://charts.bitnami.com/bitnami + condition: brokerService.enabled - name: seaweedfs alias: storageservice version: 3.59.4 repository: https://seaweedfs.github.io/seaweedfs/helm + condition: storageservice.enabled diff --git a/helm-charts/dbrepo/Chart.yaml b/helm-charts/dbrepo/Chart.yaml index 3f0ac0297f..6417f15fe0 100644 --- a/helm-charts/dbrepo/Chart.yaml +++ b/helm-charts/dbrepo/Chart.yaml @@ -16,33 +16,41 @@ icon: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/ dependencies: - name: opensearch alias: searchdb - version: 2.15.0 # app version 2.10.0 + version: 2.15.0 repository: https://opensearch-project.github.io/helm-charts/ + condition: searchdb.enabled - name: opensearch-dashboards alias: searchDbDashboard - version: 2.13.0 # app version 2.10.0 + version: 2.13.0 repository: https://opensearch-project.github.io/helm-charts/ + condition: searchDbDashboard.enabled - name: keycloak alias: authService version: 17.3.3 repository: https://charts.bitnami.com/bitnami + condition: authService.enabled - name: mariadb-galera alias: dataDb version: 11.0.1 repository: https://charts.bitnami.com/bitnami + condition: dataDb.enabled - name: mariadb-galera alias: metadataDb version: 11.0.1 repository: https://charts.bitnami.com/bitnami + condition: metadataDb.enabled - name: postgresql-ha alias: authDb version: 12.1.7 repository: https://charts.bitnami.com/bitnami + condition: authDb.enabled - name: rabbitmq alias: brokerService version: 12.5.1 repository: https://charts.bitnami.com/bitnami + condition: brokerService.enabled - name: seaweedfs alias: storageservice version: 3.59.4 repository: https://seaweedfs.github.io/seaweedfs/helm + condition: storageservice.enabled diff --git a/helm-charts/dbrepo/values.dev.yaml b/helm-charts/dbrepo/values.dev.yaml index 95f4e14530..31708922f5 100644 --- a/helm-charts/dbrepo/values.dev.yaml +++ b/helm-charts/dbrepo/values.dev.yaml @@ -7,6 +7,7 @@ strategyType: RollingUpdate clusterDomain: cluster.local metadataDb: + enabled: true fullnameOverride: metadata-db image: debug: false @@ -34,6 +35,7 @@ metadataDb: replicaCount: 1 # uneven 3,5,7 authService: + enabled: true fullnameOverride: auth-service image: debug: false @@ -70,6 +72,7 @@ authService: replicaCount: 1 authDb: + enabled: true fullnameOverride: auth-db host: auth-db-pgpool port: 5432 @@ -95,6 +98,7 @@ authDb: size: 10Gi dataDb: + enabled: true fullnameOverride: data-db image: debug: false @@ -163,6 +167,7 @@ dataDbSidecar: storageClass: searchdb: + enabled: true fullnameOverride: search-db host: search-db port: 9200 @@ -240,6 +245,7 @@ searchdb: ] searchDbDashboard: + enabled: true fullnameOverride: search-db-dashboard opensearchHosts: http://search-db:9200 extraInitContainers: @@ -284,6 +290,7 @@ uploadService: replicaCount: 1 brokerService: + enabled: true fullnameOverride: broker-service image: debug: true @@ -405,6 +412,7 @@ searchService: replicaCount: 1 storageservice: + enabled: true master: enabled: true filer: diff --git a/helm-charts/dbrepo/values.yaml b/helm-charts/dbrepo/values.yaml index 655e158af7..ba938be037 100644 --- a/helm-charts/dbrepo/values.yaml +++ b/helm-charts/dbrepo/values.yaml @@ -7,6 +7,7 @@ strategyType: RollingUpdate clusterDomain: cluster.local metadataDb: + enabled: true fullnameOverride: metadata-db image: debug: false @@ -34,6 +35,7 @@ metadataDb: replicaCount: 1 # uneven 3,5,7 authService: + enabled: true fullnameOverride: auth-service image: debug: false @@ -70,6 +72,7 @@ authService: replicaCount: 1 authDb: + enabled: true fullnameOverride: auth-db host: auth-db-pgpool port: 5432 @@ -95,6 +98,7 @@ authDb: size: 10Gi dataDb: + enabled: true fullnameOverride: data-db image: debug: false @@ -163,6 +167,7 @@ dataDbSidecar: storageClass: searchdb: + enabled: true fullnameOverride: search-db host: search-db port: 9200 @@ -240,6 +245,7 @@ searchdb: ] searchDbDashboard: + enabled: true fullnameOverride: search-db-dashboard opensearchHosts: http://search-db:9200 extraInitContainers: @@ -284,6 +290,7 @@ uploadService: replicaCount: 1 brokerService: + enabled: true fullnameOverride: broker-service image: debug: true @@ -405,6 +412,7 @@ searchService: replicaCount: 1 storageservice: + enabled: true master: enabled: true filer: -- GitLab