Merge "[UUI] Service Mesh Compliance for UUI"

[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 094a76c..c95a234 100644 (file)
--- a/kubernetes/common/mariadb-galera/templates/configmap.yaml
+++ b/kubernetes/common/mariadb-galera/templates/configmap.yaml
@@ -1,18 +1,28 @@
+{{/*
+# 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.mariadbConfiguration }}
 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 }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-externalConfig
-  namespace: {{ include "common.namespace" . }}
-data:
-  my_extra.cnf: |-
-{{ toYaml .Values.externalConfig | indent 4 }}
-{{- end -}}
\ No newline at end of file
+  my.cnf: |
+{{ .Values.mariadbConfiguration | indent 4 }}
+{{- end }}
\ No newline at end of file