Fix logging to Kafka on ONOS 2.2
Need ONOS with Karaf>4.2.8 to support logging on Kafka with KafkaAppender of
log4j2.
Change-Id: I6f53329dcf367c93f7913d363c3048e80c2c5392
diff --git a/onos/templates/deployment.yaml b/onos/templates/deployment.yaml
index fc6c014..85cd1ff 100644
--- a/onos/templates/deployment.yaml
+++ b/onos/templates/deployment.yaml
@@ -55,30 +55,10 @@
- name: node-key
mountPath: /root/vtn
readOnly: true
+{{- if .Values.kafka_logging.enabled }}
- name: onos-logs-cfg
- mountPath: /root/onos/apache-karaf-3.0.8/etc/org.ops4j.pax.logging.cfg
+ mountPath: /root/onos/apache-karaf-4.2.8/etc/org.ops4j.pax.logging.cfg
subPath: org.ops4j.pax.logging.cfg
- - name: onos-logs
- mountPath: /root/onos/apache-karaf-3.0.8/data/log
-{{- if .Values.log_agent.enabled }}
- - name: {{ .Chart.Name }}-log-agent
- image: "{{ .Values.global.registry }}{{ .Values.images.log_agent.repository }}:{{ .Values.images.log_agent.tag }}"
- imagePullPolicy: {{ .Values.images.log_agent.pullPolicy }}
- args: [ "-c", "/conf/filebeat.yml", "-e" ]
- env:
- - name: POD_NAMESPACE
- valueFrom:
- fieldRef:
- fieldPath: metadata.namespace
- - name: NODE_NAME
- valueFrom:
- fieldRef:
- fieldPath: spec.nodeName
- volumeMounts:
- - name: onos-logs
- mountPath: /onos_logs
- - name: log-agent-configmap-volume
- mountPath: /conf
{{- end }}
volumes:
- name: node-key
@@ -86,22 +66,16 @@
secretName: node-key
defaultMode: 256
optional: true
+{{- if .Values.kafka_logging.enabled }}
- name: onos-logs-cfg
configMap:
name: {{ template "onos.fullname" . }}-onos
items:
- key: logCfg
path: org.ops4j.pax.logging.cfg
+{{- end}}
- name: onos-logs
emptyDir: {}
-{{- if .Values.log_agent.enabled }}
- - name: log-agent-configmap-volume
- configMap:
- name: {{ template "onos.fullname" . }}-log-agent-configmap
- items:
- - key: config
- path: filebeat.yml
-{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
@@ -114,6 +88,3 @@
tolerations:
{{ toYaml . | indent 8 }}
{{- end }}
-{{- if .Values.log_agent.enabled }}
-{{- include "onos.log-agent-configmap" . }}
-{{- end }}