Skip to content

Commit bc28f3c

Browse files
joshuabairdjoshuabaird
authored
Bump fluentd to v1.19.0. (#1730)
* Bump fluent to v1.19.0. Signed-off-by: Josh Baird <[email protected]> * Bump chart fluentd. Signed-off-by: Josh Baird <[email protected]> --------- Signed-off-by: Josh Baird <[email protected]>
1 parent e6198c6 commit bc28f3c

File tree

12 files changed

+70
-70
lines changed

12 files changed

+70
-70
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FB_VERSION?=$(shell grep -v '^#' cmd/fluent-watcher/fluentbit/VERSION | tr -d "
1111
# Image URL to use all building/pushing image targets
1212
FB_IMG ?= ghcr.io/fluent/fluent-operator/fluent-bit:v${FB_VERSION}
1313
FB_IMG_DEBUG ?= ghcr.io/fluent/fluent-operator/fluent-bit:v${FB_VERSION}-debug
14-
FD_IMG ?= ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
14+
FD_IMG ?= ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
1515
FO_IMG ?= kubesphere/fluent-operator:$(VERSION)
1616
FD_IMG_BASE ?= ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-arm64-base
1717

‎apis/fluentd/v1alpha1/tests/tools.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
bind: 0.0.0.0
3232
port: 24224
3333
replicas: 1
34-
image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
34+
image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
3535
fluentdCfgSelector:
3636
matchLabels:
3737
config.fluentd.fluent.io/enabled: "true"
@@ -55,7 +55,7 @@ spec:
5555
size: 10
5656
autoIncrementKey: "id"
5757
replicas: 1
58-
image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
58+
image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
5959
fluentdCfgSelector:
6060
matchLabels:
6161
config.fluentd.fluent.io/enabled: "true"
@@ -80,7 +80,7 @@ spec:
8080
includeConfig: true
8181
includeRetry: true
8282
replicas: 1
83-
image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
83+
image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
8484
fluentdCfgSelector:
8585
matchLabels:
8686
config.fluentd.fluent.io/enabled: "true"
@@ -132,7 +132,7 @@ spec:
132132
- /var/log/foo.log
133133
- /var/log/bar
134134
replicas: 1
135-
image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
135+
image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
136136
fluentdCfgSelector:
137137
matchLabels:
138138
config.fluentd.fluent.io/enabled: "true"

‎charts/fluent-operator/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ fluentd:
468468
registry: ghcr.io
469469
repository: fluent/fluent-operator/fluentd
470470
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluentd
471-
tag: v1.17.1
471+
tag: v1.19.0
472472

473473
# Numbers of the Fluentd instance
474474
# Applicable when the mode is "collector", and will be ignored when the mode is "agent"

‎cmd/fluent-watcher/fluentd/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.17.1
1+
1.19.0

‎manifests/fluentd/fluentd-cluster-cfg-output-buffer-example.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ metadata:
77
app.kubernetes.io/name: fluentd
88
spec:
99
globalInputs:
10-
- forward:
10+
- forward:
1111
bind: 0.0.0.0
1212
port: 24224
1313
replicas: 3
14-
image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
15-
fluentdCfgSelector:
14+
image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
15+
fluentdCfgSelector:
1616
matchLabels:
1717
config.fluentd.fluent.io/enabled: "true"
1818

@@ -24,7 +24,7 @@ metadata:
2424
labels:
2525
config.fluentd.fluent.io/enabled: "true"
2626
spec:
27-
watchedNamespaces:
27+
watchedNamespaces:
2828
- kube-system
2929
- default
3030
clusterFilterSelector:
@@ -41,8 +41,8 @@ metadata:
4141
name: fluentd-filter
4242
labels:
4343
filter.fluentd.fluent.io/enabled: "true"
44-
spec:
45-
filters:
44+
spec:
45+
filters:
4646
- recordTransformer:
4747
enableRuby: true
4848
records:
@@ -56,8 +56,8 @@ metadata:
5656
name: fluentd-output
5757
labels:
5858
output.fluentd.fluent.io/enabled: "true"
59-
spec:
60-
outputs:
59+
spec:
60+
outputs:
6161
- stdout: {}
6262
buffer:
6363
type: file

‎manifests/fluentd/fluentd-cluster-cfg-output-es.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ metadata:
77
app.kubernetes.io/name: fluentd
88
spec:
99
globalInputs:
10-
- forward:
10+
- forward:
1111
bind: 0.0.0.0
1212
port: 24224
1313
replicas: 1
14-
image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
15-
fluentdCfgSelector:
14+
image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
15+
fluentdCfgSelector:
1616
matchLabels:
1717
config.fluentd.fluent.io/enabled: "true"
18-
18+
1919
---
2020
apiVersion: fluentd.fluent.io/v1alpha1
2121
kind: ClusterFluentdConfig
@@ -24,7 +24,7 @@ metadata:
2424
labels:
2525
config.fluentd.fluent.io/enabled: "true"
2626
spec:
27-
watchedNamespaces:
27+
watchedNamespaces:
2828
- kube-system
2929
- default
3030
clusterOutputSelector:
@@ -38,8 +38,8 @@ metadata:
3838
name: fluentd-output-es
3939
labels:
4040
output.fluentd.fluent.io/enabled: "true"
41-
spec:
42-
outputs:
41+
spec:
42+
outputs:
4343
- elasticsearch:
4444
host: elasticsearch-logging-data.kubesphere-logging-system.svc
4545
port: 9200

‎manifests/fluentd/fluentd-cluster-cfg-output-kafka.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ metadata:
77
app.kubernetes.io/name: fluentd
88
spec:
99
globalInputs:
10-
- forward:
10+
- forward:
1111
bind: 0.0.0.0
1212
port: 24224
1313
replicas: 1
14-
image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
15-
fluentdCfgSelector:
14+
image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
15+
fluentdCfgSelector:
1616
matchLabels:
1717
config.fluentd.fluent.io/enabled: "true"
1818

@@ -24,7 +24,7 @@ metadata:
2424
labels:
2525
config.fluentd.fluent.io/enabled: "true"
2626
spec:
27-
watchedNamespaces:
27+
watchedNamespaces:
2828
- kube-system
2929
- default
3030
clusterFilterSelector:
@@ -41,8 +41,8 @@ metadata:
4141
name: fluentd-filter
4242
labels:
4343
filter.fluentd.fluent.io/enabled: "true"
44-
spec:
45-
filters:
44+
spec:
45+
filters:
4646
- recordTransformer:
4747
enableRuby: true
4848
records:
@@ -56,8 +56,8 @@ metadata:
5656
name: fluentd-output-kafka
5757
labels:
5858
output.fluentd.fluent.io/enabled: "true"
59-
spec:
60-
outputs:
59+
spec:
60+
outputs:
6161
- kafka:
6262
brokers: my-cluster-kafka-bootstrap.default.svc:9091,my-cluster-kafka-bootstrap.default.svc:9092,my-cluster-kafka-bootstrap.default.svc:9093
6363
useEventTime: true

‎manifests/fluentd/fluentd-mixed-cfgs-multi-tenant-output.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ metadata:
77
app.kubernetes.io/name: fluentd
88
spec:
99
globalInputs:
10-
- forward:
10+
- forward:
1111
bind: 0.0.0.0
1212
port: 24224
1313
replicas: 1
14-
image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
15-
fluentdCfgSelector:
14+
image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
15+
fluentdCfgSelector:
1616
matchLabels:
1717
config.fluentd.fluent.io/enabled: "true"
18-
18+
1919
---
2020
apiVersion: fluentd.fluent.io/v1alpha1
2121
kind: FluentdConfig
@@ -42,7 +42,7 @@ metadata:
4242
labels:
4343
config.fluentd.fluent.io/enabled: "true"
4444
spec:
45-
watchedNamespaces:
45+
watchedNamespaces:
4646
- kube-system
4747
- default
4848
clusterOutputSelector:
@@ -59,8 +59,8 @@ metadata:
5959
labels:
6060
output.fluentd.fluent.io/enabled: "true"
6161
output.fluentd.fluent.io/user: "user1"
62-
spec:
63-
outputs:
62+
spec:
63+
outputs:
6464
- elasticsearch:
6565
host: elasticsearch-logging-data.kubesphere-logging-system.svc
6666
port: 9200
@@ -75,8 +75,8 @@ metadata:
7575
labels:
7676
output.fluentd.fluent.io/enabled: "true"
7777
output.fluentd.fluent.io/role: "log-operator"
78-
spec:
79-
outputs:
78+
spec:
79+
outputs:
8080
- elasticsearch:
8181
host: elasticsearch-logging-data.kubesphere-logging-system.svc
8282
port: 9200
@@ -91,8 +91,8 @@ metadata:
9191
labels:
9292
output.fluentd.fluent.io/enabled: "true"
9393
output.fluentd.fluent.io/scope: "cluster"
94-
spec:
95-
outputs:
94+
spec:
95+
outputs:
9696
- elasticsearch:
9797
host: elasticsearch-logging-data.kubesphere-logging-system.svc
9898
port: 9200

‎manifests/fluentd/fluentd-mixed-cfgs-output-es.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ metadata:
77
app.kubernetes.io/name: fluentd
88
spec:
99
globalInputs:
10-
- forward:
10+
- forward:
1111
bind: 0.0.0.0
1212
port: 24224
1313
replicas: 1
14-
image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
15-
fluentdCfgSelector:
14+
image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
15+
fluentdCfgSelector:
1616
matchLabels:
1717
config.fluentd.fluent.io/enabled: "true"
18-
18+
1919
---
2020
apiVersion: fluentd.fluent.io/v1alpha1
2121
kind: ClusterFluentdConfig
@@ -24,7 +24,7 @@ metadata:
2424
labels:
2525
config.fluentd.fluent.io/enabled: "true"
2626
spec:
27-
watchedNamespaces:
27+
watchedNamespaces:
2828
- kube-system
2929
- default
3030
clusterOutputSelector:
@@ -51,8 +51,8 @@ metadata:
5151
name: fluentd-output-es
5252
labels:
5353
output.fluentd.fluent.io/enabled: "true"
54-
spec:
55-
outputs:
54+
spec:
55+
outputs:
5656
- elasticsearch:
5757
host: elasticsearch-logging-data.kubesphere-logging-system.svc
5858
port: 9200

‎manifests/fluentd/fluentd-namespaced-cfg-output-es.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ metadata:
77
app.kubernetes.io/name: fluentd
88
spec:
99
globalInputs:
10-
- forward:
10+
- forward:
1111
bind: 0.0.0.0
1212
port: 24224
1313
replicas: 1
14-
image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
15-
fluentdCfgSelector:
14+
image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
15+
fluentdCfgSelector:
1616
matchLabels:
1717
config.fluentd.fluent.io/enabled: "true"
18-
18+
1919
---
2020
apiVersion: fluentd.fluent.io/v1alpha1
2121
kind: FluentdConfig
@@ -37,8 +37,8 @@ metadata:
3737
namespace: fluent
3838
labels:
3939
output.fluentd.fluent.io/enabled: "true"
40-
spec:
41-
outputs:
40+
spec:
41+
outputs:
4242
- elasticsearch:
4343
host: elasticsearch-logging-data.kubesphere-logging-system.svc
4444
port: 9200

0 commit comments

Comments
 (0)