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/mso/templates | |
| 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/mso/templates')
| -rw-r--r-- | kubernetes/mso/templates/mso-deployment.yaml | 70 |
1 files changed, 3 insertions, 67 deletions
diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml index ce327fe7a4..862f572d3c 100644 --- a/kubernetes/mso/templates/mso-deployment.yaml +++ b/kubernetes/mso/templates/mso-deployment.yaml @@ -42,7 +42,7 @@ spec: spec: containers: - command: - - /docker-files/scripts/start-jboss-server.sh + - /tmp/start-jboss-server.sh image: {{ .Values.image.mso }} imagePullPolicy: {{ .Values.pullPolicy }} name: mso @@ -52,28 +52,8 @@ spec: readOnly: true - mountPath: /shared name: mso - - mountPath: /docker-files + - mountPath: /tmp/start-jboss-server.sh name: mso-docker-files - - mountPath: /var/log/onap - name: mso-logs - - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-api-handler-infra-config/logback.apihandler-infra.xml - name: logback-apihandler-infra - - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.network.xml - name: logback-network - - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.tenant.xml - name: logback-tenant - - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.vnf.xml - name: logback-vnf - - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-appc-adapter-config/logback.appc.xml - name: logback-appc - - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-requests-db-adapter-config/logback.msorequestsdbadapter.xml - name: logback-msorequestsdbadapter - - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-asdc-controller-config/logback.asdc.xml - name: logback-asdc - - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-sdnc-adapter-config/logback.sdnc.xml - name: logback-sdnc - - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-bpmn-config/logback.bpmn.xml - name: logback-bpmn env: - name: JBOSS_DEBUG value: "false" @@ -88,59 +68,15 @@ 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: mso-logs - - mountPath: /usr/share/filebeat/data - name: mso-data-filebeat volumes: - name: localtime hostPath: path: /etc/localtime - - name: logback-apihandler-infra - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.apihandler-infra.xml - - name: logback-network - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.network.xml - - name: logback-tenant - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.tenant.xml - - name: logback-vnf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.vnf.xml - - name: logback-appc - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.appc.xml - - name: logback-msorequestsdbadapter - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.msorequestsdbadapter.xml - - name: logback-asdc - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.asdc.xml - - name: logback-sdnc - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.sdnc.xml - - name: logback-bpmn - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/mso/logback.bpmn.xml - name: mso hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/mso - - name: filebeat-conf - hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml - - name: mso-logs - emptyDir: {} - - name: mso-data-filebeat - emptyDir: {} - name: mso-docker-files hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/mso/docker-files/scripts/start-jboss-server.sh imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" |