(fluent-operator) Bump fluent-operator chart to v3.4.2. (#622)

joshuabaird · web-flow · commit f5ee65c50611 · 2025-07-08T08:44:46.000-04:00
* Bump fluent-operator chart to v3.4.2.

Signed-off-by: Josh Baird &lt;jbaird@galileo.io&gt;

* Fix linting errors.

Signed-off-by: Josh Baird &lt;jbaird@galileo.io&gt;

---------

Signed-off-by: Josh Baird &lt;jbaird@galileo.io&gt;
diff --git a/charts/fluent-operator/Chart.yaml b/charts/fluent-operator/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
   - fluent-bit
   - fluentd
   - operator
-version: 3.4.0
+version: 3.4.2
 # renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-operator
 appVersion: "3.4.0"
 icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg
@@ -19,9 +19,9 @@ maintainers:
 dependencies:
   - name: fluent-bit-crds
     repository: "file://charts/fluent-bit-crds"
-    version: 3.3.0
+    version: 3.4.2
     condition: fluentbit.crdsEnable
   - name: fluentd-crds
     repository: "file://charts/fluentd-crds"
-    version: 3.3.0
+    version: 3.4.2
     condition: fluentd.crdsEnable
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml b/charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml
@@ -14,11 +14,11 @@ description: A Helm chart delivering fluenbt-bit controller CRDS
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.3.0
+version: 3.4.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 # renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-operator
-appVersion: "3.3.0"
+appVersion: "3.4.0"
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
@@ -345,7 +345,7 @@ spec:
                     type: boolean
                   httpListen:
                     description: Address to listen
-                    pattern: ^\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}$
+                    pattern: ^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|(([A-Fa-f0-9:]+:+)+[A-Fa-f0-9]*)$
                     type: string
                   httpPort:
                     description: Port to listen
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
@@ -2109,6 +2109,7 @@ spec:
                     type: string
                   region:
                     description: The AWS region.
+                    minLength: 1
                     type: string
                   roleARN:
                     description: ARN of an IAM role to assume (for cross account access).
@@ -3522,6 +3523,11 @@ spec:
                     description: Use the S3 PutObject API, instead of the multipart
                       upload API.
                     type: boolean
+                  Workers:
+                    description: Specify number of worker threads to use to output
+                      to S3
+                    format: int32
+                    type: integer
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterparsers.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterparsers.yaml
@@ -74,6 +74,16 @@ spec:
                 type: object
               logfmt:
                 description: Logfmt defines logfmt parser configuration.
+                properties:
+                  timeFormat:
+                    description: Time_Format, eg. %Y-%m-%dT%H:%M:%S %z
+                    type: string
+                  timeKeep:
+                    description: Time_Keep
+                    type: boolean
+                  timeKey:
+                    description: Time_Key
+                    type: string
                 type: object
                 x-kubernetes-validations:
                 - message: logfmt must not be null
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbitconfigs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbitconfigs.yaml
@@ -377,7 +377,7 @@ spec:
                     type: boolean
                   httpListen:
                     description: Address to listen
-                    pattern: ^\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}$
+                    pattern: ^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|(([A-Fa-f0-9:]+:+)+[A-Fa-f0-9]*)$
                     type: string
                   httpPort:
                     description: Port to listen
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
@@ -2109,6 +2109,7 @@ spec:
                     type: string
                   region:
                     description: The AWS region.
+                    minLength: 1
                     type: string
                   roleARN:
                     description: ARN of an IAM role to assume (for cross account access).
@@ -3522,6 +3523,11 @@ spec:
                     description: Use the S3 PutObject API, instead of the multipart
                       upload API.
                     type: boolean
+                  Workers:
+                    description: Specify number of worker threads to use to output
+                      to S3
+                    format: int32
+                    type: integer
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_parsers.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_parsers.yaml
@@ -74,6 +74,16 @@ spec:
                 type: object
               logfmt:
                 description: Logfmt defines logfmt parser configuration.
+                properties:
+                  timeFormat:
+                    description: Time_Format, eg. %Y-%m-%dT%H:%M:%S %z
+                    type: string
+                  timeKeep:
+                    description: Time_Keep
+                    type: boolean
+                  timeKey:
+                    description: Time_Key
+                    type: string
                 type: object
                 x-kubernetes-validations:
                 - message: logfmt must not be null
diff --git a/charts/fluent-operator/charts/fluentd-crds/Chart.yaml b/charts/fluent-operator/charts/fluentd-crds/Chart.yaml
@@ -14,11 +14,11 @@ description: A Helm chart delivering fluentd controller CRDS
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.3.0
+version: 3.4.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 # renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-operator
-appVersion: "3.3.0"
+appVersion: "3.4.0"
diff --git a/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml b/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml
@@ -32,6 +32,10 @@ spec:
     bufferChunkSize: {{ . | quote }}
     {{- end }}
     skipLongLines: {{ .Values.fluentbit.input.tail.skipLongLines }}
