diff --git a/assets/rancher-logging/rancher-logging-105.1.0-rc.1+up4.10.0.tgz b/assets/rancher-logging/rancher-logging-105.1.0-rc.1+up4.10.0.tgz index 27f7cb41d1..3d3edfe50a 100644 Binary files a/assets/rancher-logging/rancher-logging-105.1.0-rc.1+up4.10.0.tgz and b/assets/rancher-logging/rancher-logging-105.1.0-rc.1+up4.10.0.tgz differ diff --git a/charts/rancher-logging/105.1.0-rc.1+up4.10.0/templates/loggings/rke2/logging.yaml b/charts/rancher-logging/105.1.0-rc.1+up4.10.0/templates/loggings/rke2/logging.yaml new file mode 100644 index 0000000000..a253a956ee --- /dev/null +++ b/charts/rancher-logging/105.1.0-rc.1+up4.10.0/templates/loggings/rke2/logging.yaml @@ -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 }} \ No newline at end of file diff --git a/charts/rancher-logging/105.1.0-rc.1+up4.10.0/values.yaml b/charts/rancher-logging/105.1.0-rc.1+up4.10.0/values.yaml index a3fdb5a430..b0501ec2c8 100644 --- a/charts/rancher-logging/105.1.0-rc.1+up4.10.0/values.yaml +++ b/charts/rancher-logging/105.1.0-rc.1+up4.10.0/values.yaml @@ -403,6 +403,8 @@ additionalLoggingSources: rke2: enabled: false stripUnderscores: false + fluentd: + replicas: 2 k3s: enabled: false container_engine: "systemd" diff --git a/index.yaml b/index.yaml index 7055760e52..122c943531 100755 --- a/index.yaml +++ b/index.yaml @@ -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: diff --git a/packages/rancher-logging/generated-changes/overlay/templates/loggings/rke2/logging.yaml b/packages/rancher-logging/generated-changes/overlay/templates/loggings/rke2/logging.yaml new file mode 100644 index 0000000000..a253a956ee --- /dev/null +++ b/packages/rancher-logging/generated-changes/overlay/templates/loggings/rke2/logging.yaml @@ -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 }} \ No newline at end of file diff --git a/packages/rancher-logging/generated-changes/patch/values.yaml.patch b/packages/rancher-logging/generated-changes/patch/values.yaml.patch index 9eb026eb0b..6fffb600cf 100644 --- a/packages/rancher-logging/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-logging/generated-changes/patch/values.yaml.patch @@ -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 @@ -147,6 +147,8 @@ + rke2: + enabled: false + stripUnderscores: false ++ fluentd: ++ replicas: 2 + k3s: + enabled: false + container_engine: "systemd" @@ -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"