feat: support enable ipv6 (#1870)

withlin · web-flow · commit b0970465a332 · 2024-12-02T09:05:48.000+01:00
Signed-off-by: withlin &lt;withlin@apache.org&gt;
diff --git a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentbitagents.yaml b/charts/logging-operator/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:
diff --git a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentdconfigs.yaml b/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentdconfigs.yaml
@@ -1193,6 +1193,8 @@ spec:
                 type: string
               enableMsgpackTimeSupport:
                 type: boolean
+              enabledIPv6:
+                type: boolean
               envVars:
                 items:
                   properties:
diff --git a/charts/logging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml b/charts/logging-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:
@@ -4936,6 +4938,8 @@ spec:
                     type: string
                   enableMsgpackTimeSupport:
                     type: boolean
+                  enabledIPv6:
+                    type: boolean
                   envVars:
                     items:
                       properties:
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:
diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_fluentdconfigs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_fluentdconfigs.yaml
@@ -1190,6 +1190,8 @@ spec:
                 type: string
               enableMsgpackTimeSupport:
                 type: boolean
+              enabledIPv6:
+                type: boolean
               envVars:
                 items:
                   properties:
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:
@@ -4933,6 +4935,8 @@ spec:
                     type: string
                   enableMsgpackTimeSupport:
                     type: boolean
+                  enabledIPv6:
+                    type: boolean
                   envVars:
                     items:
                       properties:
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:
diff --git a/config/crd/bases/logging.banzaicloud.io_fluentdconfigs.yaml b/config/crd/bases/logging.banzaicloud.io_fluentdconfigs.yaml
@@ -1190,6 +1190,8 @@ spec:
                 type: string
               enableMsgpackTimeSupport:
                 type: boolean
+              enabledIPv6:
+                type: boolean
               envVars:
                 items:
                   properties:
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:
@@ -4933,6 +4935,8 @@ spec:
                     type: string
                   enableMsgpackTimeSupport:
                     type: boolean
+                  enabledIPv6:
+                    type: boolean
                   envVars:
                     items:
                       properties:
diff --git a/docs/configuration/crds/v1beta1/fluentbit_types.md b/docs/configuration/crds/v1beta1/fluentbit_types.md
@@ -102,6 +102,9 @@ Disable Kubernetes metadata filter
 ### enableUpstream (bool, optional) {#fluentbitspec-enableupstream}
 
 
+### enabledIPv6 (bool, optional) {#fluentbitspec-enabledipv6}
+
+
 ### envVars ([]corev1.EnvVar, optional) {#fluentbitspec-envvars}
 
 
diff --git a/docs/configuration/crds/v1beta1/fluentd_types.md b/docs/configuration/crds/v1beta1/fluentd_types.md
@@ -68,6 +68,9 @@ Overrides the default logging level configCheck setup This field is not used dir
 Allows Time object in buffer's MessagePack serde [more info]( https://docs.fluentd.org/deployment/system-config#enable_msgpack_time_support) 
 
 
+### enabledIPv6 (bool, optional) {#fluentdspec-enabledipv6}
+
+
 ### envVars ([]corev1.EnvVar, optional) {#fluentdspec-envvars}
 
 
diff --git a/pkg/resources/fluentbit/config.go b/pkg/resources/fluentbit/config.go
@@ -35,7 +35,11 @@ var fluentBitConfigTemplate = `
     Coro_Stack_Size    {{ .CoroStackSize }}
     {{- if .Monitor.Enabled }}
     HTTP_Server  On
+    {{- if .EnabledIPv6 }}
     HTTP_Listen  [::]
+    {{- else }}
+    Listen 0.0.0.0
+    {{- end }}
     HTTP_Port    {{ .Monitor.Port }}
     {{- end }}
     {{- range $key, $value := .BufferStorage }}
diff --git a/pkg/resources/fluentbit/configsecret.go b/pkg/resources/fluentbit/configsecret.go
@@ -67,6 +67,7 @@ type fluentBitConfig struct {
 	Flush                   int32
 	Grace                   int32
 	LogLevel                string
+	EnabledIPv6             bool
 	CoroStackSize           int32
 	Output                  map[string]string
 	Input                   fluentbitInputConfig
@@ -216,6 +217,7 @@ func (r *Reconciler) configSecret() (runtime.Object, reconciler.DesiredState, er
 		Flush:                   r.fluentbitSpec.Flush,
 		Grace:                   r.fluentbitSpec.Grace,
 		LogLevel:                r.fluentbitSpec.LogLevel,
+		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,6 +63,7 @@ var fluentdInputTemplate = `
     metrics_path {{ .Monitor.Path }}
 {{- end }}
 </source>
+{{- if .EnabledIPv6 }}
 <source>
     @type prometheus
     @id in_prometheus6
@@ -72,6 +73,7 @@ var fluentdInputTemplate = `
     metrics_path {{ .Monitor.Path }}
 {{- end }}
 </source>
+{{- end }}
 <source>
     @type prometheus_monitor
 </source>
diff --git a/pkg/resources/fluentd/configsecret.go b/pkg/resources/fluentd/configsecret.go
@@ -27,9 +27,10 @@ import (
 )
 
 type fluentdConfig struct {
-	LogFormat string
-	LogLevel  string
-	Monitor   struct {
+	LogFormat   string
+	LogLevel    string
+	EnabledIPv6 bool
+	Monitor     struct {
 		Enabled bool
 		Port    int32
 		Path    string
diff --git a/pkg/sdk/logging/api/v1beta1/fluentbit_types.go b/pkg/sdk/logging/api/v1beta1/fluentbit_types.go
@@ -72,6 +72,7 @@ type FluentbitSpec struct {
 	TLS                  *FluentbitTLS     `json:"tls,omitempty"`
 	TargetHost           string            `json:"targetHost,omitempty"`
 	TargetPort           int32             `json:"targetPort,omitempty"`
+	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.
diff --git a/pkg/sdk/logging/api/v1beta1/fluentd_types.go b/pkg/sdk/logging/api/v1beta1/fluentd_types.go
@@ -51,6 +51,7 @@ type FluentdSpec struct {
 	TLS                    FluentdTLS        `json:"tls,omitempty"`
 	Image                  ImageSpec         `json:"image,omitempty"`
 	DisablePvc             bool              `json:"disablePvc,omitempty"`
+	EnabledIPv6            bool              `json:"enabledIPv6,omitempty"`
 	// BufferStorageVolume is by default configured as PVC using FluentdPvcSpec
 	// +docLink:"volume.KubernetesVolume,https://github.com/cisco-open/operator-tools/tree/master/docs/types"
 	BufferStorageVolume volume.KubernetesVolume `json:"bufferStorageVolume,omitempty"`
