Merge "[A1P] Correct the ConfigMap Naming"

diff --git a/kubernetes/a1policymanagement/templates/configmap.yaml b/kubernetes/a1policymanagement/templates/configmap.yaml
index e84beac..13dd4db 100644 (file)
--- 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 9944963..f12d601 100644 (file)
--- 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 }}