From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Thu, 22 Jun 2023 09:36:14 +0000 (+0200)
Subject: [A1P] Correct the ConfigMap Naming
X-Git-Tag: 12.0.0~5^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b0fc540158a2a55fdd692c8237b3280ca18e4a57;p=oom.git

[A1P] Correct the ConfigMap Naming

Fix the definition of ConfigMap definitions to remove
doubled names

Issue-ID: OOM-3198

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: Ibe56b731eeaf59ee55e260a3684595a0b75ee288
(cherry picked from commit 3dbdcdb96ae6ffbd149e8610d5b15a7a4af465ea)
---

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 }}