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>
apiVersion: mariadb.mmontes.io/v1alpha1
kind: Database
metadata:
apiVersion: mariadb.mmontes.io/v1alpha1
kind: Database
metadata:
+ name: {{ $dbinst }}-{{ $dbname }}
mariaDbRef:
name: {{ $dbinst }}
characterSet: utf8
mariaDbRef:
name: {{ $dbinst }}
characterSet: utf8
apiVersion: mariadb.mmontes.io/v1alpha1
kind: User
metadata:
apiVersion: mariadb.mmontes.io/v1alpha1
kind: User
metadata:
+ name: {{ $dbinst }}-{{ $dbuser }}
- # If you want the user to be created with a different name than the resource name
- # name: user-custom
mariaDbRef:
name: {{ $dbinst }}
passwordSecretKeyRef:
mariaDbRef:
name: {{ $dbinst }}
passwordSecretKeyRef:
gracefulShutdownTimeout: 5s
recovery:
enabled: true
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
initContainer:
image: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ $dot.Values.mariadbOperator.galera.initImage }}:{{ $dot.Values.mariadbOperator.galera.initVersion }}
imagePullPolicy: IfNotPresent
resources:
small:
limits:
resources:
small:
limits:
memory: 4Gi
requests:
cpu: 500m
memory: 2Gi
large:
limits:
memory: 4Gi
requests:
cpu: 500m
memory: 2Gi
large:
limits:
memory: 3Gi
unlimited: {}
memory: 3Gi
unlimited: {}
+ user: &dbUser etsicatalog
externalSecret: *dbSecretName
name: &mysqlDbName etsicatalog
nameOverride: &modeling-db modeling-db
externalSecret: *dbSecretName
name: &mysqlDbName etsicatalog
nameOverride: &modeling-db modeling-db
#application configuration user password about mariadb
db:
#application configuration user password about mariadb
db:
# userPassword: password
# userCredentialsExternalSecret: some-secret
# userPassword: password
# userCredentialsExternalSecret: some-secret
openStackRegion: RegionOne
openStackVNFTenantId: 31047205ce114b60833b23e400d6a535
db:
openStackRegion: RegionOne
openStackVNFTenantId: 31047205ce114b60833b23e400d6a535
db:
# userPassword: password
# userCredentialsExternalSecret: some-secret
mariadb-galera:
db:
# userPassword: password
# userCredentialsExternalSecret: some-secret
mariadb-galera:
db:
externalSecret: *dbUserSecretName
name: &mysqlDbName nbi
service:
externalSecret: *dbUserSecretName
name: &mysqlDbName nbi
service:
rootUser:
externalSecret: *rootDbSecret
db:
rootUser:
externalSecret: *rootDbSecret
db:
user: *dbUser
externalSecret: *dbSecretName
service:
user: *dbUser
externalSecret: *dbSecretName
service: