Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[dev-v2.9] rancher-logging 104.0.0 support resources on daemonsets #4295

Open
wants to merge 1 commit into
base: dev-v2.9
Choose a base branch
from
+12 −3
Open

[dev-v2.9] rancher-logging 104.0.0 support resources on daemonsets #4295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified assets/rancher-logging/rancher-logging-104.0.0+up4.4.0.tgz
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions charts/rancher-logging/104.0.0+up4.4.0/templates/loggings/k3s/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ spec:
seLinuxOptions:
type: rke_logreader_t
{{- end }}
resources:
{{- toYaml .Values.additionalLoggingSources.k3s.daemonSetResources | nindent 12 }}
volumeMounts:
- mountPath: /fluent-bit/etc/
name: config
Expand Down
4 changes: 3 additions & 1 deletion charts/rancher-logging/104.0.0+up4.4.0/templates/loggings/rke/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
selector:
matchLabels:
name: {{ .Release.Name }}-rke-aggregator
template:
template:gi
metadata:
name: "{{ .Release.Name }}-rke-aggregator"
namespace: "{{ .Release.Namespace }}"
Expand All @@ -19,6 +19,8 @@ spec:
containers:
- name: fluentbit
image: "{{ template "logging-operator.fluentbitImage" . }}"
resources:
{{- toYaml .Values.additionalLoggingSources.rke.daemonSetResources | nindent 12 }}
volumeMounts:
- mountPath: /var/lib/rancher/rke/log/
name: indir
Expand Down
2 changes: 2 additions & 0 deletions charts/rancher-logging/104.0.0+up4.4.0/templates/loggings/rke2/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ spec:
seLinuxOptions:
type: rke_logreader_t
{{- end }}
resources:
{{- toYaml .Values.additionalLoggingSources.rke2.daemonSetResources | nindent 12 }}
volumeMounts:
- mountPath: /fluent-bit/etc/
name: config
Expand Down
3 changes: 3 additions & 0 deletions charts/rancher-logging/104.0.0+up4.4.0/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,13 +362,16 @@ additionalLoggingSources:
fluentbit:
log_level: "info"
mem_buffer_limit: "5MB"
daemonSetResources: {}
rke2:
enabled: false
stripUnderscores: false
daemonSetResources: {}
k3s:
enabled: false
container_engine: "systemd"
stripUnderscores: false
daemonSetResources: {}
ricoapon marked this conversation as resolved.
Show resolved Hide resolved
aks:
enabled: false
eks:
Expand Down
4 changes: 2 additions & 2 deletions index.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16443,9 +16443,9 @@ entries:
catalog.cattle.io/upstream-version: 4.4.0
apiVersion: v2
appVersion: 4.4.0
created: "2024-07-17T10:51:06.883064825-04:00"
created: "2024-07-25T09:30:21.228282649Z"
description: Logging operator for Kubernetes based on Fluentd and Fluentbit.
digest: e678c61bb1dc49090b818afda2086d757e6e1d423781e87fab1d102140023a7f
digest: 19173e4cb67b2493ea5c309a0e63ccefdc11a8002167ad86766d73366bc1caaa
home: https://kube-logging.github.io
icon: file://assets/logos/rancher-logging.svg
keywords:
Expand Down