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

[WIP] rancher-logging expose fluentd replica count #4825

Draft
wants to merge 3 commits into
base: dev-v2.10
Choose a base branch
from
Draft

[WIP] rancher-logging expose fluentd replica count #4825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bd2a87
expose fluentd replicas for rke2
jbiers Dec 9, 2024
510bbef
PACKAGE=rancher-logging make charts
jbiers Dec 9, 2024
c0237fa
Merge branch 'dev-v2.10' into expose-fluentd-metrics
jbiers Dec 9, 2024
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-105.1.0-rc.1+up4.10.0.tgz
View file
Open in desktop
Binary file not shown.
13 changes: 13 additions & 0 deletions charts/rancher-logging/105.1.0-rc.1+up4.10.0/templates/loggings/rke2/logging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{{- define "logging-operator.logging.rke2" -}}
metadata:
name: {{ .Release.Name }}-rke2
spec:
{{- if .Values.additionalLoggingSources.rke2.fluentd.replicas }}
fluentd:
scaling:
replicas: {{ .Values.additionalLoggingSources.rke2.fluentd.replicas }}
{{- end }}
{{- end -}}
{{- if .Values.additionalLoggingSources.rke2.enabled }}
{{- include "logging-operator.logging" (list . "logging-operator.logging.rke2") -}}
{{- end }}
2 changes: 2 additions & 0 deletions charts/rancher-logging/105.1.0-rc.1+up4.10.0/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,8 @@ additionalLoggingSources:
rke2:
enabled: false
stripUnderscores: false
fluentd:
replicas: 2
k3s:
enabled: false
container_engine: "systemd"
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 @@ -14980,9 +14980,9 @@ entries:
catalog.cattle.io/upstream-version: 4.10.0
apiVersion: v2
appVersion: 4.10.0
created: "2024-11-12T13:02:29.099775574-04:00"
created: "2024-12-09T14:30:53.312620206-04:00"
description: Logging operator for Kubernetes based on Fluentd and Fluentbit.
digest: 39c5d035ad60ba70318d080d76fa317a777cddd18b992ccb62f7aa640650b668
digest: 97285235fdd03cc683b6124186474bf1a3075f4112588841b505948137360bdc
home: https://kube-logging.github.io
icon: file://assets/logos/rancher-logging.svg
keywords:
Expand Down
13 changes: 13 additions & 0 deletions packages/rancher-logging/generated-changes/overlay/templates/loggings/rke2/logging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{{- define "logging-operator.logging.rke2" -}}
metadata:
name: {{ .Release.Name }}-rke2
spec:
{{- if .Values.additionalLoggingSources.rke2.fluentd.replicas }}
fluentd:
scaling:
replicas: {{ .Values.additionalLoggingSources.rke2.fluentd.replicas }}
{{- end }}
{{- end -}}
{{- if .Values.additionalLoggingSources.rke2.enabled }}
{{- include "logging-operator.logging" (list . "logging-operator.logging.rke2") -}}
{{- end }}
6 changes: 4 additions & 2 deletions packages/rancher-logging/generated-changes/patch/values.yaml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# -- storage class for event tailer pvc
accessModes:
- ReadWriteOnce
@@ -309,14 +304,176 @@
@@ -309,14 +304,178 @@
image: fluent/fluent-bit
pullPolicy: IfNotPresent
port: 8080
Expand Down Expand Up @@ -147,6 +147,8 @@
+ rke2:
+ enabled: false
+ stripUnderscores: false
+ fluentd:
+ replicas: 2
+ k3s:
+ enabled: false
+ container_engine: "systemd"
Expand Down Expand Up @@ -221,7 +223,7 @@

# -- Extra manifests to deploy as an array
extraManifests: []
@@ -327,3 +484,12 @@
@@ -327,3 +486,12 @@
# name: extra-manifest
# data:
# extra-data: "value"
Expand Down
Loading