+    skipEmptyLines: {{ .Values.fluentbit.input.tail.skipEmptyLines }}
+    {{- if .Values.fluentbit.input.tail.ignoredOlder }}
+    ignoredOlder: {{ .Values.fluentbit.input.tail.ignoredOlder }}
+    {{- end }}
     db: /fluent-bit/tail/pos.db
     dbSync: Normal
     storageType: {{ .Values.fluentbit.input.tail.storageType }}
diff --git a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
@@ -17,7 +17,7 @@ spec:
   dnsPolicy: ClusterFirstWithHostNet
   {{- end }}
   image: {{ template "fluent-operator.image" (tuple .Values.fluentbit.image "") }}
-  {{- if .Values.fluentbit.imagePullSecrets }}
+  {{- with .Values.fluentbit.imagePullSecrets }}
   imagePullSecrets:
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -72,17 +72,10 @@ spec:
   volumes:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .Values.fluentbit.livenessProbe }}
-  {{- if .enabled }}
+  {{- if .Values.fluentbit.livenessProbe.enabled }}
   livenessProbe:
-    httpGet:
-      port: 2020
-      path: /
-    initialDelaySeconds: {{ .initialDelaySeconds }}
-    periodSeconds: {{ .periodSeconds }}
-    timeoutSeconds: {{ .timeoutSeconds }}
-    successThreshold: {{ .successThreshold }}
-    failureThreshold: {{ .failureThreshold }}
+  {{- with omit .Values.fluentbit.livenessProbe "enabled" }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
   {{- end }}
   {{- with .Values.fluentbit.additionalVolumesMounts }}
diff --git a/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml b/charts/fluent-operator/templates/fluentbit-output-elasticsearch.yaml
@@ -41,9 +41,9 @@ spec:
     traceError: {{ .Values.fluentbit.output.es.traceError | default false }}
     generateID: true
     timeKey: "@timestamp"
-    {{- if .Values.fluentbit.output.es.enableTLS }}
+    {{- if and .Values.fluentbit.output.es.tls .Values.fluentbit.output.es.tls.enable }}
     tls:
-      {{- toYaml .Values.fluentbit.output.es.tls | nindent 6 }}
+       {{- omit .Values.fluentbit.output.es.tls "enable" | toYaml | nindent 6 }}
     {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/fluent-operator/templates/fluentbit-output-kafka.yaml b/charts/fluent-operator/templates/fluentbit-output-kafka.yaml
@@ -10,6 +10,7 @@ metadata:
     fluentbit.fluent.io/enabled: "true"
     fluentbit.fluent.io/component: logging
 spec:
+  logLevel: "{{ .logLevel }}"
   matchRegex: (?:kube|service)\.(.*)
   kafka:
     brokers: {{ .brokers | quote }}
diff --git a/charts/fluent-operator/templates/fluentbit-output-loki.yaml b/charts/fluent-operator/templates/fluentbit-output-loki.yaml
@@ -36,6 +36,7 @@ metadata:
 spec:
   matchRegex: (?:kube|service)\.(.*)
   retry_limit: "{{ .retryLimit }}"
+  logLevel: "{{ .logLevel }}"
   loki:
     {{- with .host }}
     host: {{ . | quote }}
diff --git a/charts/fluent-operator/templates/fluentd-fluentd.yaml b/charts/fluent-operator/templates/fluentd-fluentd.yaml
@@ -14,7 +14,7 @@ spec:
         bind: 0.0.0.0
         port: {{ .port }}
   replicas: {{ .replicas }}
-  image: {{ template "fluent-operator.image" (tuple .Values.fluentd.image "") }}
+  image: {{ template "fluent-operator.image" (tuple .image "") }}
   {{- with .imagePullSecrets }}
   imagePullSecrets:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
@@ -31,7 +31,7 @@ operator:
   # If set to false, this will disable the creation of ClusterRole, ClusterRoleBinding,
   # Deployment, and ServiceAccount resources to avoid conflicts when deploying multiple instances.
   enable: true
-  # nodeSelector configuration for Fluent Operator. Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  # nodeSelector configuration for Fluent Operator. Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector
   nodeSelector: {}
   # affinity configuration for Fluent Operator. Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
   affinity: {}
@@ -95,6 +95,9 @@ fluentbit:
     metricRelabelings: []
   livenessProbe:
     enabled: true
+    httpGet:
+      port: 2020
+      path: /
     initialDelaySeconds: 10
     periodSeconds: 10
     timeoutSeconds: 15
@@ -228,6 +231,7 @@ fluentbit:
       bufferChunkSize: ""
       path: "/var/log/containers/*.log"
       skipLongLines: true
+      skipEmptyLines: true
       readFromHead: false
       # Use storageType as "filesystem" if you want to use filesystem as the buffering mechanism for tail input.
       storageType: memory
@@ -280,9 +284,9 @@ fluentbit:
     #      httpPassword:
     #      logstashFormat: true
     #      replaceDots: false
-    #      enableTLS: false
     #      writeOperation: upsert
     #      tls:
+    #        enable: false
     #        verify: On
     #        debug: 1
     #        caFile: "<Absolute path to CA certificate file>"
@@ -293,6 +297,7 @@ fluentbit:
     #        vhost: "<Hostname to be used for TLS SNI extension>"
     kafka:
       enable: false
+      logLevel: info
       brokers: "<kafka broker list like xxx.xxx.xxx.xxx:9092,yyy.yyy.yyy.yyy:9092>"
       topics: ks-log
     opentelemetry: {}
@@ -316,52 +321,53 @@ fluentbit:
     # See https://docs.fluentbit.io/manual/pipeline/outputs/loki
     loki:
       # Switch for generation of fluentbit loki ClusterOutput (and loki basic auth http user and pass secrets if required)
-      enable: false # Bool
+      enable: false  # Bool
       retryLimit: "no_limits"
-      host: 127.0.0.1 # String
-      port: 3100 # Int
+      logLevel: "info"
+      host: 127.0.0.1  # String
+      port: 3100  # Int
       # Either, give http{User,Password},tenantID string values specifying them directly
       httpUser: myuser
       httpPassword: mypass
       tenantID: ""
       # Or give {http{User,Password},tenantID} as reference to secrets that you have manually installed into your kubernetes cluster
-      #httpUser:
-      #  valueFrom:
-      #    secretKeyRef:
-      #      key: value
-      #      name: husersecret
-      #      optional: true
-      #httpPassword:
-      #  valueFrom:
-      #    secretKeyRef:
-      #      key: value
-      #      name: hpasssecret
-      #      optional: true
-      #tenantID:
-      #  valueFrom:
-      #    secretKeyRef:
-      #      key: value
-      #      name: tenantsecret
-      #      optional: true
+      # httpUser:
+      #   valueFrom:
+      #     secretKeyRef:
+      #       key: value
+      #       name: husersecret
+      #       optional: true
+      # httpPassword:
+      #   valueFrom:
+      #     secretKeyRef:
+      #       key: value
+      #       name: hpasssecret
+      #       optional: true
+      # tenantID:
+      #   valueFrom:
+      #     secretKeyRef:
+      #       key: value
+      #       name: tenantsecret
+      #       optional: true
       #
       # To use bearer token auth instead of http basic auth
-      #bearerToken: ey....
+      # bearerToken: ey....
       # or with existing secret
-      #bearerToken:
-      #  valueFrom:
-      #    secretKeyRef:
-      #      key: value
-      #      name: bearerTokenSecret
-      #      optional: true
-      #labels: []      # String list of <name>=<value>
-      #labelKeys: []   # String list of <key>
-      #removeKeys: []  # String list of <key>
-      #labelMapPath: '' # String, path to file, ex /here/it/is
-      #dropSingleKey: off
-      #lineFormat: '' # String
-      #autoKubernetesLabels: on
-      #tenantIDKey:   # String
-      #tls: {}        # *plugins.TLS fluentbit docs
+      # bearerToken:
+      #   valueFrom:
+      #     secretKeyRef:
+      #       key: value
+      #       name: bearerTokenSecret
+      #       optional: true
+      # labels: []      # String list of <name>=<value>
+      # labelKeys: []   # String list of <key>
+      # removeKeys: []  # String list of <key>
+      # labelMapPath: '' # String, path to file, ex /here/it/is
+      # dropSingleKey: off
+      # lineFormat: '' # String
+      # autoKubernetesLabels: on
+      # tenantIDKey:   # String
+      # tls: {}        # *plugins.TLS fluentbit docs
     stackdriver: {}
     # You can configure the stackdriver configuration here
 
@@ -425,12 +431,13 @@ fluentbit:
     javaMultiline:
       # use in filter for parser generic springboot multiline log format
       enable: false
-  #Using namespaceClusterFbCfg, deploy fluent-bit configmap and secret in this namespace.
-  #If it is not defined, it is in the namespace of the fluent-operator.
+  # Using namespaceClusterFbCfg, deploy fluent-bit configmap and secret in this namespace.
+  # If it is not defined, it is in the namespace of the fluent-operator.
   namespaceClusterFbCfg: ""
 
 fluentd:
   # Installs a sub chart carrying the CRDs for the fluentd controller. The sub chart is enabled by default.
+  # Valid modes include "collector" and "agent".
   crdsEnable: true
   enable: false
   name: fluentd
