[fluent-operator] upgrade fluent-operator from v2.5.0 to v2.7.0

.gitignore

@@ -1,4 +1,3 @@
 .vscode
 # Helm chart automated files
-/charts/*/charts
 /charts/*/requirements.lock

charts/fluent-operator/Chart.yaml

@@ -6,12 +6,21 @@ keywords:
   - fluent-bit
   - fluentd
   - operator
-version: 2.5.0
-appVersion: 2.5.0
+version: 2.7.0
+appVersion: 2.7.0
 icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg
 home: https://www.fluentd.org/
 sources:
   - https://github.com/fluent/fluent-operator
 maintainers:
   - name: wenchajun
     email: [email protected]
+dependencies:
+  - name: fluent-bit-crds
+    repository: "file://charts/fluent-bit-crds"
+    version: 2.7.0
+    condition: fluentbit.crdsEnable
+  - name: fluentd-crds
+    repository: "file://charts/fluentd-crds"
+    version: 2.7.0
+    condition: fluentd.crdsEnable

charts/fluent-operator/charts/fluent-bit-crds/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml

@@ -0,0 +1,14 @@
+apiVersion: v2
+name: fluent-bit-crds
+description: A Helm chart delivering fluent-bit controller CRDS
+keywords:
+  - logging
+  - fluent-bit
+  - operator
+version: 2.7.0
+appVersion: "2.7.0"
+sources:
+  - https://github.com/fluent/fluent-operator
+maintainers:
+  - name: wenchajun
+    email: [email protected]

charts/fluent-operator/crds/fluentbit.fluent.io_clusterinputs.yaml → charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml

@@ -266,6 +266,27 @@ spec:
                     minimum: 1
                     type: integer
                 type: object
+              nginx:
+                description: Nginx defines the Nginx input plugin configuration
+                properties:
+                  host:
+                    description: 'Name of the target host or IP address to check,
+                      default: localhost'
+                    type: string
+                  nginxPlus:
+                    description: 'Turn on NGINX plus mode,default: true'
+                    type: boolean
+                  port:
+                    description: 'Port of the target nginx service to connect to,
+                      default: 80'
+                    format: int32
+                    maximum: 65535
+                    minimum: 1
+                    type: integer
+                  statusURL:
+                    description: 'The URL of the Stub Status Handler,default: /status'
+                    type: string
+                type: object
               nodeExporterMetrics:
                 description: NodeExporterMetrics defines Node Exporter Metrics Input
                   configuration.
@@ -354,6 +375,85 @@ spec:
                       plugin
                     type: string
                 type: object
+              statsd:
+                description: StatsD defines the StatsD input plugin configuration
+                properties:
+                  listen:
+                    description: 'Listener network interface, default: 0.0.0.0'
+                    type: string
+                  port:
+                    description: 'UDP port where listening for connections, default:
+                      8125'
+                    format: int32
+                    maximum: 65535
+                    minimum: 1
+                    type: integer
+                type: object
+              syslog:
+                description: Syslog defines the Syslog input plugin configuration
+                properties:
+                  bufferChunkSize:
+                    description: By default the buffer to store the incoming Syslog
+                      messages, do not allocate the maximum memory allowed, instead
+                      it allocate memory when is required. The rounds of allocations
+                      are set by Buffer_Chunk_Size. If not set, Buffer_Chunk_Size
+                      is equal to 32000 bytes (32KB).
+                    pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
+                    type: string
+                  bufferMaxSize:
+                    description: Specify the maximum buffer size to receive a Syslog
+                      message. If not set, the default size will be the value of Buffer_Chunk_Size.
+                    pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
+                    type: string
+                  listen:
+                    description: 'If Mode is set to tcp or udp, specify the network
+                      interface to bind, default: 0.0.0.0'
+                    type: string
+                  mode:
+                    description: 'Defines transport protocol mode: unix_udp (UDP over
+                      Unix socket), unix_tcp (TCP over Unix socket), tcp or udp'
+                    enum:
+                    - unix_udp
+                    - unix_tcp
+                    - tcp
+                    - udp
+                    type: string
+                  parser:
+                    description: Specify an alternative parser for the message. If
+                      Mode is set to tcp or udp then the default parser is syslog-rfc5424
+                      otherwise syslog-rfc3164-local is used. If your syslog messages
+                      have fractional seconds set this Parser value to syslog-rfc5424
+                      instead.
+                    type: string
+                  path:
+                    description: If Mode is set to unix_tcp or unix_udp, set the absolute
+                      path to the Unix socket file.
+                    type: string
+                  port:
+                    description: If Mode is set to tcp or udp, specify the TCP port
+                      to listen for incoming connections.
+                    format: int32
+                    maximum: 65535
+                    minimum: 1
+                    type: integer
+                  receiveBufferSize:
+                    description: Specify the maximum socket receive buffer size. If
+                      not set, the default value is OS-dependant, but generally too
+                      low to accept thousands of syslog messages per second without
+                      loss on udp or unix_udp sockets. Note that on Linux the value
+                      is capped by sysctl net.core.rmem_max.
+                    pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
+                    type: string
+                  sourceAddressKey:
+                    description: Specify the key where the source address will be
+                      injected.
+                    type: string
+                  unixPerm:
+                    description: 'If Mode is set to unix_tcp or unix_udp, set the
+                      permission of the Unix socket file, default: 0644'
+                    format: int32
+                    type: integer
+                type: object
               systemd:
                 description: Systemd defines Systemd Input configuration.
                 properties:
