fix: incorrect field names in fluentd buffer plugin

Signed-off-by: Edmund Rhudy <[email protected]>
fluent · Jul 8, 2023 · ad95a05 · ad95a05
1 parent ab72254
commit ad95a05
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/apis/fluentd/v1alpha1/plugins/common/buffer_types.go b/apis/fluentd/v1alpha1/plugins/common/buffer_types.go
@@ -210,7 +210,7 @@ func (b *Buffer) Params(_ plugins.SecretLoader) (*params.PluginStore, error) {
 	}
 
 	if b.TotalLimitSize != nil {
-		ps.InsertPairs("chunk_limit_size", *b.TotalLimitSize)
+		ps.InsertPairs("total_limit_size", *b.TotalLimitSize)
 	}
 
 	if b.QueueLimitLength != nil {
@@ -254,7 +254,7 @@ func (b *Buffer) Params(_ plugins.SecretLoader) (*params.PluginStore, error) {
 	}
 
 	if b.RetrySecondaryThreshold != nil {
-		ps.InsertPairs("retry_secondary_threshold", fmt.Sprint(*b.RetryTimeout))
+		ps.InsertPairs("retry_secondary_threshold", fmt.Sprint(*b.RetrySecondaryThreshold))
 	}
 
 	if b.RetryType != nil {

diff --git a/apis/fluentd/v1alpha1/tests/expected/duplicate-removal-cr-specs.cfg b/apis/fluentd/v1alpha1/tests/expected/duplicate-removal-cr-specs.cfg
@@ -79,8 +79,8 @@
     <buffer buffertag.*>
       @id  common_buffer
       @type  file
-      chunk_limit_size  5GB
       path  /buffers/fd.log
+      total_limit_size  5GB
     </buffer>
     <server>
       host  host
@@ -98,8 +98,8 @@
     <buffer buffertag.*>
       @id  common_buffer
       @type  file
-      chunk_limit_size  5GB
       path  /buffers/fd.log
+      total_limit_size  5GB
     </buffer>
     <format>
       @type  json
@@ -116,8 +116,8 @@
     <buffer buffertag.*>
       @id  common_buffer
       @type  file
-      chunk_limit_size  5GB
       path  /buffers/fd.log
+      total_limit_size  5GB
     </buffer>
   </match>
 </label>
@@ -172,8 +172,8 @@
     <buffer buffertag.*>
       @id  common_buffer
       @type  file
-      chunk_limit_size  5GB
       path  /buffers/fd.log
+      total_limit_size  5GB
     </buffer>
     <server>
       host  host
@@ -191,8 +191,8 @@
     <buffer buffertag.*>
       @id  common_buffer
       @type  file
-      chunk_limit_size  5GB
       path  /buffers/fd.log
+      total_limit_size  5GB
     </buffer>
     <format>
       @type  json
@@ -209,8 +209,8 @@
     <buffer buffertag.*>
       @id  common_buffer
       @type  file
-      chunk_limit_size  5GB
       path  /buffers/fd.log
+      total_limit_size  5GB
     </buffer>
   </match>
 </label>