diff options
Diffstat (limited to 'kubernetes/common/common/templates/_mariadb.tpl')
| -rw-r--r-- | kubernetes/common/common/templates/_mariadb.tpl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl index ff3f7f88c3..7492f71f0a 100644 --- a/kubernetes/common/common/templates/_mariadb.tpl +++ b/kubernetes/common/common/templates/_mariadb.tpl @@ -128,8 +128,9 @@ apiVersion: mariadb.mmontes.io/v1alpha1 kind: Database metadata: - name: {{ $dbname }} + name: {{ $dbinst }}-{{ $dbname }} spec: + name: {{ $dbname }} mariaDbRef: name: {{ $dbinst }} characterSet: utf8 @@ -149,10 +150,9 @@ spec: apiVersion: mariadb.mmontes.io/v1alpha1 kind: User metadata: - name: {{ $dbuser }} + name: {{ $dbinst }}-{{ $dbuser }} spec: - # If you want the user to be created with a different name than the resource name - # name: user-custom + name: {{ $dbuser }} mariaDbRef: name: {{ $dbinst }} passwordSecretKeyRef: @@ -273,10 +273,10 @@ spec: gracefulShutdownTimeout: 5s recovery: enabled: true - clusterHealthyTimeout: 5m - clusterBootstrapTimeout: 10m - podRecoveryTimeout: 5m - podSyncTimeout: 10m + clusterHealthyTimeout: 5m0s + clusterBootstrapTimeout: 10m0s + podRecoveryTimeout: 5m0s + podSyncTimeout: 10m0s initContainer: image: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ $dot.Values.mariadbOperator.galera.initImage }}:{{ $dot.Values.mariadbOperator.galera.initVersion }} imagePullPolicy: IfNotPresent |