aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2024-04-17 09:42:16 +0200
committerAndreas Geissler <andreas-geissler@telekom.de>2024-04-17 14:58:50 +0200
commit53490fa3240d2c1d9b4e4948f85d2a3ef0df3746 (patch)
tree8fb6af947b0dac1cb019c86544af8830dbe06d14
parentf8a899c48c91681eb61f3968583862ffc9e9ad73 (diff)
[MARIADB][POLICY] Correct the MariaDB ReadinessCheck
The configuration of an external MariaDB did not fit with the template function of _mariadb.tpl and additionally the template function has a bug in the service information. Issue-ID: OOM-3290 Change-Id: I92f758647012ebf289549665f7f5c20e94c9ff66 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
-rw-r--r--kubernetes/common/common/templates/_mariadb.tpl4
-rwxr-xr-xkubernetes/policy/values.yaml14
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