Merge pull request #1799 from kube-logging/enable-docker-compat-cri-c…

…hart Add missing flag to chart
kube-logging · Aug 23, 2024 · 6043e85 · 6043e85
2 parents acd5494 + 9e26054
commit 6043e85
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/charts/logging-operator/README.md b/charts/logging-operator/README.md
@@ -85,6 +85,7 @@ Use `createCustomResource=false` with Helm v3 to avoid trying to create CRDs fro
 | logging.nodeAgents | object | `{}` | NodeAgent Configuration |
 | logging.configCheck | object | `{}` | configCheck provides possibility for timeout-based configuration checks https://kube-logging.dev/docs/whats-new/#timeout-based-configuration-checks |
 | logging.enableRecreateWorkloadOnImmutableFieldChange | bool | `false` | EnableRecreateWorkloadOnImmutableFieldChange enables the operator to recreate the fluentbit daemonset and the fluentd statefulset (and possibly other resource in the future) in case there is a change in an immutable field that otherwise couldn’t be managed with a simple update. |
+| logging.enableDockerParserCompatibilityForCRI | bool | `false` | EnableDockerParserCompatibilityForCRI enables Docker log format compatibility for CRI workloads. |
 | logging.clusterFlows | list | `[]` | ClusterFlows to deploy |
 | logging.clusterOutputs | list | `[]` | ClusterOutputs to deploy |
 | logging.eventTailer.enabled | bool | `false` |  |
@@ -93,7 +94,7 @@ Use `createCustomResource=false` with Helm v3 to avoid trying to create CRDs fro
 | logging.eventTailer.image.tag | string | `nil` | tag of eventTailer image |
 | logging.eventTailer.image.pullPolicy | string | `nil` | pullPolicy of eventTailer image |
 | logging.eventTailer.image.imagePullSecrets | list | `[]` | imagePullSecrets of eventTailer image |
-| logging.eventTailer.pvc.enabled | bool | `true` | enable pvc for  |
+| logging.eventTailer.pvc.enabled | bool | `true` | enable pvc for |
 | logging.eventTailer.pvc.accessModes | list | `["ReadWriteOnce"]` | storage class for event tailer pvc |
 | logging.eventTailer.pvc.volumeMode | string | `"Filesystem"` | storage class for event tailer pvc |
 | logging.eventTailer.pvc.storage | string | `"1Gi"` | storage for event tailer pvc |

diff --git a/charts/logging-operator/templates/logging/logging.yaml b/charts/logging-operator/templates/logging/logging.yaml
@@ -54,6 +54,9 @@ spec:
   {{- with .Values.logging.enableRecreateWorkloadOnImmutableFieldChange }}
   enableRecreateWorkloadOnImmutableFieldChange: {{ . }}
   {{- end }}
+  {{- with .Values.logging.enableDockerParserCompatibilityForCRI }}
+  enableDockerParserCompatibilityForCRI: {{ . }}
+  {{- end }}
   {{- with .Values.logging.configCheck }}
   configCheck: {{- toYaml . | nindent 4 }}
   {{- end }}

diff --git a/charts/logging-operator/values.yaml b/charts/logging-operator/values.yaml
@@ -207,6 +207,9 @@ logging:
   # -- EnableRecreateWorkloadOnImmutableFieldChange enables the operator to recreate the fluentbit daemonset and the fluentd statefulset (and possibly other resource in the future) in case there is a change in an immutable field that otherwise couldn’t be managed with a simple update.
   enableRecreateWorkloadOnImmutableFieldChange: false
 
+  # -- EnableDockerParserCompatibilityForCRI enables Docker log format compatibility for CRI workloads.
+  enableDockerParserCompatibilityForCRI: false
+
   # -- ClusterFlows to deploy
   clusterFlows: []
 
@@ -243,7 +246,7 @@ logging:
       # -- imagePullSecrets of eventTailer image
       imagePullSecrets: []
     pvc:
-      # -- enable pvc for 
+      # -- enable pvc for
       enabled: true
       # -- storage class for event tailer pvc
       accessModes: