Skip to content

Commit 768bbfd

Browse files
GentleelephantGentleelephant
authored
update fluent-operator to v3.1.0 (#542)
* update fluent-operator to v3.1.0 Signed-off-by: Gentleelephant <[email protected]> * update fluent-operator to v3.1.0 Signed-off-by: Gentleelephant <[email protected]> --------- Signed-off-by: Gentleelephant <[email protected]>
1 parent df88ce8 commit 768bbfd

23 files changed

+3495
-668
lines changed

‎charts/fluent-operator/Chart.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ keywords:
66
- fluent-bit
77
- fluentd
88
- operator
9-
version: 3.0.0
10-
appVersion: 3.0.0
9+
version: 3.1.0
10+
appVersion: 3.1.0
1111
icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg
1212
home: https://www.fluentd.org/
1313
sources:
@@ -18,9 +18,9 @@ maintainers:
1818
dependencies:
1919
- name: fluent-bit-crds
2020
repository: "file://charts/fluent-bit-crds"
21-
version: 3.0.0
21+
version: 3.1.0
2222
condition: fluentbit.crdsEnable
2323
- name: fluentd-crds
2424
repository: "file://charts/fluentd-crds"
25-
version: 3.0.0
25+
version: 3.1.0
2626
condition: fluentd.crdsEnable

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ keywords:
55
- logging
66
- fluent-bit
77
- operator
8-
version: 3.0.0
9-
appVersion: "3.0.0"
8+
version: 3.1.0
9+
appVersion: "3.1.0"
1010
sources:
1111
- https://github.com/fluent/fluent-operator
1212
maintainers:

‎charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml

+31-1
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,13 @@ spec:
200200
when capacity is reached. In order to enable this option, you should set the number to a time interval.
201201
For example, set this value to 60 or 60s and cache entries which have been created more than 60s will be evicted.
202202
type: string
203+
kubeMetaNamespaceCacheTTL:
204+
description: |-
205+
Configurable TTL for K8s cached namespace metadata.
206+
By default, it is set to 900 which means a 15min TTL for namespace cache entries.
207+
Setting this to 0 will mean entries are evicted at random once the cache is full.
208+
format: int32
209+
type: integer
203210
kubeMetaPreloadCacheDir:
204211
description: |-
205212
If set, Kubernetes meta-data can be cached/pre-loaded from files in JSON format in this directory,
@@ -210,6 +217,11 @@ spec:
210217
When the source records comes from Tail input plugin,
211218
this option allows to specify what's the prefix used in Tail configuration.
212219
type: string
220+
kubeTokenCommand:
221+
description: |-
222+
Command to get Kubernetes authorization token.
223+
By default, it will be NULL and we will use token file to get token.
224+
type: string
213225
kubeTokenFile:
214226
description: Token file
215227
type: string
@@ -254,6 +266,19 @@ spec:
254266
the data contained in the log key. Recommended use is
255267
for developers or testing only.
256268
type: string
269+
namespaceAnnotations:
270+
description: Include Kubernetes namespace resource annotations
271+
in the extra metadata.
272+
type: boolean
273+
namespaceLabels:
274+
description: Include Kubernetes namespace resource labels
275+
in the extra metadata.
276+
type: boolean
277+
namespaceMetadataOnly:
278+
description: |-
279+
Include Kubernetes namespace metadata only and no pod metadata.
280+
If this is set, the values of Labels and Annotations are ignored.
281+
type: boolean
257282
regexParser:
258283
description: |-
259284
Set an alternative Parser to process record Tag and extract pod_name, namespace_name, container_name and docker_id.
@@ -326,10 +351,15 @@ spec:
326351
description: The key to select.
327352
type: string
328353
name:
354+
default: ""
329355
description: |-
330356
Name of the referent.
331-
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
357+
This field is effectively required, but due to backwards compatibility is
358+
allowed to be empty. Instances of this type with an empty value here are
359+
almost certainly wrong.
332360
TODO: Add other useful fields. apiVersion, kind, uid?
361+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
362+
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
333363
type: string
334364
optional:
335365
description: Specify whether the ConfigMap or its key

‎charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,13 @@ spec:
7979
items:
8080
type: string
8181
type: array
82+
x-kubernetes-list-type: atomic
8283
required:
8384
- key
8485
- operator
8586
type: object
8687
type: array
88+
x-kubernetes-list-type: atomic
8789
matchLabels:
8890
additionalProperties:
8991
type: string
@@ -123,11 +125,13 @@ spec:
123125
items:
124126
type: string
125127
type: array
128+
x-kubernetes-list-type: atomic
126129
required:
127130
- key
128131
- operator
129132
type: object
130133
type: array
134+
x-kubernetes-list-type: atomic
131135
matchLabels:
132136
additionalProperties:
133137
type: string
@@ -167,11 +171,13 @@ spec:
167171
items:
168172
type: string
169173
type: array
174+
x-kubernetes-list-type: atomic
170175
required:
171176
- key
172177
- operator
173178
type: object
174179
type: array
180+
x-kubernetes-list-type: atomic
175181
matchLabels:
176182
additionalProperties:
177183
type: string
@@ -216,11 +222,13 @@ spec:
216222
items:
217223
type: string
218224
type: array
225+
x-kubernetes-list-type: atomic
219226
required:
220227
- key
221228
- operator
222229
type: object
223230
type: array
231+
x-kubernetes-list-type: atomic
224232
matchLabels:
225233
additionalProperties:
226234
type: string
@@ -260,11 +268,13 @@ spec:
260268
items:
261269
type: string
262270
type: array
271+
x-kubernetes-list-type: atomic
263272
required:
264273
- key
265274
- operator
266275
type: object
267276
type: array
277+
x-kubernetes-list-type: atomic
268278
matchLabels:
269279
additionalProperties:
270280
type: string
@@ -327,6 +337,9 @@ spec:
327337
Note: Enabling this will not automatically configure kubernetes
328338
to use fluentbit''s healthcheck endpoint'
329339
type: boolean
340+
hotReload:
341+
description: If true enable reloading via HTTP
342+
type: boolean
330343
httpListen:
331344
description: Address to listen
332345
pattern: ^\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}$

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

