From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Sun, 25 Jun 2023 10:57:54 +0000 (+0000)
Subject: Merge "[A1P] Correct the ConfigMap Naming" into london
X-Git-Tag: 12.0.0~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2d637b64c1c5848abded920966e073f2df2b7718;hp=b5bd1a3b0023a2b56fafb092465723bf9fa7856c;p=oom.git

Merge "[A1P] Correct the ConfigMap Naming" into london
---

diff --git a/kubernetes/a1policymanagement/templates/configmap.yaml b/kubernetes/a1policymanagement/templates/configmap.yaml
index e84beac2ab..13dd4dbd05 100644
--- a/kubernetes/a1policymanagement/templates/configmap.yaml
+++ b/kubernetes/a1policymanagement/templates/configmap.yaml
@@ -18,7 +18,6 @@
 
 apiVersion: v1
 kind: ConfigMap
-metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
-  name: {{ include "common.fullname" . }}-policy-conf
+metadata: {{- include "common.resourceMetadata" (dict "dot" . "suffix" "policy-conf" ) | nindent 2 }}
 data:
 {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/a1policymanagement/templates/envsubst-configmap.yaml b/kubernetes/a1policymanagement/templates/envsubst-configmap.yaml
index 99449638f4..f12d60127f 100644
--- a/kubernetes/a1policymanagement/templates/envsubst-configmap.yaml
+++ b/kubernetes/a1policymanagement/templates/envsubst-configmap.yaml
@@ -17,7 +17,6 @@
 */}}
 apiVersion: v1
 kind: ConfigMap
-metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
-  name: {{ include "common.fullname" . }}-envsubst-scripts
+metadata: {{- include "common.resourceMetadata" (dict "dot" . "suffix" "envsubst-scripts" ) | nindent 2 }}
 data:
 {{ tpl (.Files.Glob "resources/envsubst/*").AsConfig . | indent 2 }}