summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarish V Kajur <vk250x@att.com>2018-05-07 14:02:46 +0000
committerHarish V Kajur <vk250x@att.com>2018-05-07 14:03:52 +0000
commitcef6152f5de3ae0bec495e9284faf476cd6cbc06 (patch)
tree15df6f69e02e3a987df8471d80200e7c9d69dd83
parentae29f3c1227e96337aff9bfef8afd016818a0c8a (diff)
Update log path to get filebeat working
for resources and traversal microservice as well as add shasum to configmap so when doing an upgrade on the charts and if the configmaps are updated due to that the containers responsible for that configmap gets restarted as well Issue-ID: AAI-1110 Change-Id: Ie2b539f512003a30dd82cdaa497141cb7f49bf7d Signed-off-by: Harish V Kajur <vk250x@att.com>
-rw-r--r--charts/aai-cassandra/templates/volumes.yaml4
-rw-r--r--charts/aai-resources/templates/deployment.yaml3
-rw-r--r--charts/aai-traversal/templates/deployment.yaml3
3 files changed, 6 insertions, 4 deletions
diff --git a/charts/aai-cassandra/templates/volumes.yaml b/charts/aai-cassandra/templates/volumes.yaml
index 0e1a3df..f45a450 100644
--- a/charts/aai-cassandra/templates/volumes.yaml
+++ b/charts/aai-cassandra/templates/volumes.yaml
@@ -5,7 +5,7 @@
apiVersion: v1
kind: PersistentVolume
metadata:
- name: {{ $root.Values.service.name }}-{{ $i }}
+ name: {{ $root.Release.Name }}-{{ $root.Values.service.name }}-{{ $i }}
namespace: {{ $root.Release.Namespace }}
labels:
type: {{ $root.Values.persistence.storageType }}
@@ -22,4 +22,4 @@ spec:
path: {{ $root.Values.persistence.mountPath }}/{{ $root.Release.Name }}/{{ $root.Values.persistence.mountSubPath }}-{{ $i }}
persistentVolumeReclaimPolicy: {{ $root.Values.persistence.volumeReclaimPolicy }}
{{ end }}
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/charts/aai-resources/templates/deployment.yaml b/charts/aai-resources/templates/deployment.yaml
index 6c65bce..932534a 100644
--- a/charts/aai-resources/templates/deployment.yaml
+++ b/charts/aai-resources/templates/deployment.yaml
@@ -34,6 +34,7 @@ spec:
release: {{ .Release.Name }}
name: {{ include "common.name" . }}
annotations:
+ checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
msb.onap.org/service-info: '[
{
"serviceName": "_aai-cloudInfrastructure",
@@ -453,7 +454,7 @@ spec:
- mountPath: /opt/app/aai-resources/resources/etc/appprops/aaiconfig.properties
name: {{ include "common.fullname" . }}-aaiconfig-conf
subPath: aaiconfig.properties
- - mountPath: /var/log/onap
+ - mountPath: /opt/aai/logroot/AAI-RES
name: {{ include "common.fullname" . }}-logs
- mountPath: /opt/app/aai-resources/resources/logback.xml
name: {{ include "common.fullname" . }}-log-conf
diff --git a/charts/aai-traversal/templates/deployment.yaml b/charts/aai-traversal/templates/deployment.yaml
index bda80a0..a0cfa60 100644
--- a/charts/aai-traversal/templates/deployment.yaml
+++ b/charts/aai-traversal/templates/deployment.yaml
@@ -34,6 +34,7 @@ spec:
release: {{ .Release.Name }}
name: {{ include "common.name" . }}
annotations:
+ checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
msb.onap.org/service-info: '[
{
"serviceName": "_aai-generic-query",
@@ -287,7 +288,7 @@ spec:
- mountPath: /opt/app/aai-traversal/resources/etc/appprops/aaiconfig.properties
name: {{ include "common.fullname" . }}-aaiconfig-conf
subPath: aaiconfig.properties
- - mountPath: /var/log/onap
+ - mountPath: /opt/aai/logroot/AAI-GQ
name: {{ include "common.fullname" . }}-logs
- mountPath: /opt/app/aai-traversal/resources/logback.xml
name: {{ include "common.fullname" . }}-log-conf