+59-1
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,15 @@ spec:
234234
be a valid secret key.
235235
type: string
236236
name:
237+
default: ""
237238
description: |-
238239
Name of the referent.
239-
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
240+
This field is effectively required, but due to backwards compatibility is
241+
allowed to be empty. Instances of this type with an empty value here are
242+
almost certainly wrong.
240243
TODO: Add other useful fields. apiVersion, kind, uid?
244+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
245+
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
241246
type: string
242247
optional:
243248
description: Specify whether the Secret or its
@@ -423,6 +428,13 @@ spec:
423428
and 204 are supported(default 201).
424429
format: int32
425430
type: integer
431+
tag:
432+
description: opentelemetry uses the tag value for incoming metrics.
433+
type: string
434+
tagFromURI:
435+
description: If true, tag will be created from uri. e.g. v1_metrics
436+
from /v1/metrics
437+
type: boolean
426438
tagKey:
427439
description: Specify the key name to overwrite a tag. If set,
428440
the tag will be overwritten by a value of the key.
@@ -814,6 +826,52 @@ spec:
814826
uses the breakline character (LF or 0x10).
815827
type: string
816828
type: object
829+
udp:
830+
description: UDP defines the UDP input plugin configuration
831+
properties:
832+
bufferSize:
833+
description: |-
834+
BufferSize Specify the maximum buffer size in KB to receive a JSON message.
835+
If not set, the default size will be the value of Chunk_Size.
836+
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
837+
type: string
838+
chunkSize:
839+
description: |-
840+
By default the buffer to store the incoming JSON messages, do not allocate the maximum memory allowed,
841+
instead it allocate memory when is required.
842+
The rounds of allocations are set by Chunk_Size in KB. If not set, Chunk_Size is equal to 32 (32KB).
843+
pattern: ^\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$
844+
type: string
845+
format:
846+
description: |-
847+
Format Specify the expected payload format. It support the options json and none.
848+
When using json, it expects JSON maps, when is set to none,
849+
it will split every record using the defined Separator (option below).
850+
type: string
851+
listen:
852+
description: 'Listen Listener network interface, default: 0.0.0.0'
853+
type: string
854+
port:
855+
description: 'Port Specify the UDP port where listening for connections,
856+
default: 5170'
857+
format: int32
858+
maximum: 65535
859+
minimum: 1
860+
type: integer
861+
separator:
862+
description: Separator When the expected Format is set to none,
863+
Fluent Bit needs a separator string to split the records. By
864+
default it uses the breakline character (LF or 0x10).
865+
type: string
866+
sourceAddressKey:
867+
description: SourceAddressKey Specify the key where the source
868+
address will be injected.
869+
type: string
870+
threaded:
871+
description: Threaded mechanism allows input plugin to run in
872+
a separate thread which helps to desaturate the main pipeline.
873+
type: string
874+
type: object
817875
type: object
818876
type: object
819877
served: true

0 commit comments

Comments
 (0)