From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Wed, 12 Sep 2018 13:47:31 +0000 (+0000)
Subject: Merge "Mounting logback.xml file to champ MS"
X-Git-Tag: 3.0.0-ONAP~385
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=782351dfbd683f4a5f77e450369ac29d56922d68;hp=-c;p=oom.git

Merge "Mounting logback.xml file to champ MS"
---

782351dfbd683f4a5f77e450369ac29d56922d68
diff --combined kubernetes/aai/charts/aai-champ/templates/configmap.yaml
index baeb238fbc,ed72233db7..42733a7ab3
--- a/kubernetes/aai/charts/aai-champ/templates/configmap.yaml
+++ b/kubernetes/aai/charts/aai-champ/templates/configmap.yaml
@@@ -1,5 -1,4 +1,5 @@@
  # Copyright © 2018 Amdocs, AT&T
 +# Modifications Copyright © 2018 Bell Canada
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
@@@ -28,3 -27,11 +28,11 @@@ metadata
    namespace: {{ include "common.namespace" . }}
  data:
  {{ tpl (.Files.Glob "resources/config/dynamic/conf/*").AsConfig . | indent 2 }}
+ ---
+ apiVersion: v1
+ kind: ConfigMap
+ metadata:
+   name: {{ include "common.fullname" . }}-log-configmap
+   namespace: {{ include "common.namespace" . }}
+ data:
+ {{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}
diff --combined kubernetes/aai/charts/aai-champ/templates/deployment.yaml
index dc8cbb5aaf,c61b1053f4..0e2bb90aa7
--- a/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-champ/templates/deployment.yaml
@@@ -1,5 -1,4 +1,5 @@@
  # Copyright © 2018 Amdocs, AT&T
 +# Modifications Copyright © 2018 Bell Canada
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
@@@ -97,6 -96,9 +97,9 @@@ spec
            - mountPath: /opt/app/champ-service/dynamic/conf/champ-beans.xml
              name: {{ include "common.fullname" . }}-dynamic-config
              subPath: champ-beans.xml
+           - mountPath: /opt/app/champ-service/bundleconfig/etc/logback.xml
+             name: {{ include "common.fullname" . }}-logback-config
+             subPath: logback.xml
            - mountPath: /logs
              name: {{ include "common.fullname" . }}-logs
            resources:
@@@ -131,5 -133,11 +134,11 @@@
                path: champ-beans.xml
          - name: {{ include "common.fullname" . }}-logs
            emptyDir: {}
+         - name: {{ include "common.fullname" . }}-logback-config
+           configMap:
+             name: {{ include "common.fullname" . }}-log-configmap
+             items:
+             - key: logback.xml
+               path: logback.xml
        imagePullSecrets:
        - name: "{{ include "common.namespace" . }}-docker-registry-key"