Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[AUTHENTICATION] Restructured keycloak and Oauth2-proxy"
[oom.git]
/
kubernetes
/
common
/
mariadb-galera
/
templates
/
configmap.yaml
diff --git
a/kubernetes/common/mariadb-galera/templates/configmap.yaml
b/kubernetes/common/mariadb-galera/templates/configmap.yaml
index
a7064d7
..
0aa0a63
100644
(file)
--- a/
kubernetes/common/mariadb-galera/templates/configmap.yaml
+++ b/
kubernetes/common/mariadb-galera/templates/configmap.yaml
@@
-1,6
+1,6
@@
{{/*
# Copyright © 2018 Amdocs, Bell Canada
{{/*
# Copyright © 2018 Amdocs, Bell Canada
-# Copyright © 2020 Samsung Electronics
+# Copyright © 2020 Samsung Electronics
, TATA Communications, Bitnami, Orange
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-15,31
+15,28
@@
# limitations under the License.
*/}}
# limitations under the License.
*/}}
-{{- if .Values.externalConfig }}
+{{- if .Values.global.mariadbGalera.useOperator }}
+{{ if .Values.mariadbOpConfiguration }}
apiVersion: v1
kind: ConfigMap
metadata:
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{
include "common.fullname" . }}-external-config
+ name: {{
printf "%s-configuration" (include "common.fullname" .) }}
namespace: {{ include "common.namespace" . }}
namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ include "common.release" . }}
- heritage: {{ .Release.Service }}
+ labels: {{- include "common.labels" . | nindent 4 }}
data:
data:
- my_extra.cnf: |
-{{ .Values.externalConfig | indent 4 }}
-{{- end }}
----
+ my.cnf: |
+{{ .Values.mariadbOpConfiguration | indent 4 }}
+{{- end }}
+{{- else }}
+{{ if .Values.mariadbConfiguration }}
apiVersion: v1
kind: ConfigMap
metadata:
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{
include "common.fullname" .
}}
+ name: {{
printf "%s-configuration" (include "common.fullname" .)
}}
namespace: {{ include "common.namespace" . }}
namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ include "common.release" . }}
- heritage: {{ .Release.Service }}
+ labels: {{- include "common.labels" . | nindent 4 }}
data:
data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
+ my.cnf: |
+{{ .Values.mariadbConfiguration | indent 4 }}
+{{- end }}
+{{- end }}
\ No newline at end of file