Skip to content

Commit

Permalink
[fluent-operator] upgrade fluent-operator from v2.7.0 to v2.8.0 (#510)
Browse files Browse the repository at this point in the history 
* [fluent-operator] upgrade fluent-operator from v2.7.0 to v2.8.0

Signed-off-by: Ashish Nepal <[email protected]>

* fix lint

Signed-off-by: Ashish Nepal <[email protected]>

* Update fluent-bit image to 3.0.5 (#514)

Signed-off-by: Sébastien Larivière <[email protected]>
Signed-off-by: Ashish Nepal <[email protected]>

* Update fluent-bit image to 3.0.6 (#515)

Signed-off-by: Sébastien Larivière <[email protected]>
Signed-off-by: Ashish Nepal <[email protected]>

---------

Signed-off-by: Ashish Nepal <[email protected]>
Signed-off-by: Sébastien Larivière <[email protected]>
Co-authored-by: Sébastien Larivière <[email protected]>
  • Loading branch information
@elsnepal @slariviere
elsnepal and slariviere authored Jun 13, 2024
1 parent b42b00e commit 53722cf
Show file tree
Hide file tree
Showing 26 changed files with 885 additions and 22 deletions.
8 changes: 4 additions & 4 deletions charts/fluent-operator/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ keywords:
- fluent-bit
- fluentd
- operator
version: 2.7.0
appVersion: 2.7.0
version: 2.8.0
appVersion: 2.8.0
icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg
home: https://www.fluentd.org/
sources:
Expand All @@ -18,9 +18,9 @@ maintainers:
dependencies:
- name: fluent-bit-crds
repository: "file://charts/fluent-bit-crds"
version: 2.7.0
version: 2.8.0
condition: fluentbit.crdsEnable
- name: fluentd-crds
repository: "file://charts/fluentd-crds"
version: 2.7.0
version: 2.8.0
condition: fluentd.crdsEnable
4 changes: 2 additions & 2 deletions charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ keywords:
- logging
- fluent-bit
- operator
version: 2.7.0
appVersion: "2.7.0"
version: 2.8.0
appVersion: "2.8.0"
sources:
- https://github.com/fluent/fluent-operator
maintainers:
Expand Down
43 changes: 42 additions & 1 deletion charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,10 @@ spec:
do filtering. It's assumed that the function is declared
inside the Script defined above.
type: string
code:
description: Inline LUA code instead of loading from a path
via script.
type: string
protectedMode:
description: If enabled, Lua script will be executed in
protected mode. It prevents to crash when invalid Lua
Expand Down Expand Up @@ -341,7 +345,6 @@ spec:
type: array
required:
- call
- script
type: object
modify:
description: Modify defines Modify Filter configuration.
Expand Down Expand Up @@ -486,12 +489,46 @@ spec:
alias:
description: Alias for the plugin
type: string
buffer:
default: false
type: boolean
emitterMemBufLimit:
default: 10
description: Set a limit on the amount of memory in MB the
emitter can consume if the outputs provide backpressure.
The default for this limit is 10M. The pipeline will pause
once the buffer exceeds the value of this setting. For
example, if the value is set to 10MB then the pipeline
will pause if the buffer exceeds 10M. The pipeline will
remain paused until the output drains the buffer below
the 10M limit.
type: integer
emitterName:
description: Name for the emitter input instance which re-emits
the completed records at the beginning of the pipeline.
type: string
emitterType:
default: memory
description: The storage type for the emitter input instance.
This option supports the values memory (default) and filesystem.
enum:
- memory
- filesystem
type: string
flushMs:
default: 2000
type: integer
keyContent:
description: Key name that holds the content to process.
Note that a Multiline Parser definition can already specify
the key_content to use, but this option allows to overwrite
that value for the purpose of the filter.
type: string
mode:
enum:
- parser
- partial_message
type: string
parser:
description: Specify one or multiple Multiline Parsing definitions
to apply to the content. You can specify multiple multiline
Expand Down Expand Up @@ -640,13 +677,17 @@ spec:
alias:
description: Alias for the plugin
type: string
emitterMemBufLimit:
type: string
emitterName:
description: When the filter emits a record under the new
Tag, there is an internal emitter plugin that takes care
of the job. Since this emitter expose metrics as any other
component of the pipeline, you can use this property to
configure an optional name for it.
type: string
emitterStorageType:
type: string
retryLimit:
description: 'RetryLimit describes how many times fluent-bit
should retry to send data to a specific output. If set
Expand Down
57 changes: 57 additions & 0 deletions ...ent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,51 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
multilineParserSelector:
description: Select multiline parser 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
namespace:
description: If namespace is defined, then the configmap and secret
for fluent-bit is in this namespace. If it is not defined, it is
Expand Down Expand Up @@ -230,6 +275,13 @@ spec:
daemon:
description: If true go to background on start
type: boolean
emitterMemBufLimit:
type: string
emitterName:
description: Per-namespace re-emitter configuration
type: string
emitterStorageType:
type: string
flushSeconds:
description: Interval to flush output
format: int64
Expand Down Expand Up @@ -297,6 +349,11 @@ spec:
parsersFile:
description: Optional 'parsers' config file (can be multiple)
type: string
parsersFiles:
description: backward compatible
items:
type: string
type: array
storage:
description: Configure a global environment for the storage layer
in Service. It is recommended to configure the volume and volumeMount
Expand Down
83 changes: 83 additions & 0 deletions ...ent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clustermultilineparsers.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
name: clustermultilineparsers.fluentbit.fluent.io
spec:
group: fluentbit.fluent.io
names:
kind: ClusterMultilineParser
listKind: ClusterMultilineParserList
plural: clustermultilineparsers
shortNames:
- cfbmp
singular: clustermultilineparser
scope: Cluster
versions:
- name: v1alpha2
schema:
openAPIV3Schema:
description: ClusterMultilineParser is the Schema for the cluster-level multiline
parser API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
properties:
flushTimeout:
default: 5000
description: Timeout in milliseconds to flush a non-terminated multiline
buffer. Default is set to 5 seconds.
type: integer
keyContent:
description: For an incoming structured message, specify the key that
contains the data that should be processed by the regular expression
and possibly concatenated.
type: string
parser:
description: Name of a pre-defined parser that must be applied to
the incoming content before applying the regex rule. If no parser
is defined, it's assumed that's a raw text and not a structured
message.
type: string
rules:
description: Configure a rule to match a multiline pattern. The rule
has a specific format described below. Multiple rules can be defined.
items:
properties:
next:
type: string
regex:
type: string
start:
type: string
required:
- next
- regex
- start
type: object
type: array
type:
default: regex
description: Set the multiline mode, for now, we support the type
regex.
enum:
- regex
type: string
type: object
type: object
served: true
storage: true
73 changes: 73 additions & 0 deletions charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,9 @@ spec:
type:
description: Type name
type: string
writeOperation:
description: Operation to use to write in bulk requests.
type: string
type: object
file:
description: File defines File Output configuration.
Expand Down Expand Up @@ -2480,6 +2483,9 @@ spec:
a later chunk, resulting in data shuffling. This feature prevents
this shuffling by using a queue logic for uploads.
type: boolean
Profile:
description: Option to specify an AWS Profile for credentials.
type: string
Region:
description: The AWS region of your S3 bucket
type: string
Expand Down Expand Up @@ -2542,6 +2548,73 @@ spec:
description: Use the S3 PutObject API, instead of the multipart
upload API.
type: boolean
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
required:
- Bucket
- Region
Expand Down
Loading

0 comments on commit 53722cf

Please sign in to comment.