@@ -602,6 +702,45 @@ spec:
                     description: Set a regex to exctract fields from the file
                     type: string
                 type: object
+              tcp:
+                description: TCP defines the TCP input plugin configuration
+                properties:
+                  bufferSize:
+                    description: Specify the maximum buffer size in KB to receive
+                      a JSON message. If not set, the default size will be the value
+                      of Chunk_Size.
+                    pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
+                    type: string
+                  chunkSize:
+                    description: By default the buffer to store the incoming JSON
+                      messages, do not allocate the maximum memory allowed, instead
+                      it allocate memory when is required. The rounds of allocations
+                      are set by Chunk_Size in KB. If not set, Chunk_Size is equal
+                      to 32 (32KB).
+                    pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
+                    type: string
+                  format:
+                    description: Specify the expected payload format. It support the
+                      options json and none. When using json, it expects JSON maps,
+                      when is set to none, it will split every record using the defined
+                      Separator (option below).
+                    type: string
+                  listen:
+                    description: Listener network interface,default 0.0.0.0
+                    type: string
+                  port:
+                    description: TCP port where listening for connections,default
+                      5170
+                    format: int32
+                    maximum: 65535
+                    minimum: 1
+                    type: integer
+                  separator:
+                    description: When the expected Format is set to none, Fluent Bit
+                      needs a separator string to split the records. By default it
+                      uses the breakline character (LF or 0x10).
+                    type: string
+                type: object
             type: object
         type: object
     served: true

charts/fluent-operator/crds/fluentbit.fluent.io_fluentbits.yaml → charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml

@@ -1043,6 +1043,10 @@ spec:
                         type: string
                     type: object
                 type: object
+              disableLogVolumes:
+                description: DisableLogVolumes removes the hostPath mounts for varlibcontainers,
+                  varlogs and systemd.
+                type: boolean
               disableService:
                 description: DisableService tells if the fluentbit service should
                   be deployed.

charts/fluent-operator/charts/fluent-bit-crds/values.yaml

@@ -0,0 +1 @@
+# Default values for fluent-bit-crds.

charts/fluent-operator/charts/fluentd-crds/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

charts/fluent-operator/charts/fluentd-crds/Chart.yaml

@@ -0,0 +1,14 @@
+apiVersion: v2
+name: fluentd-crds
+description: A Helm chart delivering fluentd controller CRDS
+keywords:
+  - logging
+  - fluentd
+  - operator
+version: 2.7.0
+appVersion: "2.7.0"
+sources:
+  - https://github.com/fluent/fluent-operator
+maintainers:
+  - name: wenchajun
+    email: [email protected]

charts/fluent-operator/crds/fluentd.fluent.io_clusterfluentdconfigs.yaml → charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusterfluentdconfigs.yaml

@@ -83,6 +83,51 @@ spec:
                     type: object
                 type: object
                 x-kubernetes-map-type: atomic
+              clusterInputSelector:
+                description: Select cluster input plugins
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: A label selector requirement is a selector that
+                        contains values, a key, and an operator that relates the key
+                        and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: operator represents a key's relationship to
+                            a set of values. Valid operators are In, NotIn, Exists
+                            and DoesNotExist.
+                          type: string
+                        values:
+                          description: values is an array of string values. If the
+                            operator is In or NotIn, the values array must be non-empty.
+                            If the operator is Exists or DoesNotExist, the values
+                            array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: matchLabels is a map of {key,value} pairs. A single
+                      {key,value} in the matchLabels map is equivalent to an element
+                      of matchExpressions, whose key field is "key", the operator
+                      is "In", and the values array contains only "value". The requirements
+                      are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
               clusterOutputSelector:
                 description: Select cluster output plugins
                 properties: