Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[MARIADB] Fix db/user creation in operator
[oom.git]
/
kubernetes
/
common
/
common
/
templates
/
_mariadb.tpl
diff --git
a/kubernetes/common/common/templates/_mariadb.tpl
b/kubernetes/common/common/templates/_mariadb.tpl
index
5e0aed5
..
7492f71
100644
(file)
--- a/
kubernetes/common/common/templates/_mariadb.tpl
+++ b/
kubernetes/common/common/templates/_mariadb.tpl
@@
-74,9
+74,17
@@
*/}}
{{- define "common.mariadbService" -}}
{{- if .Values.global.mariadbGalera.localCluster -}}
*/}}
{{- define "common.mariadbService" -}}
{{- if .Values.global.mariadbGalera.localCluster -}}
+ {{- if .Values.global.mariadbGalera.useOperator }}
+ {{- printf "%s-primary" (index .Values "mariadb-galera" "nameOverride") -}}
+ {{- else }}
{{- index .Values "mariadb-galera" "nameOverride" -}}
{{- index .Values "mariadb-galera" "nameOverride" -}}
+ {{- end }}
{{- else -}}
{{- else -}}
+ {{- if .Values.global.mariadbGalera.useOperator }}
+ {{- printf "%s-primary" (.Values.global.mariadbGalera.service) -}}
+ {{- else }}
{{- .Values.global.mariadbGalera.service -}}
{{- .Values.global.mariadbGalera.service -}}
+ {{- end }}
{{- end -}}
{{- end -}}
{{- end -}}
{{- end -}}
@@
-120,8
+128,9
@@
apiVersion: mariadb.mmontes.io/v1alpha1
kind: Database
metadata:
apiVersion: mariadb.mmontes.io/v1alpha1
kind: Database
metadata:
- name: {{ $dbname }}
+ name: {{ $db
inst }}-{{ $db
name }}
spec:
spec:
+ name: {{ $dbname }}
mariaDbRef:
name: {{ $dbinst }}
characterSet: utf8
mariaDbRef:
name: {{ $dbinst }}
characterSet: utf8
@@
-141,10
+150,9
@@
spec:
apiVersion: mariadb.mmontes.io/v1alpha1
kind: User
metadata:
apiVersion: mariadb.mmontes.io/v1alpha1
kind: User
metadata:
- name: {{ $dbuser }}
+ name: {{ $db
inst }}-{{ $db
user }}
spec:
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:
mariaDbRef:
name: {{ $dbinst }}
passwordSecretKeyRef:
@@
-265,14
+273,17
@@
spec:
gracefulShutdownTimeout: 5s
recovery:
enabled: true
gracefulShutdownTimeout: 5s
recovery:
enabled: true
- clusterHealthyTimeout: 5m
- clusterBootstrapTimeout: 10m
- podRecoveryTimeout: 5m
- podSyncTimeout: 10m
+ clusterHealthyTimeout: 5m
0s
+ clusterBootstrapTimeout: 10m
0s
+ podRecoveryTimeout: 5m
0s
+ podSyncTimeout: 10m
0s
initContainer:
image: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ $dot.Values.mariadbOperator.galera.initImage }}:{{ $dot.Values.mariadbOperator.galera.initVersion }}
imagePullPolicy: IfNotPresent
volumeClaimTemplate:
initContainer:
image: {{ include "repositoryGenerator.githubContainerRegistry" . }}/{{ $dot.Values.mariadbOperator.galera.initImage }}:{{ $dot.Values.mariadbOperator.galera.initVersion }}
imagePullPolicy: IfNotPresent
volumeClaimTemplate:
+ {{- if .Values.mariadbOperator.storageClassName }}
+ storageClassName: {{ .Values.mariadbOperator.storageClassName }}
+ {{- end }}
resources:
requests:
storage: 50Mi
resources:
requests:
storage: 50Mi