diff options
| author |   Alexis de Talhouët <adetalhouet89@gmail.com> | 2017-09-26 10:29:32 -0400 |
|---|---|---|
| committer |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2017-09-26 14:32:19 +0000 |
| commit | 91c77102cdc57ea5936789cacef6ad3e276b6054 (patch) | |
| tree | 5be96435c98a5aa923ad9140e31c42846afed681 /kubernetes/vid | |
| parent | 975d2a1a839489c47403d8ba6b610c3ab0de8bc4 (diff) | |
Revert "added filebeat to all components"
Pods aren't starting properly. Let's not take any risk, so reverting.
3m 18s 4 kubelet, kubernetes-5 spec.containers{vid-server} Normal Killing Killing container with id docker://vid-server:FailedPostStartHook
This reverts commit 4ca69ea2b6a2aaaf0974953a3c3dec7694fdfcb0.
Deployment of: filebeat containar for each relevant component Issue-ID:OOM-110
Change-Id: I7953ac3b0e2a4ecbdd1a7d2a48cb9a1964bf08ab
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Diffstat (limited to 'kubernetes/vid')
| -rw-r--r-- | kubernetes/vid/templates/vid-server-deployment.yaml | 29 | ||||
| -rw-r--r-- | kubernetes/vid/values.yaml | 3 |
2 files changed, 1 insertions, 31 deletions
diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml index 8226f54f0c..69c0b57ae1 100644 --- a/kubernetes/vid/templates/vid-server-deployment.yaml +++ b/kubernetes/vid/templates/vid-server-deployment.yaml @@ -86,15 +86,6 @@ spec: image: {{ .Values.image.vid }} imagePullPolicy: {{ .Values.pullPolicy }} name: vid-server - volumeMounts: - - mountPath: /var/log/onap - name: vid-logs - - mountPath: /tmp/logback.xml - name: vid-logback - lifecycle: - postStart: - exec: - command: ["/bin/sh", "-c", "sleep 20; cp -f /tmp/logback.xml /usr/local/tomcat/webapps/vid/WEB-INF/classes/logback.xml"] ports: - containerPort: 8080 volumeMounts: @@ -106,29 +97,9 @@ spec: 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 5d24d347d8..a7d494c73c 100644 --- a/kubernetes/vid/values.yaml +++ b/kubernetes/vid/values.yaml @@ -1,8 +1,7 @@ nsPrefix: onap -pullPolicy: Always +pullPolicy: IfNotPresent 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 |