X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Ftemplates%2Fsearch-data-service-configmap.yaml;h=43d9da02e2bc0bed2209cc9f1b0b221b459979c4;hb=8bfc6cf8c3d338c84c48201f7a4f274958e721a9;hp=8f707d4ca31e5be3f53b291e79ae98d192a1bf38;hpb=f0a34e22011b4323bbd6a51ad313d6e547808101;p=oom.git

diff --git a/kubernetes/aai/templates/search-data-service-configmap.yaml b/kubernetes/aai/templates/search-data-service-configmap.yaml
index 8f707d4ca3..43d9da02e2 100644
--- a/kubernetes/aai/templates/search-data-service-configmap.yaml
+++ b/kubernetes/aai/templates/search-data-service-configmap.yaml
@@ -2,16 +2,16 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: search-data-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-search-data-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/*").AsConfig . | indent 2 }}
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: search-data-keystone-secret
-  namespace: {{ .Values.nsPrefix }}-aai
+  name: aai-search-data-keystone-secret
+  namespace: {{ .Values.nsPrefix }}
 type: Opaque
 data:
 {{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/auth/tomcat_keystore").AsSecrets . | indent 2 }}
@@ -20,7 +20,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aai-search-policy-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/auth/search_policy.json").AsSecrets . | indent 2 }}
 ---
@@ -28,7 +28,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: aai-search-data-service-log-configmap
-  namespace: {{ .Values.nsPrefix }}-aai
+  namespace: {{ .Values.nsPrefix }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/search-data-service/logback.xml").AsConfig . | indent 2 }}
 #{{ end }}