Bump fluentd to v1.19.0.

Makefile

@@ -11,7 +11,7 @@ FB_VERSION?=$(shell grep -v '^#' cmd/fluent-watcher/fluentbit/VERSION | tr -d "
 # Image URL to use all building/pushing image targets
 FB_IMG ?= ghcr.io/fluent/fluent-operator/fluent-bit:v${FB_VERSION}
 FB_IMG_DEBUG ?= ghcr.io/fluent/fluent-operator/fluent-bit:v${FB_VERSION}-debug
-FD_IMG ?= ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
+FD_IMG ?= ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
 FO_IMG ?= kubesphere/fluent-operator:$(VERSION)
 FD_IMG_BASE ?= ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-arm64-base
 

apis/fluentd/v1alpha1/tests/tools.go

@@ -31,7 +31,7 @@ spec:
       bind: 0.0.0.0
       port: 24224
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
   fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
@@ -55,7 +55,7 @@ spec:
       size: 10
       autoIncrementKey: "id"
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
   fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
@@ -80,7 +80,7 @@ spec:
       includeConfig: true
       includeRetry: true
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
   fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
@@ -132,7 +132,7 @@ spec:
       - /var/log/foo.log
       - /var/log/bar
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
   fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"

charts/fluent-operator/values.yaml

@@ -468,7 +468,7 @@ fluentd:
     registry: ghcr.io
     repository: fluent/fluent-operator/fluentd
     # renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluentd
-    tag: v1.17.1
+    tag: v1.19.0
 
   # Numbers of the Fluentd instance
   # Applicable when the mode is "collector", and will be ignored when the mode is "agent"

cmd/fluent-watcher/fluentd/VERSION

@@ -1 +1 @@
-1.17.1
+1.19.0

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

@@ -7,12 +7,12 @@ metadata:
     app.kubernetes.io/name: fluentd
 spec:
   globalInputs:
-  - forward: 
+  - forward:
       bind: 0.0.0.0
       port: 24224
   replicas: 3
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
-  fluentdCfgSelector: 
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
+  fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
 
@@ -24,7 +24,7 @@ metadata:
   labels:
     config.fluentd.fluent.io/enabled: "true"
 spec:
-  watchedNamespaces: 
+  watchedNamespaces:
   - kube-system
   - default
   clusterFilterSelector:
@@ -41,8 +41,8 @@ metadata:
   name: fluentd-filter
   labels:
     filter.fluentd.fluent.io/enabled: "true"
-spec: 
-  filters: 
+spec:
+  filters:
   - recordTransformer:
       enableRuby: true
       records:
@@ -56,8 +56,8 @@ metadata:
   name: fluentd-output
   labels:
     output.fluentd.fluent.io/enabled: "true"
-spec: 
-  outputs: 
+spec:
+  outputs:
   - stdout: {}
     buffer:
       type: file

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

@@ -7,15 +7,15 @@ metadata:
     app.kubernetes.io/name: fluentd
 spec:
   globalInputs:
-  - forward: 
+  - forward:
       bind: 0.0.0.0
       port: 24224
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
-  fluentdCfgSelector: 
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
+  fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
-   
+
 ---
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: ClusterFluentdConfig
@@ -24,7 +24,7 @@ metadata:
   labels:
     config.fluentd.fluent.io/enabled: "true"
 spec:
-  watchedNamespaces: 
+  watchedNamespaces:
   - kube-system
   - default
   clusterOutputSelector:
@@ -38,8 +38,8 @@ metadata:
   name: fluentd-output-es
   labels:
     output.fluentd.fluent.io/enabled: "true"
-spec: 
-  outputs: 
+spec:
+  outputs:
   - elasticsearch:
       host: elasticsearch-logging-data.kubesphere-logging-system.svc
       port: 9200

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

@@ -7,12 +7,12 @@ metadata:
     app.kubernetes.io/name: fluentd
 spec:
   globalInputs:
-  - forward: 
+  - forward:
       bind: 0.0.0.0
       port: 24224
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
-  fluentdCfgSelector: 
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
+  fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
 
@@ -24,7 +24,7 @@ metadata:
   labels:
     config.fluentd.fluent.io/enabled: "true"
 spec:
-  watchedNamespaces: 
+  watchedNamespaces:
   - kube-system
   - default
   clusterFilterSelector:
@@ -41,8 +41,8 @@ metadata:
   name: fluentd-filter
   labels:
     filter.fluentd.fluent.io/enabled: "true"
-spec: 
-  filters: 
+spec:
+  filters:
   - recordTransformer:
       enableRuby: true
       records:
@@ -56,8 +56,8 @@ metadata:
   name: fluentd-output-kafka
   labels:
     output.fluentd.fluent.io/enabled: "true"
-spec: 
-  outputs: 
+spec:
+  outputs:
   - kafka:
       brokers: my-cluster-kafka-bootstrap.default.svc:9091,my-cluster-kafka-bootstrap.default.svc:9092,my-cluster-kafka-bootstrap.default.svc:9093
       useEventTime: true

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

@@ -7,15 +7,15 @@ metadata:
     app.kubernetes.io/name: fluentd
 spec:
   globalInputs:
-  - forward: 
+  - forward:
       bind: 0.0.0.0
       port: 24224
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
-  fluentdCfgSelector: 
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
+  fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
-   
+
 ---
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: FluentdConfig
@@ -42,7 +42,7 @@ metadata:
   labels:
     config.fluentd.fluent.io/enabled: "true"
 spec:
-  watchedNamespaces: 
+  watchedNamespaces:
   - kube-system
   - default
   clusterOutputSelector:
@@ -59,8 +59,8 @@ metadata:
   labels:
     output.fluentd.fluent.io/enabled: "true"
     output.fluentd.fluent.io/user: "user1"
-spec: 
-  outputs: 
+spec:
+  outputs:
   - elasticsearch:
       host: elasticsearch-logging-data.kubesphere-logging-system.svc
       port: 9200
@@ -75,8 +75,8 @@ metadata:
   labels:
     output.fluentd.fluent.io/enabled: "true"
     output.fluentd.fluent.io/role: "log-operator"
-spec: 
-  outputs: 
+spec:
+  outputs:
   - elasticsearch:
       host: elasticsearch-logging-data.kubesphere-logging-system.svc
       port: 9200
@@ -91,8 +91,8 @@ metadata:
   labels:
     output.fluentd.fluent.io/enabled: "true"
     output.fluentd.fluent.io/scope: "cluster"
-spec: 
-  outputs: 
+spec:
+  outputs:
   - elasticsearch:
       host: elasticsearch-logging-data.kubesphere-logging-system.svc
       port: 9200

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

@@ -7,15 +7,15 @@ metadata:
     app.kubernetes.io/name: fluentd
 spec:
   globalInputs:
-  - forward: 
+  - forward:
       bind: 0.0.0.0
       port: 24224
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
-  fluentdCfgSelector: 
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
+  fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
-   
+
 ---
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: ClusterFluentdConfig
@@ -24,7 +24,7 @@ metadata:
   labels:
     config.fluentd.fluent.io/enabled: "true"
 spec:
-  watchedNamespaces: 
+  watchedNamespaces:
   - kube-system
   - default
   clusterOutputSelector:
@@ -51,8 +51,8 @@ metadata:
   name: fluentd-output-es
   labels:
     output.fluentd.fluent.io/enabled: "true"
-spec: 
-  outputs: 
+spec:
+  outputs:
   - elasticsearch:
       host: elasticsearch-logging-data.kubesphere-logging-system.svc
       port: 9200

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

@@ -7,15 +7,15 @@ metadata:
     app.kubernetes.io/name: fluentd
 spec:
   globalInputs:
-  - forward: 
+  - forward:
       bind: 0.0.0.0
       port: 24224
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
-  fluentdCfgSelector: 
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
+  fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
-   
+
 ---
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: FluentdConfig
@@ -37,8 +37,8 @@ metadata:
   namespace: fluent
   labels:
     output.fluentd.fluent.io/enabled: "true"
-spec: 
-  outputs: 
+spec:
+  outputs:
   - elasticsearch:
       host: elasticsearch-logging-data.kubesphere-logging-system.svc
       port: 9200

manifests/quick-start/fluentd-forward.yaml

@@ -7,15 +7,15 @@ metadata:
     app.kubernetes.io/name: fluentd
 spec:
   globalInputs:
-    - forward: 
+    - forward:
         bind: 0.0.0.0
         port: 24224
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
-  fluentdCfgSelector: 
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.19.0
+  fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
-   
+
 ---
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: FluentdConfig
@@ -40,8 +40,8 @@ metadata:
   namespace: fluent
   labels:
     filter.fluentd.fluent.io/enabled: "true"
-spec: 
-  filters: 
+spec:
+  filters:
     - stdout: {}
 
 ---
@@ -52,6 +52,6 @@ metadata:
   namespace: fluent
   labels:
     output.fluentd.fluent.io/enabled: "true"
-spec: 
-  outputs: 
+spec:
+  outputs:
     - stdout: {}