feat: support enableipv6 for fluentbit and fluentd

Signed-off-by: withlin <[email protected]>
kube-logging · Dec 1, 2024 · 42b1029 · 42b1029
1 parent f4c6bbf
commit 42b1029
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/...erator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentbitagents.yaml b/...erator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentbitagents.yaml
@@ -1167,6 +1167,8 @@ spec:
                 type: string
               enableUpstream:
                 type: boolean
+              enabledIPv6:
+                type: boolean
               envVars:
                 items:
                   properties:
@@ -1588,8 +1590,6 @@ spec:
                   storage.type:
                     type: string
                 type: object
-              ipFamilies:
-                type: string
               labels:
                 additionalProperties:
                   type: string

diff --git a/...ging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml b/...ging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml
@@ -2214,6 +2214,8 @@ spec:
                     type: string
                   enableUpstream:
                     type: boolean
+                  enabledIPv6:
+                    type: boolean
                   envVars:
                     items:
                       properties:
@@ -2635,8 +2637,6 @@ spec:
                       storage.type:
                         type: string
                     type: object
-                  ipFamilies:
-                    type: string
                   labels:
                     additionalProperties:
                       type: string

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml
@@ -1164,6 +1164,8 @@ spec:
                 type: string
               enableUpstream:
                 type: boolean
+              enabledIPv6:
+                type: boolean
               envVars:
                 items:
                   properties:
@@ -1585,8 +1587,6 @@ spec:
                   storage.type:
                     type: string
                 type: object
-              ipFamilies:
-                type: string
               labels:
                 additionalProperties:
                   type: string

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml
@@ -2211,6 +2211,8 @@ spec:
                     type: string
                   enableUpstream:
                     type: boolean
+                  enabledIPv6:
+                    type: boolean
                   envVars:
                     items:
                       properties:
@@ -2632,8 +2634,6 @@ spec:
                       storage.type:
                         type: string
                     type: object
-                  ipFamilies:
-                    type: string
                   labels:
                     additionalProperties:
                       type: string

diff --git a/config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml b/config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml
@@ -1164,6 +1164,8 @@ spec:
                 type: string
               enableUpstream:
                 type: boolean
+              enabledIPv6:
+                type: boolean
               envVars:
                 items:
                   properties:
@@ -1585,8 +1587,6 @@ spec:
                   storage.type:
                     type: string
                 type: object
-              ipFamilies:
-                type: string
               labels:
                 additionalProperties:
                   type: string

diff --git a/config/crd/bases/logging.banzaicloud.io_loggings.yaml b/config/crd/bases/logging.banzaicloud.io_loggings.yaml
@@ -2211,6 +2211,8 @@ spec:
                     type: string
                   enableUpstream:
                     type: boolean
+                  enabledIPv6:
+                    type: boolean
                   envVars:
                     items:
                       properties:
@@ -2632,8 +2634,6 @@ spec:
                       storage.type:
                         type: string
                     type: object
-                  ipFamilies:
-                    type: string
                   labels:
                     additionalProperties:
                       type: string

diff --git a/pkg/resources/fluentbit/config.go b/pkg/resources/fluentbit/config.go
@@ -35,10 +35,10 @@ var fluentBitConfigTemplate = `
     Coro_Stack_Size    {{ .CoroStackSize }}
     {{- if .Monitor.Enabled }}
     HTTP_Server  On
-    {{- if eq .IPFamily "IPv4" }}
+    {{- if .Monitor.EnabledIPv6 }}
+    HTTP_Listen  [::]
+    {{- else }}
     Listen 0.0.0.0
-    {{- else if eq .IPFamily "IPv6" }}
-    Listen ::
     {{- end }}
     HTTP_Port    {{ .Monitor.Port }}
     {{- end }}

diff --git a/pkg/resources/fluentbit/configsecret.go b/pkg/resources/fluentbit/configsecret.go
@@ -67,7 +67,7 @@ type fluentBitConfig struct {
 	Flush                   int32
 	Grace                   int32
 	LogLevel                string
-	IPFamily                string 
+	EnabledIPv6             bool      
 	CoroStackSize           int32
 	Output                  map[string]string
 	Input                   fluentbitInputConfig
@@ -217,7 +217,7 @@ func (r *Reconciler) configSecret() (runtime.Object, reconciler.DesiredState, er
 		Flush:                   r.fluentbitSpec.Flush,
 		Grace:                   r.fluentbitSpec.Grace,
 		LogLevel:                r.fluentbitSpec.LogLevel,
-		IPFamily:                r.fluentbitSpec.IPFamily,
+		EnabledIPv6:             r.fluentbitSpec.EnabledIPv6,
 		CoroStackSize:           r.fluentbitSpec.CoroStackSize,
 		Namespace:               r.Logging.Spec.ControlNamespace,
 		DisableKubernetesFilter: disableKubernetesFilter,

diff --git a/pkg/resources/fluentd/config.go b/pkg/resources/fluentd/config.go
@@ -63,7 +63,7 @@ var fluentdInputTemplate = `
     metrics_path {{ .Monitor.Path }}
 {{- end }}
 </source>
-{{{{ if .Monitor.EnabledIPv6 }}}}
+{{- if .Monitor.EnabledIPv6 }}
 <source>
     @type prometheus
     @id in_prometheus6

diff --git a/pkg/sdk/logging/api/v1beta1/fluentbit_types.go b/pkg/sdk/logging/api/v1beta1/fluentbit_types.go
@@ -72,7 +72,7 @@ type FluentbitSpec struct {
 	TLS                  *FluentbitTLS     `json:"tls,omitempty"`
 	TargetHost           string            `json:"targetHost,omitempty"`
 	TargetPort           int32             `json:"targetPort,omitempty"`
-	IPFamily             string            `json:"ipFamilies,omitempty" plugin:"default:ipv4"` 
+	EnabledIPv6          bool              `json:"enabledIPv6,omitempty"`
 	// Set the flush time in seconds.nanoseconds. The engine loop uses a Flush timeout to define when is required to flush the records ingested by input plugins through the defined output plugins. (default: 1)
 	Flush int32 `json:"flush,omitempty"  plugin:"default:1"`
 	// Set the grace time in seconds as Integer value. The engine loop uses a Grace timeout to define wait time on exit.