X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fmariadb-galera%2Ftemplates%2Fconfigmap.yaml;h=ff6e119b0ca460cfc72e604be563ddc6242261ed;hb=b97b5b43213a4e211719482fd306a485f794fd66;hp=54096cf5c052b2b9bb088a73b6bf7f8cde60e295;hpb=13ffd5d63520ff08d7a3abdf035bbcb38b55e50c;p=oom.git

diff --git a/kubernetes/common/mariadb-galera/templates/configmap.yaml b/kubernetes/common/mariadb-galera/templates/configmap.yaml
index 54096cf5c0..ff6e119b0c 100644
--- a/kubernetes/common/mariadb-galera/templates/configmap.yaml
+++ b/kubernetes/common/mariadb-galera/templates/configmap.yaml
@@ -12,21 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-confd
-  namespace: {{ include "common.namespace" . }}
-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
+  name: {{ include "common.fullname" . }}-external-config
   namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 data:
-  my_extra.cnf: |-
-{{ toYaml .Values.externalConfig | indent 4 }}
-{{- end -}}
\ No newline at end of file
+  my_extra.cnf: |
+{{ .Values.externalConfig | indent 4 }}
+{{- end -}}