diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-03-31 12:07:23 +0200 |
|---|---|---|
| committer | Andreas Geissler <andreas-geissler@telekom.de> | 2023-04-07 11:04:23 +0000 |
| commit | f51bbef3978f1176551d6891c7e583d128a0875a (patch) | |
| tree | 3d0748e1b5f7090dc92108d85b2f4f587d7bb642 /kubernetes/modeling | |
| parent | bb32bf993ac2b74c12fc435e756d9ce98bb73611 (diff) | |
[COMMON][OTHERS] Fix dependency conditions
In case of local DB the "init" dependency is activated
as the "not" condition is not working
Issue-ID: OOM-3152
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I27dba69a644bbcc2b61245c22784976ba7c66173
Diffstat (limited to 'kubernetes/modeling')
3 files changed, 12 insertions, 4 deletions
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml index a90c700a8e..b1f6c4105a 100644 --- a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml +++ b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml @@ -30,7 +30,7 @@ dependencies: - name: mariadb-init version: ~12.x-0 repository: '@local' - condition: not global.mariadbGalera.localCluster + condition: global.mariadbGalera.globalCluster - name: readinessCheck version: ~12.x-0 repository: '@local' diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml index dd9c020c22..bfbff215db 100644 --- a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml +++ b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml @@ -41,8 +41,13 @@ spec: - command: - /app/ready.py args: - - -j - - "{{ include "common.release" . }}-{{ include "common.name" . }}-config-job" +{{- if .Values.global.mariadbGalera.localCluster }} + - --container-name + - {{ index .Values "mariadb-galera" "nameOverride" }} +{{- else }} + - --job-name + - {{ include "common.release" . }}-{{ include "common.name" . }}-config-job +{{- end }} env: - name: NAMESPACE valueFrom: diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml index 21abce3dda..c2b0dcff7d 100644 --- a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml +++ b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml @@ -22,8 +22,11 @@ global: mountPath: /dockerdata-nfs mariadbGalera: - #This flag allows Modeling to instantiate its own mariadb-galera cluster + #This flag allows SO to instantiate its own mariadb-galera cluster + #When changing it to "true", also set "globalCluster: false" + #as the dependency check will not work otherwise (Chart.yaml) localCluster: false + globalCluster: true service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera |