X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fportal%2Ftemplates%2Fconfigmap.yaml;fp=kubernetes%2Fportal%2Ftemplates%2Fportal-logs-configmap.yaml;h=8eea1912acb3b86042aa004047618b76f00662cb;hb=1d12388430a6112d86200fdabba1f156d6bf2ef6;hp=068adadbdba909b4f6d9698e86e2990bb5ea7ccc;hpb=ced8514d3c19dc5ba4ae8e42797fc731ef25d200;p=oom.git

diff --git a/kubernetes/portal/templates/portal-logs-configmap.yaml b/kubernetes/portal/templates/configmap.yaml
similarity index 55%
rename from kubernetes/portal/templates/portal-logs-configmap.yaml
rename to kubernetes/portal/templates/configmap.yaml
index 068adadbdb..8eea1912ac 100644
--- a/kubernetes/portal/templates/portal-logs-configmap.yaml
+++ b/kubernetes/portal/templates/configmap.yaml
@@ -12,29 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#{{ if not .Values.disablePortalPortalapps }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: portal-filebeat-configmap
-  namespace: {{ .Values.nsPrefix }}
+  name: portal-filebeat
+  namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/log/filebeat/filebeat.yml").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: portal-onapportal-log-configmap
-  namespace: {{ .Values.nsPrefix }}
-data:
-{{ tpl (.Files.Glob "resources/config/log/portal/onapportal/logback.xml").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: portal-onapportalsdk-log-configmap
-  namespace: {{ .Values.nsPrefix }}
-data:
-{{ tpl (.Files.Glob "resources/config/log/portal/onapportalsdk/logback.xml").AsConfig . | indent 2 }}
-#{{ end }}