Merge "[NBI] Make NBI compatible with Kubernetes v1.17"

diff --git a/kubernetes/clamp/charts/mariadb/values.yaml b/kubernetes/clamp/charts/mariadb/values.yaml
index df651dd..2a90e84 100644 (file)
--- a/kubernetes/clamp/charts/mariadb/values.yaml
+++ b/kubernetes/clamp/charts/mariadb/values.yaml
@@ -21,7 +21,7 @@ global: # global defaults
 
   persistence: {}
 # application image
-repository: nexus3.onap.org:10001
+repository: docker.io
 image: mariadb:10.3.12
 pullPolicy: Always
 flavor: small

diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log4js/log4js.json b/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log4js/log4js.json
new file mode 100644 (file)
index 0000000..a93c8c5
--- /dev/null
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log4js/log4js.json
@@ -0,0 +1,32 @@
+{
+       "appenders": {
+               "out": {"type": "stdout"},
+               "audit": {
+                       "type": "file",
+                       "filename": "log/audit.log",
+                       "maxLogSize": 10240000,
+                       "backups": 10,
+                       "layout": {
+                               "type": "messagePassThrough"
+                       }
+               },
+               "metrics": {
+                       "type": "file",
+                       "filename": "log/metrics.log",
+                       "maxLogSize": 10240000,
+                       "backups": 10,
+                       "layout": {
+                               "type": "messagePassThrough"
+                       }
+               },
+               "error": {"type": "stdout"},
+               "debug": {"type": "stdout"}
+       },
+       "categories": {
+               "default": {"appenders": ["out"], "level": "debug"},
+               "audit": {"appenders": ["audit"], "level": "info"},
+               "metrics": {"appenders": ["metrics"], "level": "info"},
+               "error": {"appenders": ["error"], "level": "error"},
+               "debug": {"appenders": ["debug"], "level": "debug"}
+       }
+}
\ No newline at end of file

diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/configmap.yaml
old mode 100644 (file)
new mode 100755 (executable)
index 789c634..6c8ed25
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/configmap.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2019 AT&T
+# Modifications Copyright © 2020 Nokia
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,4 +32,12 @@ metadata:
   name: {{include "common.fullname" . }}-filebeat-configmap
   namespace: {{include "common.namespace" . }}
 data:
-{{ tpl (.Files.Glob "resources/log/*").AsConfig . | indent 2 }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/log/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{include "common.fullname" . }}-log4js-configmap
+  namespace: {{include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/log4js/*").AsConfig . | indent 2 }}

diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
old mode 100644 (file)
new mode 100755 (executable)
index ec3c72d..1a96bff
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2020 Nokia
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -115,6 +116,8 @@ spec:
               name: component-log
             - mountPath: /opt/app/dh/etc/cert/
               name: tls-info
+            - mountPath: /opt/app/dh/etc/
+              name: log4js-conf
           env:
             - name: CONSUL_HOST
               value: consul-server.{{ include "common.namespace" . }}
@@ -164,5 +167,9 @@ spec:
             defaultMode: 422
             name: {{ include "common.fullname" . }}-configmap
           name: dh-config
+        - configMap:
+            defaultMode: 420
+            name: {{include "common.fullname" . }}-log4js-configmap
+          name: log4js-conf
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"