diff --git a/charts/logging-operator/README.md b/charts/logging-operator/README.md index 3f72b0998..6594362da 100644 --- a/charts/logging-operator/README.md +++ b/charts/logging-operator/README.md @@ -64,7 +64,7 @@ Use `createCustomResource=false` with Helm v3 to avoid trying to create CRDs fro | tolerations | list | `[]` | Node Tolerations | | affinity | object | `{}` | Node Affinity | | podLabels | object | `{}` | Define which Nodes the Pods are scheduled on. | -| logging | object | `{"allowClusterResourcesFromAllNamespaces":false,"clusterDomain":"cluster.local.","clusterFlows":[],"clusterOutputs":[],"controlNamespace":"","defaultFlow":{},"enableRecreateWorkloadOnImmutableFieldChange":false,"enabled":false,"errorOutputRef":"","eventTailer":{},"flowConfigCheckDisabled":false,"flowConfigOverride":"","fluentbit":{},"fluentbitDisabled":false,"fluentd":{},"fluentdDisabled":false,"globalFilters":[],"hostTailer":{},"loggingRef":"","nodeAgents":{},"skipInvalidResources":false,"syslogNG":{},"watchNamespaceSelector":{},"watchNamespaces":[]}` | Logging resources configuration. | +| logging | object | `{"allowClusterResourcesFromAllNamespaces":false,"clusterDomain":"cluster.local.","clusterFlows":[],"clusterOutputs":[],"configCheck":{},"controlNamespace":"","defaultFlow":{},"enableRecreateWorkloadOnImmutableFieldChange":false,"enabled":false,"errorOutputRef":"","eventTailer":{},"flowConfigCheckDisabled":false,"flowConfigOverride":"","fluentbit":{},"fluentbitDisabled":false,"fluentd":{},"fluentdDisabled":false,"globalFilters":[],"hostTailer":{},"loggingRef":"","nodeAgents":{},"skipInvalidResources":false,"syslogNG":{},"watchNamespaceSelector":{},"watchNamespaces":[]}` | Logging resources configuration. | | logging.enabled | bool | `false` | Logging resources are disabled by default | | logging.loggingRef | string | `""` | Reference to the logging system. Each of the loggingRefs can manage a fluentbit daemonset and a fluentd statefulset. | | logging.flowConfigCheckDisabled | bool | `false` | Disable configuration check before applying new fluentd configuration. | @@ -84,6 +84,7 @@ Use `createCustomResource=false` with Helm v3 to avoid trying to create CRDs fro | logging.controlNamespace | string | `""` | Namespace for cluster wide configuration resources like ClusterFlow and ClusterOutput. This should be a protected namespace from regular users. Resources like fluentbit and fluentd will run in this namespace as well. | | logging.allowClusterResourcesFromAllNamespaces | bool | `false` | Allow configuration of cluster resources from any namespace. Mutually exclusive with ControlNamespace restriction of Cluster resources | | 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.clusterFlows | list | `[]` | ClusterFlows to deploy | | logging.clusterOutputs | list | `[]` | ClusterOutputs to deploy | diff --git a/charts/logging-operator/templates/logging.yaml b/charts/logging-operator/templates/logging.yaml index 7681658c3..0adf992bf 100644 --- a/charts/logging-operator/templates/logging.yaml +++ b/charts/logging-operator/templates/logging.yaml @@ -54,4 +54,7 @@ spec: {{- with .Values.logging.enableRecreateWorkloadOnImmutableFieldChange }} enableRecreateWorkloadOnImmutableFieldChange: {{ . }} {{- end }} + {{- with .Values.logging.configCheck }} + configCheck: {{- toYaml . | nindent 4 }} + {{- end }} {{- end }} diff --git a/charts/logging-operator/values.yaml b/charts/logging-operator/values.yaml index b4fe7665d..121711ebd 100644 --- a/charts/logging-operator/values.yaml +++ b/charts/logging-operator/values.yaml @@ -201,6 +201,9 @@ logging: # tls: # enabled: false + # -- configCheck provides possibility for timeout-based configuration checks https://kube-logging.dev/docs/whats-new/#timeout-based-configuration-checks + configCheck: {} + # -- 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