diff options
| author |   yuryn <Yury.Novitsky@Amdocs.com> | 2017-09-27 14:54:18 +0300 |
|---|---|---|
| committer | Yury Novitsky <Yury.Novitsky@Amdocs.com> | 2017-09-27 16:39:45 +0000 |
| commit | d0707be0a30087bb5e30110dc09fdcdca1cd5d9d (patch) | |
| tree | d22bf2f0c9e5a52c207657172b61b507e9987872 /kubernetes/vid | |
| parent | 82a02441c188081380d735c387cd464d0f2f1e19 (diff) | |
added filebeat to all components
Deployment of: filebeat containar for each relevant component
+ chown of log dir to root - prevents filebeat complaining about filebeat file
+ ecomp web app renamed onap - fixed dep-pap.yaml
+ fixed multiple volumeMounts in vid-server
Change-Id: I74f8f2abd5feeba1d37b044d2a023674fd41c994
Issue-ID:OOM-110
Signed-off-by: yuryn <Yury.Novitsky@Amdocs.com>
Diffstat (limited to 'kubernetes/vid')
| -rw-r--r-- | kubernetes/vid/templates/vid-server-deployment.yaml | 28 | ||||
| -rw-r--r-- | kubernetes/vid/values.yaml | 3 |
2 files changed, 30 insertions, 1 deletions
diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml index 69c0b57ae1..ff341335a3 100644 --- a/kubernetes/vid/templates/vid-server-deployment.yaml +++ b/kubernetes/vid/templates/vid-server-deployment.yaml @@ -86,20 +86,48 @@ spec: image: {{ .Values.image.vid }} imagePullPolicy: {{ .Values.pullPolicy }} name: vid-server + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/usr/local/tomcat/webapps/vid/WEB-INF/classes/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"] ports: - containerPort: 8080 volumeMounts: - mountPath: /etc/localtime name: localtime readOnly: true + - mountPath: /var/log/onap + name: vid-logs + - mountPath: /tmp/logback.xml + name: vid-logback readinessProbe: tcpSocket: port: 8080 initialDelaySeconds: 5 periodSeconds: 10 + - image: {{ .Values.image.filebeat }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: filebeat-onap + volumeMounts: + - mountPath: /usr/share/filebeat/filebeat.yml + name: filebeat-conf + - mountPath: /var/log/onap + name: vid-logs + - mountPath: /usr/share/filebeat/data + name: vid-data-filebeat volumes: - name: localtime hostPath: path: /etc/localtime + - name: filebeat-conf + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml + - name: vid-logs + emptyDir: {} + - name: vid-data-filebeat + emptyDir: {} + - name: vid-logback + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/vid/logback.xml imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml index a7d494c73c..5d24d347d8 100644 --- a/kubernetes/vid/values.yaml +++ b/kubernetes/vid/values.yaml @@ -1,7 +1,8 @@ nsPrefix: onap -pullPolicy: IfNotPresent +pullPolicy: Always nodePortPrefix: 302 image: readiness: oomk8s/readiness-check:1.0.0 mariadb: nexus3.onap.org:10001/library/mariadb:10 vid: nexus3.onap.org:10001/openecomp/vid:1.1-STAGING-latest + filebeat: docker.elastic.co/beats/filebeat:5.5.0
\ No newline at end of file |