Skip to content
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

Jump to bottom

change fluentbit flushSeconds type to float64 #1406

Merged
merged 2 commits into from
Nov 12, 2024
Merged

change fluentbit flushSeconds type to float64 #1406

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
bf38de5
change fluentbit flushSeconds type to float64
jjsiv Nov 8, 2024
fccafd0
verify-crds.sh allowDangerousTypes=true
jjsiv Nov 8, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ FD_IMG_BASE ?= ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-arm64-base
ARCH ?= arm64

# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true"
CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true,allowDangerousTypes=true"

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand Down
2 changes: 1 addition & 1 deletion apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ type Service struct {
// If true go to background on start
Daemon *bool `json:"daemon,omitempty"`
// Interval to flush output
FlushSeconds *int64 `json:"flushSeconds,omitempty"`
FlushSeconds *float64 `json:"flushSeconds,omitempty"`
// Wait time on exit
GraceSeconds *int64 `json:"graceSeconds,omitempty"`
// the error count to meet the unhealthy requirement, this is a sum for all output plugins in a defined HC_Period, example for output error: [2022/02/16 10:44:10] [ warn] [engine] failed to flush chunk '1-1645008245.491540684.flb', retry in 7 seconds: task_id=0, input=forward.1 > output=cloudwatch_logs.3 (out_id=3)
Expand Down
8 changes: 6 additions & 2 deletions apis/fluentbit/v1alpha2/clusterfluentbitconfig_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ var cfg = ClusterFluentBitConfig{
Spec: FluentBitConfigSpec{
Service: &Service{
Daemon: ptrBool(false),
FlushSeconds: ptrInt64(1),
FlushSeconds: ptrFloat64(1),
GraceSeconds: ptrInt64(30),
HttpServer: ptrBool(true),
LogLevel: "info",
Expand Down Expand Up @@ -1168,7 +1168,7 @@ func TestClusterFluentBitConfig_RenderMainConfig_WithParsersFiles(t *testing.T)
Spec: FluentBitConfigSpec{
Service: &Service{
Daemon: ptrBool(false),
FlushSeconds: ptrInt64(1),
FlushSeconds: ptrFloat64(1),
GraceSeconds: ptrInt64(30),
HttpServer: ptrBool(true),
LogLevel: "info",
Expand Down Expand Up @@ -1372,3 +1372,7 @@ func ptrInt64(v int64) *int64 {
func ptrInt32(v int32) *int32 {
return &v
}

func ptrFloat64(v float64) *float64 {
return &v
}
1 change: 1 addition & 0 deletions apis/fluentbit/v1alpha2/plugins/custom/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.

1 change: 1 addition & 0 deletions apis/fluentbit/v1alpha2/plugins/filter/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.

1 change: 1 addition & 0 deletions apis/fluentbit/v1alpha2/plugins/input/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.

1 change: 1 addition & 0 deletions apis/fluentbit/v1alpha2/plugins/multilineparser/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.

1 change: 1 addition & 0 deletions apis/fluentbit/v1alpha2/plugins/output/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.

1 change: 1 addition & 0 deletions apis/fluentbit/v1alpha2/plugins/parser/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.

1 change: 1 addition & 0 deletions apis/fluentbit/v1alpha2/plugins/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.

3 changes: 2 additions & 1 deletion apis/fluentbit/v1alpha2/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.

1 change: 1 addition & 0 deletions apis/fluentd/v1alpha1/plugins/common/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.

1 change: 1 addition & 0 deletions apis/fluentd/v1alpha1/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.

3 changes: 1 addition & 2 deletions ...ent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,7 @@ spec:
type: string
flushSeconds:
description: Interval to flush output
format: int64
type: integer
type: number
graceSeconds:
description: Wait time on exit
format: int64
Expand Down
3 changes: 1 addition & 2 deletions charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbitconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,7 @@ spec:
type: string
flushSeconds:
description: Interval to flush output
format: int64
type: integer
type: number
graceSeconds:
description: Wait time on exit
format: int64
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,7 @@ spec:
type: string
flushSeconds:
description: Interval to flush output
format: int64
type: integer
type: number
graceSeconds:
description: Wait time on exit
format: int64
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/fluentbit.fluent.io_fluentbitconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,7 @@ spec:
type: string
flushSeconds:
description: Interval to flush output
format: int64
type: integer
type: number
graceSeconds:
description: Wait time on exit
format: int64
Expand Down
2 changes: 1 addition & 1 deletion docs/fluentbit.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ ParserSpec defines the desired state of ClusterParser
| Field | Description | Scheme |
| ----- | ----------- | ------ |
| daemon | If true go to background on start | *bool |
| flushSeconds | Interval to flush output | *int64 |
| flushSeconds | Interval to flush output | *float64 |
| graceSeconds | Wait time on exit | *int64 |
| hcErrorsCount | the error count to meet the unhealthy requirement, this is a sum for all output plugins in a defined HC_Period, example for output error: [2022/02/16 10:44:10] [ warn] [engine] failed to flush chunk '1-1645008245.491540684.flb', retry in 7 seconds: task_id=0, input=forward.1 > output=cloudwatch_logs.3 (out_id=3) | *int64 |
| hcRetryFailureCount | the retry failure count to meet the unhealthy requirement, this is a sum for all output plugins in a defined HC_Period, example for retry failure: [2022/02/16 20:11:36] [ warn] [engine] chunk '1-1645042288.260516436.flb' cannot be retried: task_id=0, input=tcp.3 > output=cloudwatch_logs.1 | *int64 |
Expand Down
4 changes: 4 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,14 @@ require (
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.24.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.34.1 // indirect
Expand All @@ -74,6 +76,8 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.30.1 // indirect
k8s.io/code-generator v0.30.3 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
6 changes: 6 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
Expand Down Expand Up @@ -238,6 +240,10 @@ k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc=
k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k=
k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U=
k8s.io/code-generator v0.30.3 h1:bmtnLJKagDS5f5uOEpLyJiDfIMKXGMKgOLBdde+w0Mc=
k8s.io/code-generator v0.30.3/go.mod h1:PFgBiv+miFV7TZYp+RXgROkhA+sWYZ+mtpbMLofMke8=
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo=
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
Expand Down
2 changes: 1 addition & 1 deletion hack/verify-crds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -o nounset
set -o pipefail

SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
CRD_OPTIONS="crd:generateEmbeddedObjectMeta=true"
CRD_OPTIONS="crd:generateEmbeddedObjectMeta=true,allowDangerousTypes=true"

DIFFROOT="${SCRIPT_ROOT}/config/crd/bases/"
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/config/crd/bases/"
Expand Down
6 changes: 2 additions & 4 deletions manifests/setup/fluent-operator-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1746,8 +1746,7 @@ spec:
type: string
flushSeconds:
description: Interval to flush output
format: int64
type: integer
type: number
graceSeconds:
description: Wait time on exit
format: int64
Expand Down Expand Up @@ -16448,8 +16447,7 @@ spec:
type: string
flushSeconds:
description: Interval to flush output
format: int64
type: integer
type: number
graceSeconds:
description: Wait time on exit
format: int64
Expand Down
6 changes: 2 additions & 4 deletions manifests/setup/setup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1746,8 +1746,7 @@ spec:
type: string
flushSeconds:
description: Interval to flush output
format: int64
type: integer
type: number
graceSeconds:
description: Wait time on exit
format: int64
Expand Down Expand Up @@ -16448,8 +16447,7 @@ spec:
type: string
flushSeconds:
description: Interval to flush output
format: int64
type: integer
type: number
graceSeconds:
description: Wait time on exit
format: int64
Expand Down
Loading