diff options
| author |   Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2024-04-22 13:58:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2024-04-22 13:58:38 +0000 |
| commit | 31ed63f0d15aad775eac50e309ad21f732dfb228 (patch) | |
| tree | de2cac70e0904e5768298c3b9ed501bbd8eb314d | |
| parent | edfcd494c54a435ee4c4257ff1abe0e67fc9456f (diff) | |
| parent | 53490fa3240d2c1d9b4e4948f85d2a3ef0df3746 (diff) | |
Merge "[MARIADB][POLICY] Correct the MariaDB ReadinessCheck"
| -rw-r--r-- | kubernetes/common/common/templates/_mariadb.tpl | 4 | ||||
| -rwxr-xr-x | kubernetes/policy/values.yaml | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl index 41259b3b4f..3092298a7d 100644 --- a/kubernetes/common/common/templates/_mariadb.tpl +++ b/kubernetes/common/common/templates/_mariadb.tpl @@ -80,11 +80,7 @@ {{- 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/policy/values.yaml b/kubernetes/policy/values.yaml index f01160fc87..9497c3c2c4 100755 --- a/kubernetes/policy/values.yaml +++ b/kubernetes/policy/values.yaml @@ -29,10 +29,9 @@ global: # with '*mariadbConfig' pointer. config: &mariadbConfig mysqlDatabase: policyadmin - service: &mariadbService - name: &policy-mariadb policy-mariadb - internalPort: 3306 - nameOverride: *policy-mariadb + service: &mariadbService policy-mariadb + internalPort: 3306 + nameOverride: *mariadbService # (optional) if localCluster=false and an external secret is used set this variable #userRootSecret: <secretName> prometheusEnabled: false @@ -232,9 +231,10 @@ mariadb-galera: name: &mysqlDbName policyadmin rootUser: externalSecret: *dbRootPassSecretName - nameOverride: *policy-mariadb + nameOverride: *mariadbService # mariadb-galera.service and global.mariadbGalera.service must be equals - service: *mariadbService + service: + name: *mariadbService replicaCount: 1 mariadbOperator: galera: @@ -243,7 +243,7 @@ mariadb-galera: enabled: true mountSubPath: policy/maria/data serviceAccount: - nameOverride: *policy-mariadb + nameOverride: *mariadbService postgresImage: library/postgres:latest # application configuration override for postgres |