(dev-v2.6-archive) fixed eks and k3s logging in airgap (#671)

(partially cherry picked from commit 60c84b3c3b)
pull/1680/head
Jacob Payne 2020-09-20 15:00:04 -07:00 committed by Arvind Iyengar
parent 5b49312554
commit 53db0ed5b4
No known key found for this signature in database
GPG Key ID: A8DD9BFD6C811498
3 changed files with 21 additions and 3 deletions

View File

@ -9,9 +9,15 @@ metadata:
spec:
controlNamespace: {{ .Release.Namespace }}
fluentbit:
image:
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
tag: {{ .Values.images.fluentbit.tag }}
inputTail:
Tag: "eks"
Path: "/var/log/messages"
Parser: "syslog"
fluentd: {}
fluentd:
image:
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
tag: {{ .Values.images.fluentd.tag }}
{{- end }}

View File

@ -9,6 +9,9 @@ metadata:
spec:
controlNamespace: {{ .Release.Namespace }}
fluentbit:
image:
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
tag: {{ .Values.images.fluentbit.tag }}
inputTail:
Tag: "k3s"
Path: "/var/log/k3s.log"
@ -16,5 +19,8 @@ spec:
- source: "/var/log/"
destination: "/var/log"
readOnly: true
fluentd: {}
fluentd:
image:
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
tag: {{ .Values.images.fluentd.tag }}
{{- end }}

View File

@ -9,6 +9,9 @@ metadata:
spec:
controlNamespace: {{ .Release.Namespace }}
fluentbit:
image:
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
tag: {{ .Values.images.fluentbit.tag }}
inputTail:
Tag: "k3s"
Path: "/var/log/syslog"
@ -16,5 +19,8 @@ spec:
- source: "/var/log/"
destination: "/var/log"
readOnly: true
fluentd: {}
fluentd:
image:
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
tag: {{ .Values.images.fluentd.tag }}
{{- end }}