upgrade fluent-operator from v2.4.0 to 2.5.0 (fluent#423)

Signed-off-by: dehaocheng <[email protected]>
broker-consulting · Sep 13, 2023 · 21ff4ef · 21ff4ef
1 parent 5daff16
commit 21ff4ef
Show file tree

Hide file tree

Showing 9 changed files with 168 additions and 12 deletions.
diff --git a/charts/fluent-operator/Chart.yaml b/charts/fluent-operator/Chart.yaml
@@ -6,8 +6,8 @@ keywords:
   - fluent-bit
   - fluentd
   - operator
-version: 2.4.0
-appVersion: 2.4.0
+version: 2.5.0
+appVersion: 2.5.0
 icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg
 home: https://www.fluentd.org/
 sources:

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_clusterinputs.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_clusterinputs.yaml
@@ -41,6 +41,22 @@ spec:
                 description: A user friendly alias name for this input plugin. Used
                   in metrics for distinction of each configured input.
                 type: string
+              collectd:
+                description: Collectd defines the Collectd input plugin configuration
+                properties:
+                  listen:
+                    description: 'Set the address to listen to, default: 0.0.0.0'
+                    type: string
+                  port:
+                    description: 'Set the port to listen to, default: 25826'
+                    format: int32
+                    maximum: 65535
+                    minimum: 1
+                    type: integer
+                  typesDB:
+                    description: 'Set the data specification file,default: /usr/share/collectd/types.db'
+                    type: string
+                type: object
               customPlugin:
                 description: CustomPlugin defines Custom Input configuration.
                 properties:
@@ -123,6 +139,110 @@ spec:
                     description: Set the permission of unix socket file.
                     type: string
                 type: object
+              http:
+                description: HTTP defines the HTTP input plugin configuration
+                properties:
+                  bufferChunkSize:
+                    description: This sets the chunk size for incoming incoming JSON
+                      messages. These chunks are then stored/managed in the space
+                      available by buffer_max_size,default 512K.
+                    pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
+                    type: string
+                  bufferMaxSize:
+                    description: Specify the maximum buffer size in KB to receive
+                      a JSON message,default 4M.
+                    pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
+                    type: string
+                  listen:
+                    description: The address to listen on,default 0.0.0.0
+                    type: string
+                  port:
+                    description: The port for Fluent Bit to listen on,default 9880
+                    format: int32
+                    maximum: 65535
+                    minimum: 1
+                    type: integer
+                  successfulHeader:
+                    description: 'Add an HTTP header key/value pair on success. Multiple
+                      headers can be set. Example: X-Custom custom-answer.'
+                    type: string
+                  successfulResponseCode:
+                    description: It allows to set successful response code. 200, 201
+                      and 204 are supported,default 201.
+                    format: int32
+                    type: integer
+                  tagKey:
+                    description: Specify the key name to overwrite a tag. If set,
+                      the tag will be overwritten by a value of the key.
+                    type: string
+                  tls:
+                    description: Fluent Bit provides integrated support for Transport
+                      Layer Security (TLS) and it predecessor Secure Sockets Layer
+                      (SSL) respectively.
+                    properties:
+                      caFile:
+                        description: Absolute path to CA certificate file
+                        type: string
+                      caPath:
+                        description: Absolute path to scan for certificate files
+                        type: string
+                      crtFile:
+                        description: Absolute path to Certificate file
+                        type: string
+                      debug:
+                        description: 'Set TLS debug verbosity level. It accept the
+                          following values: 0 (No debug), 1 (Error), 2 (State change),
+                          3 (Informational) and 4 Verbose'
+                        enum:
+                        - 0
+                        - 1
+                        - 2
+                        - 3
+                        - 4
+                        format: int32
+                        type: integer
+                      keyFile:
+                        description: Absolute path to private Key file
+                        type: string
+                      keyPassword:
+                        description: Optional password for tls.key_file file
+                        properties:
+                          valueFrom:
+                            description: ValueSource defines how to find a value's
+                              key.
+                            properties:
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info:
+                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      TODO: Add other useful fields. apiVersion, kind,
+                                      uid?'
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        type: object
+                      verify:
+                        description: Force certificate validation
+                        type: boolean
+                      vhost:
+                        description: Hostname to be used for TLS SNI extension
+                        type: string
+                    type: object
+                type: object
               logLevel:
                 enum:
                 - "off"
@@ -132,6 +252,20 @@ spec:
                 - debug
                 - trace
                 type: string
+              mqtt:
+                description: MQTT defines the MQTT input plugin configuration
+                properties:
+                  listen:
+                    description: 'Listener network interface, default: 0.0.0.0'
+                    type: string
+                  port:
+                    description: 'TCP port where listening for connections, default:
+                      1883'
+                    format: int32
+                    maximum: 65535
+                    minimum: 1
+                    type: integer
+                type: object
               nodeExporterMetrics:
                 description: NodeExporterMetrics defines Node Exporter Metrics Input
                   configuration.
@@ -157,7 +291,8 @@ spec:
                     type: string
                 type: object
               openTelemetry:
-                description: OpenTelemetry defines forward  input plugin configuration
+                description: OpenTelemetry defines the OpenTelemetry input plugin
+                  configuration
                 properties:
                   bufferChunkSize:
                     description: This sets the chunk size for incoming incoming JSON

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_clusteroutputs.yaml
@@ -435,6 +435,12 @@ spec:
                     description: If you are using Elastic's Elasticsearch Service
                       you can specify the cloud_id of the cluster running.
                     type: string
+                  compress:
+                    description: Set payload compression mechanism. Option available
+                      is 'gzip'
+                    enum:
+                    - gzip
+                    type: string
                   currentTimeIndex:
                     description: Use current time for index generation instead of
                       message record

diff --git a/charts/fluent-operator/crds/fluentbit.fluent.io_outputs.yaml b/charts/fluent-operator/crds/fluentbit.fluent.io_outputs.yaml
@@ -435,6 +435,12 @@ spec:
                     description: If you are using Elastic's Elasticsearch Service
                       you can specify the cloud_id of the cluster running.
                     type: string
+                  compress:
+                    description: Set payload compression mechanism. Option available
+                      is 'gzip'
+                    enum:
+                    - gzip
+                    type: string
                   currentTimeIndex:
                     description: Use current time for index generation instead of
                       message record

diff --git a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
@@ -80,5 +80,9 @@ spec:
   securityContext:
 {{ toYaml .Values.fluentbit.podSecurityContext | nindent 4 }}
   {{- end }}
+  {{- if .Values.fluentbit.serviceAccountAnnotations }}
+  serviceAccountAnnotations:
+{{ toYaml .Values.fluentbit.serviceAccountAnnotations | indent 4 }}
+  {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/fluent-operator/templates/fluentbit-output-loki.yaml b/charts/fluent-operator/templates/fluentbit-output-loki.yaml
@@ -15,13 +15,13 @@ When these keys are objects, they specify a secret to use generated elsewhere, a
 {{ range $k, $v := dict $userSecret .httpUser $passSecret .httpPassword $tenantIDSecret .tenantID -}}
 {{ if kindIs "string" $v -}}
 ---
-secretapiVersion: v1
+apiVersion: v1
 kind: Secret
 metadata:
   name: {{ $k |quote }}
 type: Opaque
 data:
-  value: {{ $v | quote }}
+  value: {{ $v | b64enc | quote }}
 {{ end -}}
 {{ end -}}
 
@@ -117,4 +117,4 @@ spec:
 {{- end }}
 {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}
diff --git a/charts/fluent-operator/templates/fluentd-clusterfluentdconfig.yaml b/charts/fluent-operator/templates/fluentd-clusterfluentdconfig.yaml
@@ -8,9 +8,7 @@ metadata:
     config.fluentd.fluent.io/enabled: "true"
 spec:
   watchedNamespaces:
-  {{- range .Values.fluentd.watchedNamespaces }}
-  - {{ . }}
-  {{- end }}
+    {{- toYaml .Values.fluentd.watchedNamespaces | nindent 4 }}
   clusterFilterSelector:
     matchLabels:
       filter.fluentd.fluent.io/enabled: "true"

diff --git a/charts/fluent-operator/templates/fluentd-fluentd.yaml b/charts/fluent-operator/templates/fluentd-fluentd.yaml
@@ -29,6 +29,9 @@ spec:
   {{- if .Values.fluentd.logLevel }}
   logLevel: {{ .Values.fluentd.logLevel }}
   {{- end }}
+  {{- with .Values.fluentd.priorityClassName }}
+  priorityClassName: {{ . }}
+  {{- end }}
   {{- if .Values.fluentd.extras }}
   {{ .Values.fluentd.extras | toYaml | nindent 2 }}
   {{- end }}

diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
@@ -71,7 +71,7 @@ fluentbit:
   enable: true
   image:
     repository: "kubesphere/fluent-bit"
-    tag: "v2.1.8"
+    tag: "v2.1.9"
   # fluentbit resources. If you do want to specify resources, adjust them as necessary
   # You can adjust it based on the log volume.
   resources:
@@ -91,6 +91,9 @@ fluentbit:
   # Specify additional custom labels for fluentbit-pods
   labels: {}
 
+  # Specify additional custom annotations for fluentbit-serviceaccount
+  serviceAccountAnnotations: {}
+
   ## Reference to one or more secrets to be used when pulling images
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
   ##
@@ -254,9 +257,9 @@ 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
       host: 127.0.0.1   # String
-      port: 3100      # Int
+      port: 3100        # Int
       # Either, give http{User,Password},tenantID string values specifying them directly
       httpUser: myuser
       httpPassword: mypass
@@ -360,6 +363,7 @@ fluentd:
   imagePullSecrets: []
   # - name: "image-pull-secret"
   logLevel: ""
+  priorityClassName: ""
   extras: {}
   # Configure the output plugin parameter in Fluentd.
   # Fluentd is disabled by default, if you enable it make sure to also set up an output to use.