Standardizing ONAP Portal

[oom.git] / kubernetes / portal / templates / configmap.yaml

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 068adad..8eea191 100644 (file)
--- 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 }}