Skip to content

Replace fluentd with fluent-bit in the operator #4910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
hjiawei wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Replace fluentd with fluent-bit in the operator #4910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98ab545
Replace fluentd with fluent-bit in the operator
hjiawei Jun 3, 2026
c81ad06
Ship fluent-bit logs through the built-in http output
hjiawei Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions api/v1/fluentd_daemonset_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ type FluentdDaemonSetPodSpec struct {

// FluentdDaemonSetContainer is a Fluentd DaemonSet container.
type FluentdDaemonSetContainer struct {
// Name is an enum which identifies the Fluentd DaemonSet container by name.
// Supported values are: fluentd
// +kubebuilder:validation:Enum=fluentd
// Name is an enum which identifies the Fluent Bit DaemonSet container by name.
// Supported values are: calico-fluent-bit
// +kubebuilder:validation:Enum=calico-fluent-bit
Name string `json:"name"`

// Resources allows customization of limits and requests for compute resources such as cpu and memory.
Expand All @@ -85,9 +85,9 @@ type FluentdDaemonSetContainer struct {

// FluentdDaemonSetInitContainer is a Fluentd DaemonSet init container.
type FluentdDaemonSetInitContainer struct {
// Name is an enum which identifies the Fluentd DaemonSet init container by name.
// Supported values are: tigera-fluentd-prometheus-tls-key-cert-provisioner
// +kubebuilder:validation:Enum=tigera-fluentd-prometheus-tls-key-cert-provisioner
// Name is an enum which identifies the Fluent Bit DaemonSet init container by name.
// Supported values are: calico-fluent-bit-tls-key-cert-provisioner
// +kubebuilder:validation:Enum=calico-fluent-bit-tls-key-cert-provisioner
Name string `json:"name"`

// Resources allows customization of limits and requests for compute resources such as cpu and memory.
Expand Down
13 changes: 12 additions & 1 deletion api/v1/logcollector_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,19 @@ type LogCollectorSpec struct {
MultiTenantManagementClusterNamespace string `json:"multiTenantManagementClusterNamespace,omitempty"`

// FluentdDaemonSet configures the Fluentd DaemonSet.
//
// Deprecated: use CalicoFluentBitDaemonSet instead. This field is retained
// as an alias for one release during the Fluentd → Fluent Bit migration;
// when both are set, CalicoFluentBitDaemonSet takes precedence.
// +optional
FluentdDaemonSet *FluentdDaemonSet `json:"fluentdDaemonSet,omitempty"`

// CalicoFluentBitDaemonSet configures the calico-fluent-bit DaemonSet, the
// Fluent Bit replacement for the Fluentd DaemonSet. Pod-template override
// semantics are unchanged from the deprecated FluentdDaemonSet field.
// +optional
CalicoFluentBitDaemonSet *FluentdDaemonSet `json:"calicoFluentBitDaemonSet,omitempty"`

// EKSLogForwarderDeployment configures the EKSLogForwarderDeployment Deployment.
// +optional
EKSLogForwarderDeployment *EKSLogForwarderDeployment `json:"eksLogForwarderDeployment,omitempty"`
Expand Down Expand Up @@ -222,7 +233,7 @@ type LogCollectorStatus struct {
// +kubebuilder:resource:scope=Cluster

// LogCollector installs the components required for Tigera flow and DNS log collection. At most one instance
// of this resource is supported. It must be named "tigera-secure". When created, this installs fluentd on all nodes
// of this resource is supported. It must be named "tigera-secure". When created, this installs fluent-bit on all nodes
// configured to collect Tigera log data and export it to Tigera's Elasticsearch cluster as well as any additionally configured destinations.
//
// +kubebuilder:validation:XValidation:rule="self.metadata.name == 'tigera-secure'",message="resource name must be 'tigera-secure'"
Expand Down
5 changes: 5 additions & 0 deletions api/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions config/enterprise_versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ components:
node-windows:
image: node-windows
version: master
fluentd:
image: fluentd
fluent-bit:
image: fluent-bit
version: master
fluentd-windows:
image: fluentd-windows
fluent-bit-windows:
image: fluent-bit-windows
version: master
dex:
image: dex
Expand Down
12 changes: 6 additions & 6 deletions hack/gen-versions/enterprise.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,17 @@ var (
variant: enterpriseVariant,
}
{{- end }}
{{ with .Components.fluentd }}
ComponentFluentd = Component{
{{ with index .Components "fluent-bit" }}
ComponentFluentBit = Component{
Version: "{{ .Version }}",
Image: "{{ .Image }}",
Registry: "{{ .Registry }}",
imagePath: "{{ .ImagePath }}",
variant: enterpriseVariant,
}
{{- end }}
{{ with index .Components "fluentd-windows" }}
ComponentFluentdWindows = Component{
{{ with index .Components "fluent-bit-windows" }}
ComponentFluentBitWindows = Component{
Version: "{{ .Version }}",
Image: "{{ .Image }}",
Registry: "{{ .Registry }}",
Expand Down Expand Up @@ -306,8 +306,8 @@ var (
ComponentElasticTseeInstaller,
ComponentElasticsearch,
ComponentElasticsearchOperator,
ComponentFluentd,
ComponentFluentdWindows,
ComponentFluentBit,
ComponentFluentBitWindows,
ComponentIntrusionDetectionController,
ComponentKibana,
ComponentManager,
Expand Down
12 changes: 6 additions & 6 deletions pkg/components/enterprise.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,17 @@ var (
variant: enterpriseVariant,
}

ComponentFluentd = Component{
ComponentFluentBit = Component{
Version: "master",
Image: "fluentd",
Image: "fluent-bit",
Registry: "",
imagePath: "",
variant: enterpriseVariant,
}

ComponentFluentdWindows = Component{
ComponentFluentBitWindows = Component{
Version: "master",
Image: "fluentd-windows",
Image: "fluent-bit-windows",
Registry: "",
imagePath: "",
variant: enterpriseVariant,
Expand Down Expand Up @@ -273,8 +273,8 @@ var (
ComponentElasticTseeInstaller,
ComponentElasticsearch,
ComponentElasticsearchOperator,
ComponentFluentd,
ComponentFluentdWindows,
ComponentFluentBit,
ComponentFluentBitWindows,
ComponentIntrusionDetectionController,
ComponentKibana,
ComponentManager,
Expand Down
Loading
Loading