Merge pull request #1357 from reegnz/update_fluentd_image_references

Update fluentd image references
fluent · Sep 25, 2024 · aedfcf9 · aedfcf9
2 parents c1a9581 + b1e655e
commit aedfcf9
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
@@ -401,7 +401,7 @@ fluentd:
   port: 24224
   image:
     repository: "ghcr.io/fluent/fluent-operator/fluentd"
-    tag: "v1.17.0"
+    tag: "v1.17.0-4"
   # Numbers of the Fluentd instance
   # Applicable when the mode is "collector", and will be ignored when the mode is "agent"
   replicas: 1

diff --git a/manifests/fluentd/fluentd-cluster-cfg-output-buffer-example.yaml b/manifests/fluentd/fluentd-cluster-cfg-output-buffer-example.yaml
@@ -11,7 +11,7 @@ spec:
       bind: 0.0.0.0
       port: 24224
   replicas: 3
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-4
   fluentdCfgSelector: 
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"

diff --git a/manifests/fluentd/fluentd-cluster-cfg-output-es.yaml b/manifests/fluentd/fluentd-cluster-cfg-output-es.yaml
@@ -11,7 +11,7 @@ spec:
       bind: 0.0.0.0
       port: 24224
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-4
   fluentdCfgSelector: 
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
@@ -44,4 +44,4 @@ spec:
       host: elasticsearch-logging-data.kubesphere-logging-system.svc
       port: 9200
       logstashFormat: true
-      logstashPrefix: ks-logstash-log
+      logstashPrefix: ks-logstash-log
diff --git a/manifests/fluentd/fluentd-cluster-cfg-output-kafka.yaml b/manifests/fluentd/fluentd-cluster-cfg-output-kafka.yaml
@@ -11,7 +11,7 @@ spec:
       bind: 0.0.0.0
       port: 24224
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-4
   fluentdCfgSelector: 
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
@@ -61,4 +61,4 @@ spec:
   - 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
-      topicKey: kubernetes_ns
+      topicKey: kubernetes_ns
diff --git a/manifests/fluentd/fluentd-mixed-cfgs-multi-tenant-output.yaml b/manifests/fluentd/fluentd-mixed-cfgs-multi-tenant-output.yaml
@@ -11,7 +11,7 @@ spec:
       bind: 0.0.0.0
       port: 24224
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-4
   fluentdCfgSelector: 
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
@@ -97,4 +97,4 @@ spec:
       host: elasticsearch-logging-data.kubesphere-logging-system.svc
       port: 9200
       logstashFormat: true
-      logstashPrefix: ks-logstash-log
+      logstashPrefix: ks-logstash-log
diff --git a/manifests/fluentd/fluentd-mixed-cfgs-output-es.yaml b/manifests/fluentd/fluentd-mixed-cfgs-output-es.yaml
@@ -11,7 +11,7 @@ spec:
       bind: 0.0.0.0
       port: 24224
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-4
   fluentdCfgSelector: 
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"

diff --git a/manifests/fluentd/fluentd-namespaced-cfg-output-es.yaml b/manifests/fluentd/fluentd-namespaced-cfg-output-es.yaml
@@ -11,7 +11,7 @@ spec:
       bind: 0.0.0.0
       port: 24224
   replicas: 1
-  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-4
   fluentdCfgSelector: 
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
@@ -43,4 +43,4 @@ spec:
       host: elasticsearch-logging-data.kubesphere-logging-system.svc
       port: 9200
       logstashFormat: true
-      logstashPrefix: ks-logstash-log
+      logstashPrefix: ks-logstash-log
diff --git a/manifests/quick-start/fluentd-forward.yaml b/manifests/quick-start/fluentd-forward.yaml
@@ -11,7 +11,7 @@ spec:
         bind: 0.0.0.0
         port: 24224
   replicas: 1
-  image: kubesphere/fluentd:v1.14.4
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-4
   fluentdCfgSelector: 
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
@@ -54,4 +54,4 @@ metadata:
     output.fluentd.fluent.io/enabled: "true"
 spec: 
   outputs: 
-    - stdout: {}
+    - stdout: {}
diff --git a/manifests/quick-start/fluentd-http.yaml b/manifests/quick-start/fluentd-http.yaml
@@ -11,7 +11,7 @@ spec:
         bind: 0.0.0.0
         port: 9880
   replicas: 1
-  image: kubesphere/fluentd:v1.14.4
+  image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-4
   fluentdCfgSelector: 
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
@@ -54,4 +54,4 @@ metadata:
     output.fluentd.fluent.io/enabled: "true"
 spec: 
   outputs: 
-    - stdout: {}
+    - stdout: {}