[dev-2.9] rancher-logging 104.0.0-rc1 add option to set fluentd log l…

…evel (rancher#3931) Signed-off-by: Dharmit Shah <dharmit.shah@suse.com>
p-se · May 21, 2024 · 7727915 · 7727915
1 parent 0a16e93
commit 7727915
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 3 deletions.
diff --git a/assets/rancher-logging/rancher-logging-104.0.0-rc1+up4.4.0.tgz b/assets/rancher-logging/rancher-logging-104.0.0-rc1+up4.4.0.tgz
diff --git a/charts/rancher-logging/104.0.0-rc1+up4.4.0/templates/_generic_logging.yaml b/charts/rancher-logging/104.0.0-rc1+up4.4.0/templates/_generic_logging.yaml
@@ -59,6 +59,9 @@ spec:
     resources: {{- toYaml . | nindent 6 }}
     {{- end }}
   fluentd:
+    {{- with .Values.fluentd.logLevel }}
+    logLevel: {{ . }}
+    {{- end }}
     image:
       repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
       tag: {{ .Values.images.fluentd.tag }}

diff --git a/charts/rancher-logging/104.0.0-rc1+up4.4.0/values.yaml b/charts/rancher-logging/104.0.0-rc1+up4.4.0/values.yaml
@@ -407,6 +407,7 @@ fluentd:
   resources: {}
   tolerations: {}
   env: []
+  logLevel: {}
 fluentbit:
   inputTail:
     Buffer_Chunk_Size: ""

diff --git a/index.yaml b/index.yaml
@@ -14516,9 +14516,9 @@ entries:
       catalog.cattle.io/upstream-version: 4.4.0
     apiVersion: v2
     appVersion: 4.4.0
-    created: "2024-05-01T12:13:07.962098-04:00"
+    created: "2024-05-17T09:28:37.061150326+05:30"
     description: Logging operator for Kubernetes based on Fluentd and Fluentbit.
-    digest: 71a103de8a6e06e5d55ba4cfc6fdc0c1b91096910d22fd74dcccd97b43fa3c0f
+    digest: 703d185f4dca6dbc757d32560533af7fad2b2bdedacbec35382b45beaec68cd6
     home: https://kube-logging.github.io
     icon: file://assets/logos/rancher-logging.svg
     keywords:

diff --git a/packages/rancher-logging/generated-changes/overlay/templates/_generic_logging.yaml b/packages/rancher-logging/generated-changes/overlay/templates/_generic_logging.yaml
@@ -59,6 +59,9 @@ spec:
     resources: {{- toYaml . | nindent 6 }}
     {{- end }}
   fluentd:
+    {{- with .Values.fluentd.logLevel }}
+    logLevel: {{ . }}
+    {{- end }}
     image:
       repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
       tag: {{ .Values.images.fluentd.tag }}

diff --git a/packages/rancher-logging/generated-changes/patch/values.yaml.patch b/packages/rancher-logging/generated-changes/patch/values.yaml.patch
@@ -43,7 +43,7 @@
 
  # -- Node Affinity
  affinity: {}
-@@ -267,11 +266,173 @@
+@@ -267,11 +266,174 @@
    image: fluent/fluent-bit
    pullPolicy: IfNotPresent
    port: 8080
@@ -196,6 +196,7 @@
 +  resources: {}
 +  tolerations: {}
 +  env: []
++  logLevel: {}
 +fluentbit:
 +  inputTail:
 +    Buffer_Chunk_Size: ""