X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fmariadb-galera%2Ftemplates%2Fconfigmap.yaml;h=0aa0a63f0a9f3a359cdb9b19eec050b0ab3e6330;hb=a4f1fa19963726fd617a9789358fbb3e42a08eb3;hp=094a76cf4555063b8f14eada78d8f03769cc077a;hpb=89623667ec00a4710e2c2b9f77a31d369e62f790;p=oom.git

diff --git a/kubernetes/common/mariadb-galera/templates/configmap.yaml b/kubernetes/common/mariadb-galera/templates/configmap.yaml
index 094a76cf45..0aa0a63f0a 100644
--- a/kubernetes/common/mariadb-galera/templates/configmap.yaml
+++ b/kubernetes/common/mariadb-galera/templates/configmap.yaml
@@ -1,18 +1,42 @@
+{{/*
+# Copyright © 2018 Amdocs, Bell Canada
+# 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.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
+{{- if .Values.global.mariadbGalera.useOperator }}
+{{    if .Values.mariadbOpConfiguration }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.fullname" . }}-confd
+  name: {{ printf "%s-configuration" (include "common.fullname" .) }}
   namespace: {{ include "common.namespace" . }}
+  labels: {{- include "common.labels" . | nindent 4 }}
 data:
-{{ tpl (.Files.Glob "resources/config/mariadb/conf.d/*").AsConfig . | indent 2 }}
----
-{{- if .Values.externalConfig }}
+  my.cnf: |
+{{ .Values.mariadbOpConfiguration | indent 4 }}
+{{-   end }}
+{{- else }}
+{{    if .Values.mariadbConfiguration }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "common.fullname" . }}-externalConfig
+  name: {{ printf "%s-configuration" (include "common.fullname" .) }}
   namespace: {{ include "common.namespace" . }}
+  labels: {{- include "common.labels" . | nindent 4 }}
 data:
-  my_extra.cnf: |-
-{{ toYaml .Values.externalConfig | indent 4 }}
-{{- end -}}
\ No newline at end of file
+  my.cnf: |
+{{ .Values.mariadbConfiguration | indent 4 }}
+{{-   end }}
+{{- end }}
\ No newline at end of file