aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/common
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2023-12-14 13:37:39 +0100
committerAndreas Geissler <andreas-geissler@telekom.de>2023-12-15 13:18:48 +0000
commitacb9fda1b15519023f5a46e93bee527a21aa316d (patch)
treed30b3870a23eb66fbb6804a0652de6282c341499 /kubernetes/common
parent43d6f2f39dac316e7203578675099cdcb4c3575b (diff)
[MARIADB] Fix db/user creation in operatormontreal
Fix the resource names for db/user in mariadb template for the mariadb-operator and corrected the resource notation to work with ArgoCD Added missing "user" entry for mariadb-galera in NBI and Etsicatalog values.yaml and missing dbName in SDNC Issue-ID: OOM-3255 Issue-ID: OOM-3257 Change-Id: Ib11c20ce99bdd7f29415611d2c0795466415eea6 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de> (cherry picked from commit 72caf09f07b4530e1bb34be348c4b845c9d0bfde)
Diffstat (limited to 'kubernetes/common')
-rw-r--r--kubernetes/common/common/templates/_mariadb.tpl16
-rw-r--r--kubernetes/common/mariadb-galera/values.yaml6
2 files changed, 11 insertions, 11 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
diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index 1ad72e2956..991c635749 100644
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -564,17 +564,17 @@ flavor: small
resources:
small:
limits:
- cpu: 1
+ cpu: '1'
memory: 4Gi
requests:
cpu: 500m
memory: 2Gi
large:
limits:
- cpu: 2
+ cpu: '2'
memory: 6Gi
requests:
- cpu: 1
+ cpu: '1'
memory: 3Gi
unlimited: {}