diff options
| author |   Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2023-11-17 14:29:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2023-11-17 14:29:03 +0000 |
| commit | 2bc6e4f9445ae748b490a6024ac35e57794aff6a (patch) | |
| tree | 11682a6baf6d6932a2ba03d6bb4ebe8f5d9b9992 /kubernetes/common | |
| parent | 60f33d7fa1d42a7d75df330852cd35d2cd316f10 (diff) | |
| parent | 576de2dd4f523e2a47e9c2d1063395dae4efc776 (diff) | |
Merge "[MARIADB] Make the MariaDB service Operator aware"
Diffstat (limited to 'kubernetes/common')
| -rw-r--r-- | kubernetes/common/common/templates/_mariadb.tpl | 8 | ||||
| -rw-r--r-- | kubernetes/common/network-name-gen/values.yaml | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl index 5e0aed587c..c90b86c3a4 100644 --- a/kubernetes/common/common/templates/_mariadb.tpl +++ b/kubernetes/common/common/templates/_mariadb.tpl @@ -74,9 +74,17 @@ */}} {{- define "common.mariadbService" -}} {{- if .Values.global.mariadbGalera.localCluster -}} + {{- if .Values.global.mariadbGalera.useOperator }} + {{- printf "%s-primary" (index .Values "mariadb-galera" "nameOverride") -}} + {{- else }} {{- index .Values "mariadb-galera" "nameOverride" -}} + {{- end }} {{- else -}} + {{- if .Values.global.mariadbGalera.useOperator }} + {{- printf "%s-primary" (.Values.global.mariadbGalera.service) -}} + {{- else }} {{- .Values.global.mariadbGalera.service -}} + {{- end }} {{- end -}} {{- end -}} diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml index adfa468d6e..2ab9b93330 100644 --- a/kubernetes/common/network-name-gen/values.yaml +++ b/kubernetes/common/network-name-gen/values.yaml @@ -30,7 +30,7 @@ global: #as the dependency check will not work otherwise (Chart.yaml) localCluster: false globalCluster: true - service: mariadb-galera-primary + service: mariadb-galera internalPort: 3306 nameOverride: mariadb-galera |