Skip to content

Commit f5ee65c

Browse files
authored
(fluent-operator) Bump fluent-operator chart to v3.4.2. (#622)
* Bump fluent-operator chart to v3.4.2. Signed-off-by: Josh Baird <[email protected]> * Fix linting errors. Signed-off-by: Josh Baird <[email protected]> --------- Signed-off-by: Josh Baird <[email protected]>
1 parent 62a6d1c commit f5ee65c

16 files changed

+102
-64
lines changed

charts/fluent-operator/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ keywords:
66
- fluent-bit
77
- fluentd
88
- operator
9-
version: 3.4.0
9+
version: 3.4.2
1010
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-operator
1111
appVersion: "3.4.0"
1212
icon: https://raw.githubusercontent.com/fluent/fluent-operator/master/docs/images/fluent-operator-icon.svg
@@ -19,9 +19,9 @@ maintainers:
1919
dependencies:
2020
- name: fluent-bit-crds
2121
repository: "file://charts/fluent-bit-crds"
22-
version: 3.3.0
22+
version: 3.4.2
2323
condition: fluentbit.crdsEnable
2424
- name: fluentd-crds
2525
repository: "file://charts/fluentd-crds"
26-
version: 3.3.0
26+
version: 3.4.2
2727
condition: fluentd.crdsEnable

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ description: A Helm chart delivering fluenbt-bit controller CRDS
1414
# This is the chart version. This version number should be incremented each time you make changes
1515
# to the chart and its templates, including the app version.
1616
# Versions are expected to follow Semantic Versioning (https://semver.org/)
17-
version: 3.3.0
17+
version: 3.4.2
1818

1919
# This is the version number of the application being deployed. This version number should be
2020
# incremented each time you make changes to the application. Versions are not expected to
2121
# follow Semantic Versioning. They should reflect the version the application is using.
2222
# It is recommended to use it with quotes.
2323
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-operator
24-
appVersion: "3.3.0"
24+
appVersion: "3.4.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ spec:
345345
type: boolean
346346
httpListen:
347347
description: Address to listen
348-
pattern: ^\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}$
348+
pattern: ^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|(([A-Fa-f0-9:]+:+)+[A-Fa-f0-9]*)$
349349
type: string
350350
httpPort:
351351
description: Port to listen

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2109,6 +2109,7 @@ spec:
21092109
type: string
21102110
region:
21112111
description: The AWS region.
2112+
minLength: 1
21122113
type: string
21132114
roleARN:
21142115
description: ARN of an IAM role to assume (for cross account access).
@@ -3522,6 +3523,11 @@ spec:
35223523
description: Use the S3 PutObject API, instead of the multipart
35233524
upload API.
35243525
type: boolean
3526+
Workers:
3527+
description: Specify number of worker threads to use to output
3528+
to S3
3529+
format: int32
3530+
type: integer
35253531
tls:
35263532
description: Fluent Bit provides integrated support for Transport
35273533
Layer Security (TLS) and it predecessor Secure Sockets Layer

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterparsers.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,16 @@ spec:
7474
type: object
7575
logfmt:
7676
description: Logfmt defines logfmt parser configuration.
77+
properties:
78+
timeFormat:
79+
description: Time_Format, eg. %Y-%m-%dT%H:%M:%S %z
80+
type: string
81+
timeKeep:
82+
description: Time_Keep
83+
type: boolean
84+
timeKey:
85+
description: Time_Key
86+
type: string
7787
type: object
7888
x-kubernetes-validations:
7989
- message: logfmt must not be null

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbitconfigs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ spec:
377377
type: boolean
378378
httpListen:
379379
description: Address to listen
380-
pattern: ^\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}$
380+
pattern: ^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|(([A-Fa-f0-9:]+:+)+[A-Fa-f0-9]*)$
381381
type: string
382382
httpPort:
383383
description: Port to listen

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2109,6 +2109,7 @@ spec:
21092109
type: string
21102110
region:
21112111
description: The AWS region.
2112+
minLength: 1
21122113
type: string
21132114
roleARN:
21142115
description: ARN of an IAM role to assume (for cross account access).
@@ -3522,6 +3523,11 @@ spec:
35223523
description: Use the S3 PutObject API, instead of the multipart
35233524
upload API.
35243525
type: boolean
3526+
Workers:
3527+
description: Specify number of worker threads to use to output
3528+
to S3
3529+
format: int32
3530+
type: integer
35253531
tls:
35263532
description: Fluent Bit provides integrated support for Transport
35273533
Layer Security (TLS) and it predecessor Secure Sockets Layer

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_parsers.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,16 @@ spec:
7474
type: object
7575
logfmt:
7676
description: Logfmt defines logfmt parser configuration.
77+
properties:
78+
timeFormat:
79+
description: Time_Format, eg. %Y-%m-%dT%H:%M:%S %z
80+
type: string
81+
timeKeep:
82+
description: Time_Keep
83+
type: boolean
84+
timeKey:
85+
description: Time_Key
86+
type: string
7787
type: object
7888
x-kubernetes-validations:
7989
- message: logfmt must not be null

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ description: A Helm chart delivering fluentd controller CRDS
1414
# This is the chart version. This version number should be incremented each time you make changes
1515
# to the chart and its templates, including the app version.
1616
# Versions are expected to follow Semantic Versioning (https://semver.org/)
17-
version: 3.3.0
17+
version: 3.4.2
1818

1919
# This is the version number of the application being deployed. This version number should be
2020
# incremented each time you make changes to the application. Versions are not expected to
2121
# follow Semantic Versioning. They should reflect the version the application is using.
2222
# It is recommended to use it with quotes.
2323
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluent-operator
24-
appVersion: "3.3.0"
24+
appVersion: "3.4.0"

charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ spec:
3232
bufferChunkSize: {{ . | quote }}
3333
{{- end }}
3434
skipLongLines: {{ .Values.fluentbit.input.tail.skipLongLines }}
35+
skipEmptyLines: {{ .Values.fluentbit.input.tail.skipEmptyLines }}
36+
{{- if .Values.fluentbit.input.tail.ignoredOlder }}
37+
ignoredOlder: {{ .Values.fluentbit.input.tail.ignoredOlder }}
38+
{{- end }}
3539
db: /fluent-bit/tail/pos.db
3640
dbSync: Normal
3741
storageType: {{ .Values.fluentbit.input.tail.storageType }}

0 commit comments

Comments
 (0)