Add DCAE cleanup job, update CBS version

Also fix CBS and policy handler filebeat loggging.
Shorten names in CBS to remain < 64 with 10-char
release name.

Issue-ID: DCAEGEN2-1729
Issue-ID: DCAEGEN2-1317
Issue-ID: DCAEGEN2-1747
Issue-ID: DCAEGEN2-1749
Issue-ID: DCAEGEN2-1750
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Change-Id: I5a727e3c9502205bc727439ed70728238d59d74e

2 files changed, 15 insertions, 23 deletions

diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml
index 5496aee2cb..c3e63fb968 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-config-binding-service/templates/deployment.yaml
@@ -104,25 +104,17 @@ spec:
               value: "/opt/tls/cert.pem"
             - name: HTTPS_KEY_PATH
               value: "/opt/tls/key.pem"
-            - name: TRUST_STORE_PATH
-              value: "/opt/app/prh/etc/cert/trust.jks"
-            - name: TRUST_STORE_PASS_PATH
-              value: "/opt/app/prh/etc/cert/trust.pass"
-            - name: KEY_STORE_PATH
-              value: "/opt/app/prh/etc/cert/key.p12"
-            - name: KEY_STORE_PASS_PATH
-              value: "/opt/app/prh/etc/cert/key.pass"
-        - name: {{ include "common.name" . }}-filebeat-onap
+        - name: {{ include "common.name" . }}-fb-onap
           image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           volumeMounts:
-          - name: {{ include "common.fullname" . }}-filebeat-conf
+          - name: {{ include "common.fullname" . }}-fb-conf
             mountPath: /usr/share/filebeat/filebeat.yml
             subPath: filebeat.yml
-          - name: {{ include "common.fullname" . }}-data-filebeat
+          - name: {{ include "common.fullname" . }}-data-fb
             mountPath: /usr/share/filebeat/data
           - name: {{ include "common.fullname" . }}-logs
-            mountPath: /var/log/onap
+            mountPath: /var/log/onap/config-binding-service
         {{ end }}
         {{- if .Values.service.insecure.enabled }}
         - name: {{ include "common.name" . }}-insecure
@@ -149,29 +141,29 @@ spec:
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           volumeMounts:
-          - name: {{ include "common.fullname" . }}-logs-insecure
+          - name: {{ include "common.fullname" . }}-logs-i
             mountPath: /opt/logs
           env:
             - name: CONSUL_HOST
               value: consul.{{ include "common.namespace" . }}
-        - name: {{ include "common.name" . }}-filebeat-onap-insecure
+        - name: {{ include "common.name" . }}-fb-onap-i
           image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           volumeMounts:
-          - name: {{ include "common.fullname" . }}-filebeat-conf
+          - name: {{ include "common.fullname" . }}-fb-conf
             mountPath: /usr/share/filebeat/filebeat.yml
             subPath: filebeat.yml
-          - name: {{ include "common.fullname" . }}-data-filebeat-insecure
+          - name: {{ include "common.fullname" . }}-data-fb-i
             mountPath: /usr/share/filebeat/data
-          - name: {{ include "common.fullname" . }}-logs-insecure
-            mountPath: /var/log/onap
+          - name: {{ include "common.fullname" . }}-logs-i
+            mountPath: /var/log/onap/config-binding-service
         {{ end }}
       volumes:
-        - name: {{ include "common.fullname" . }}-filebeat-conf
+        - name: {{ include "common.fullname" . }}-fb-conf
           configMap:
             name: {{ .Release.Name }}-cbs-filebeat-configmap
         {{- if .Values.service.secure.enabled }}
-        - name: {{ include "common.fullname" . }}-data-filebeat
+        - name: {{ include "common.fullname" . }}-data-fb
           emptyDir: {}
         - name:  {{ include "common.fullname" . }}-logs
           emptyDir: {}
@@ -179,9 +171,9 @@ spec:
           emptyDir: {}
         {{ end }}
         {{- if .Values.service.insecure.enabled }}
-        - name: {{ include "common.fullname" . }}-data-filebeat-insecure
+        - name: {{ include "common.fullname" . }}-data-fb-i
           emptyDir: {}
-        - name:  {{ include "common.fullname" . }}-logs-insecure
+        - name:  {{ include "common.fullname" . }}-logs-i
           emptyDir: {}
         {{ end }}
 
diff --git a/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml b/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml
index c7db0d5518..8cff544d93 100644
--- a/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-config-binding-service/values.yaml
@@ -45,7 +45,7 @@ config:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.platform.configbinding:2.5.1
+image: onap/org.onap.dcaegen2.platform.configbinding:2.5.2
 pullPolicy: Always
 
 # probe configuration parameters