summaryrefslogtreecommitdiffstats
path: root/kubernetes/appc
diff options
context:
space:
mode:
authorAlexis de Talhouët <adetalhouet89@gmail.com>2017-09-26 10:29:32 -0400
committerAlexis de Talhouët <alexis.de_talhouet@bell.ca>2017-09-26 14:32:19 +0000
commit91c77102cdc57ea5936789cacef6ad3e276b6054 (patch)
tree5be96435c98a5aa923ad9140e31c42846afed681 /kubernetes/appc
parent975d2a1a839489c47403d8ba6b610c3ab0de8bc4 (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/appc')
-rw-r--r--kubernetes/appc/templates/appc-deployment.yaml26
-rw-r--r--kubernetes/appc/values.yaml1
2 files changed, 1 insertions, 26 deletions
diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml
index b192c30fbf..661980b296 100644
--- a/kubernetes/appc/templates/appc-deployment.yaml
+++ b/kubernetes/appc/templates/appc-deployment.yaml
@@ -46,7 +46,7 @@ spec:
- name: MYSQL_ROOT_PASSWORD
value: openECOMP1.0
- name: SDNC_CONFIG_DIR
- value: /opt/openecomp/sdnc/data/properties
+ value: /opt/openecomp/appc/data/properties
- name: APPC_CONFIG_DIR
value: /opt/openecomp/appc/data/properties
- name: DMAAP_TOPIC_ENV
@@ -66,10 +66,6 @@ spec:
name: sdnc-aaiclient-properties
- mountPath: /opt/openecomp/sdnc/data/properties/admportal.json
name: sdnc-admportal-json
- - mountPath: /var/log/onap
- name: appc-logs
- - mountPath: /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg
- name: appc-log-config
ports:
- containerPort: 8181
- containerPort: 1830
@@ -78,30 +74,10 @@ spec:
port: 8181
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: appc-logs
- - mountPath: /usr/share/filebeat/data
- name: appc-data-filebeat
volumes:
- name: localtime
hostPath:
path: /etc/localtime
- - name: filebeat-conf
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
- - name: appc-log-config
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/appc/org.ops4j.pax.logging.cfg
- - name: appc-logs
- emptyDir: {}
- - name: appc-data-filebeat
- emptyDir: {}
- name: appc-properties
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf/appc.properties
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index ea14b83960..7916b734aa 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -6,4 +6,3 @@ image:
appc: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest
mysqlServer: mysql/mysql-server:5.6
dgbuilderSdnc: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.1-STAGING-latest
- filebeat: docker.elastic.co/beats/filebeat:5.5.0 \ No newline at end of file