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

[dev-v2.11] rancher-logging 106.0.0-rc.1+up4.10.0-rancher.1 update #5212

Open
wants to merge 2 commits into
base: dev-v2.11
Choose a base branch
from
Open

[dev-v2.11] rancher-logging 106.0.0-rc.1+up4.10.0-rancher.1 update #5212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb7b009
Add priorityClass to DaemonSet/Logging/FluentBitAgent resources
jmeza-xyz Feb 24, 2025
de58f74
PACKAGE=rancher-logging make charts
jmeza-xyz Feb 24, 2025
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-106.0.0-rc.1+up4.10.0.tgz
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions charts/rancher-logging/106.0.0-rc.1+up4.10.0/templates/_generic_fluentbitagent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ spec:
{{- with .Values.nodeSelector }}
nodeSelector: {{- toYaml . | nindent 6 }}
{{- end }}
{{- with (default .Values.priorityClassName .Values.fluentd.podPriorityClassName) }}
podPriorityClassName: {{ . }}
{{- end }}
{{- with .Values.fluentbit.resources }}
resources: {{- toYaml . | nindent 6 }}
{{- end }}
Expand Down
5 changes: 4 additions & 1 deletion charts/rancher-logging/106.0.0-rc.1+up4.10.0/templates/_generic_logging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ spec:
{{- with (default .Values.nodeSelector .Values.fluentd.nodeSelector) }}
nodeSelector: {{- toYaml . | nindent 6 }}
{{- end }}
{{- with (default .Values.priorityClassName .Values.fluentd.podPriorityClassName) }}
podPriorityClassName: {{ . }}
{{- end }}
{{- with .Values.fluentd.resources }}
resources: {{- toYaml . | nindent 6 }}
{{- end }}
Expand Down Expand Up @@ -72,4 +75,4 @@ spec:

{{- define "logging-operator.logging" -}}
{{- include "logging-operator.util.merge.logging" (append . "logging-operator.logging.tpl") -}}
{{- end -}}
{{- end -}}
3 changes: 3 additions & 0 deletions charts/rancher-logging/106.0.0-rc.1+up4.10.0/templates/loggings/k3s/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ spec:
{{- with .Values.nodeSelector }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.priorityClassName }}
priorityClassName: {{ . }}
{{- end }}
serviceAccountName: "{{ .Release.Name }}-k3s-journald-aggregator"
volumes:
- name: config
Expand Down
3 changes: 3 additions & 0 deletions charts/rancher-logging/106.0.0-rc.1+up4.10.0/templates/loggings/rke/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ spec:
{{- with .Values.nodeSelector }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.priorityClassName }}
priorityClassName: {{ . }}
{{- end }}
---
apiVersion: v1
kind: ServiceAccount
Expand Down
3 changes: 3 additions & 0 deletions charts/rancher-logging/106.0.0-rc.1+up4.10.0/templates/loggings/rke2/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ spec:
{{- with .Values.nodeSelector }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.priorityClassName }}
priorityClassName: {{ . }}
{{- end }}
serviceAccountName: "{{ .Release.Name }}-rke2-journald-aggregator"
volumes:
- name: config
Expand Down
2 changes: 2 additions & 0 deletions charts/rancher-logging/106.0.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 @@ -442,6 +442,7 @@ fluentd:
initialDelaySeconds: 30
periodSeconds: 15
nodeSelector: {}
podPriorityClassName: ""
resources: {}
tolerations: {}
env: []
Expand All @@ -457,6 +458,7 @@ fluentbit:
Mem_Buf_Limit: ""
Multiline_Flush: ""
Skip_Long_Lines: ""
podPriorityClassName: ""
resources: {}
tolerations:
- key: node-role.kubernetes.io/control-plane
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 @@ -15242,9 +15242,9 @@ entries:
catalog.cattle.io/upstream-version: 4.10.0
apiVersion: v2
appVersion: 4.10.0
created: "2025-01-31T19:23:27.399296+05:30"
created: "2025-02-24T17:09:37.015642-05:00"
description: Logging operator for Kubernetes based on Fluentd and Fluentbit.
digest: 8e73d37d4854b3062bb0a2bd700180c6d47f2bfa7627f0b5d2bab6d6be225fd7
digest: ef2feb7a301c212d6a951f80c519072f6479ce8f868e28ad5ade3b06daee59d3
home: https://kube-logging.github.io
icon: file://assets/logos/rancher-logging.svg
keywords:
Expand Down
3 changes: 3 additions & 0 deletions packages/rancher-logging/generated-changes/overlay/templates/_generic_fluentbitagent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ spec:
{{- with .Values.nodeSelector }}
nodeSelector: {{- toYaml . | nindent 6 }}
{{- end }}
{{- with (default .Values.priorityClassName .Values.fluentd.podPriorityClassName) }}
podPriorityClassName: {{ . }}
{{- end }}
{{- with .Values.fluentbit.resources }}
resources: {{- toYaml . | nindent 6 }}
{{- end }}
Expand Down
5 changes: 4 additions & 1 deletion packages/rancher-logging/generated-changes/overlay/templates/_generic_logging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ spec:
{{- with (default .Values.nodeSelector .Values.fluentd.nodeSelector) }}
nodeSelector: {{- toYaml . | nindent 6 }}
{{- end }}
{{- with (default .Values.priorityClassName .Values.fluentd.podPriorityClassName) }}
podPriorityClassName: {{ . }}
{{- end }}
{{- with .Values.fluentd.resources }}
resources: {{- toYaml . | nindent 6 }}
{{- end }}
Expand Down Expand Up @@ -72,4 +75,4 @@ spec:

{{- define "logging-operator.logging" -}}
{{- include "logging-operator.util.merge.logging" (append . "logging-operator.logging.tpl") -}}
{{- end -}}
{{- end -}}
3 changes: 3 additions & 0 deletions packages/rancher-logging/generated-changes/overlay/templates/loggings/k3s/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ spec:
{{- with .Values.nodeSelector }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.priorityClassName }}
priorityClassName: {{ . }}
{{- end }}
serviceAccountName: "{{ .Release.Name }}-k3s-journald-aggregator"
volumes:
- name: config
Expand Down
3 changes: 3 additions & 0 deletions packages/rancher-logging/generated-changes/overlay/templates/loggings/rke/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ spec:
{{- with .Values.nodeSelector }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.priorityClassName }}
priorityClassName: {{ . }}
{{- end }}
---
apiVersion: v1
kind: ServiceAccount
Expand Down
3 changes: 3 additions & 0 deletions packages/rancher-logging/generated-changes/overlay/templates/loggings/rke2/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ spec:
{{- with .Values.nodeSelector }}
nodeSelector: {{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.priorityClassName }}
priorityClassName: {{ . }}
{{- end }}
serviceAccountName: "{{ .Release.Name }}-rke2-journald-aggregator"
volumes:
- name: config
Expand Down
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 @@ -186,6 +186,7 @@
+ initialDelaySeconds: 30
+ periodSeconds: 15
+ nodeSelector: {}
+ podPriorityClassName: ""
+ resources: {}
+ tolerations: {}
+ env: []
Expand All @@ -201,6 +202,7 @@
+ Mem_Buf_Limit: ""
+ Multiline_Flush: ""
+ Skip_Long_Lines: ""
+ podPriorityClassName: ""
+ resources: {}
+ tolerations:
+ - key: node-role.kubernetes.io/control-plane
Expand All @@ -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