From 27c47566375aad26ca05f66306013d1135d7ba62 Mon Sep 17 00:00:00 2001
From: Jean-Yves <jean-yves.nolen@ubisoft.com>
Date: Fri, 7 Apr 2023 17:02:00 +0200
Subject: [PATCH 01/78] Add influxdb Output

Signed-off-by: Jean-Yves <jynolen+github@gmail.com>
---
 Makefile                                      |   9 +-
 .../v1alpha2/plugins/output/influxdb_types.go | 120 ++++++++++++++++++
 .../plugins/output/influxdb_types_test.go     |  49 +++++++
 .../plugins/output/zz_generated.deepcopy.go   |  55 ++++++++
 go.mod                                        |   7 +
 go.sum                                        |  15 +++
 6 files changed, 253 insertions(+), 2 deletions(-)
 create mode 100644 apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go
 create mode 100644 apis/fluentbit/v1alpha2/plugins/output/influxdb_types_test.go

diff --git a/Makefile b/Makefile
index b70af9c75..2ecf8999e 100644
--- a/Makefile
+++ b/Makefile
@@ -150,6 +150,11 @@ CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 controller-gen: go-deps ## Download controller-gen locally if necessary.
 	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.11.3)
 
+GINKGO = $(shell pwd)/bin/ginkgo
+ginkgo: go-deps ## Download controller-gen locally if necessary.
+	$(call go-get-tool,$(GINKGO),github.com/onsi/ginkgo/ginkgo@v1.16.5)
+
+
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: go-deps ## Download kustomize locally if necessary.
 	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v5@v5.0.0)
@@ -179,10 +184,10 @@ go-deps: # download go dependencies
 docs-update: # update api docs
 	go run ./cmd/doc-gen/main.go
 
-e2e: # make e2e tests
+e2e: ginkgo # make e2e tests
 	chmod a+x tests/scripts/fluentd_e2e.sh && bash tests/scripts/fluentd_e2e.sh
 
-helm-e2e: # make helm e2e tests
+helm-e2e: ginkgo # make helm e2e tests
 	chmod a+x tests/scripts/fluentd_helm_e2e.sh && bash tests/scripts/fluentd_helm_e2e.sh
 
 update-helm-package: # update helm repo
diff --git a/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go b/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go
new file mode 100644
index 000000000..0f2737ba1
--- /dev/null
+++ b/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go
@@ -0,0 +1,120 @@
+package output
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins"
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params"
+)
+
+// +kubebuilder:object:generate:=true
+
+// The influxdb output plugin, allows to flush your records into a InfluxDB time series database. <br />
+// **For full documentation, refer to https://docs.fluentbit.io/manual/pipeline/outputs/influxdb**
+type InfluxDB struct {
+	// IP address or hostname of the target InfluxDB service.
+	// +kubebuilder:validation:Format="hostname"
+	// +kubebuilder:validation:Format="ipv4"
+	// +kubebuilder:validation:Format="ipv6"
+	Host string `json:"host"`
+	// TCP port of the target InfluxDB service.
+	//  +kubebuilder:validation:Maximum=65536
+	//  +kubebuilder:validation:Minimum=0
+	Port *int32 `json:"port,omitempty"`
+	// InfluxDB database name where records will be inserted.
+	Database string `json:"database,omitempty"`
+	// InfluxDB bucket name where records will be inserted - if specified, database is ignored and v2 of API is used
+	Bucket string `json:"bucket,omitempty"`
+	// InfluxDB organization name where the bucket is (v2 only)
+	Org string `json:"org,omitempty"`
+	// The name of the tag whose value is incremented for the consecutive simultaneous events.
+	SequenceTag string `json:"sequenceTag,omitempty"`
+	// Optional username for HTTP Basic Authentication
+	HTTPUser *plugins.Secret `json:"httpUser,omitempty"`
+	// Password for user defined in HTTP_User
+	HTTPPasswd *plugins.Secret `json:"httpPassword,omitempty"`
+	// Authentication token used with InfluDB v2 - if specified, both HTTPUser and HTTPPasswd are ignored
+	HTTPToken *plugins.Secret `json:"httpToken,omitempty"`
+	// List of keys that needs to be tagged
+	TagKeys []string `json:"tagKeys,omitempty"`
+	// Automatically tag keys where value is string.
+	AutoTags *bool `json:"autoTags,omitempty"`
+	// Dynamically tag keys which are in the string array at Tags_List_Key key.
+	TagsListEnabled *bool `json:"tagsListEnabled,omitempty"`
+	// Key of the string array optionally contained within each log record that contains tag keys for that record
+	TagsListKey  string `json:"tagListKey,omitempty"`
+	*plugins.TLS `json:"tls,omitempty"`
+}
+
+// Name implement Section() method
+func (_ *InfluxDB) Name() string {
+	return "influxdb"
+}
+
+func (o *InfluxDB) Params(sl plugins.SecretLoader) (*params.KVs, error) {
+	kvs := params.NewKVs()
+	// InfluxDB Validation
+	if o.HTTPToken != nil {
+
+	}
+	if o.Host != "" {
+		kvs.Insert("Host", o.Host)
+	}
+	if o.Port != nil {
+		kvs.Insert("Port", fmt.Sprint(*o.Port))
+	}
+	if o.Database != "" {
+		kvs.Insert("Database", o.Database)
+	}
+	if o.Bucket != "" {
+		kvs.Insert("Bucket", o.Bucket)
+	}
+	if o.Org != "" {
+		kvs.Insert("Org", o.Org)
+	}
+	if o.SequenceTag != "" {
+		kvs.Insert("Sequence_Tag", o.SequenceTag)
+	}
+	if o.HTTPUser != nil {
+		u, err := sl.LoadSecret(*o.HTTPUser)
+		if err != nil {
+			return nil, err
+		}
+		kvs.Insert("HTTP_User", u)
+	}
+	if o.HTTPPasswd != nil {
+		pwd, err := sl.LoadSecret(*o.HTTPPasswd)
+		if err != nil {
+			return nil, err
+		}
+		kvs.Insert("HTTP_Passwd", pwd)
+	}
+	if o.HTTPToken != nil {
+		pwd, err := sl.LoadSecret(*o.HTTPToken)
+		if err != nil {
+			return nil, err
+		}
+		kvs.Insert("HTTP_Token", pwd)
+	}
+	if o.TagKeys != nil {
+		kvs.Insert("Tag_Keys", strings.Join(o.TagKeys, " "))
+	}
+	if o.AutoTags != nil {
+		kvs.Insert("Auto_Tags", fmt.Sprint(*o.AutoTags))
+	}
+	if o.TagsListEnabled != nil {
+		kvs.Insert("Tags_List_Enabled", fmt.Sprint(*o.TagsListEnabled))
+	}
+	if o.TagsListKey != "" {
+		kvs.Insert("Tags_List_Key", o.TagsListKey)
+	}
+	if o.TLS != nil {
+		tls, err := o.TLS.Params(sl)
+		if err != nil {
+			return nil, err
+		}
+		kvs.Merge(tls)
+	}
+	return kvs, nil
+}
diff --git a/apis/fluentbit/v1alpha2/plugins/output/influxdb_types_test.go b/apis/fluentbit/v1alpha2/plugins/output/influxdb_types_test.go
new file mode 100644
index 000000000..c0e925480
--- /dev/null
+++ b/apis/fluentbit/v1alpha2/plugins/output/influxdb_types_test.go
@@ -0,0 +1,49 @@
+package output
+
+import (
+	"testing"
+
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins"
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params"
+	. "github.com/onsi/gomega"
+)
+
+func ptrAny[T any](obj T) *T {
+	return &obj
+}
+
+func TestOutput_InfluxDB_Params(t *testing.T) {
+	g := NewGomegaWithT(t)
+
+	sl := plugins.NewSecretLoader(nil, "test namespace")
+
+	dd := InfluxDB{
+		Host:            "127.0.0.1",
+		Port:            ptrAny(int32(8086)),
+		Database:        "fluentbit",
+		Bucket:          "buck",
+		Org:             "orgnis",
+		SequenceTag:     "_inc",
+		TagKeys:         []string{"foo", "bar", "foo:bar"},
+		AutoTags:        ptrAny(false),
+		TagsListEnabled: ptrAny(true),
+		TagsListKey:     "taglist_key",
+	}
+
+	expected := params.NewKVs()
+	expected.Insert("Host", "127.0.0.1")
+	expected.Insert("Port", "8086")
+	expected.Insert("Database", "fluentbit")
+	expected.Insert("Bucket", "buck")
+	expected.Insert("Org", "orgnis")
+	expected.Insert("Sequence_Tag", "_inc")
+	expected.Insert("Tag_Keys", "foo bar foo:bar")
+	expected.Insert("Auto_Tags", "false")
+	expected.Insert("Tags_List_Enabled", "true")
+	expected.Insert("Tags_List_Key", "taglist_key")
+
+	kvs, err := dd.Params(sl)
+	g.Expect(err).NotTo(HaveOccurred())
+	g.Expect(kvs).To(Equal(expected))
+
+}
diff --git a/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
index 359c9c782..d4a6544f5 100644
--- a/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
+++ b/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
@@ -392,6 +392,61 @@ func (in *HTTP) DeepCopy() *HTTP {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *InfluxDB) DeepCopyInto(out *InfluxDB) {
+	*out = *in
+	if in.Port != nil {
+		in, out := &in.Port, &out.Port
+		*out = new(int32)
+		**out = **in
+	}
+	if in.HTTPUser != nil {
+		in, out := &in.HTTPUser, &out.HTTPUser
+		*out = new(plugins.Secret)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.HTTPPasswd != nil {
+		in, out := &in.HTTPPasswd, &out.HTTPPasswd
+		*out = new(plugins.Secret)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.HTTPToken != nil {
+		in, out := &in.HTTPToken, &out.HTTPToken
+		*out = new(plugins.Secret)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.TagKeys != nil {
+		in, out := &in.TagKeys, &out.TagKeys
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
+	if in.AutoTags != nil {
+		in, out := &in.AutoTags, &out.AutoTags
+		*out = new(bool)
+		**out = **in
+	}
+	if in.TagsListEnabled != nil {
+		in, out := &in.TagsListEnabled, &out.TagsListEnabled
+		*out = new(bool)
+		**out = **in
+	}
+	if in.TLS != nil {
+		in, out := &in.TLS, &out.TLS
+		*out = new(plugins.TLS)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InfluxDB.
+func (in *InfluxDB) DeepCopy() *InfluxDB {
+	if in == nil {
+		return nil
+	}
+	out := new(InfluxDB)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Kafka) DeepCopyInto(out *Kafka) {
 	*out = *in
diff --git a/go.mod b/go.mod
index b1594e570..a6cbcc4b8 100644
--- a/go.mod
+++ b/go.mod
@@ -32,12 +32,14 @@ require (
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.20.0 // indirect
 	github.com/go-openapi/swag v0.19.14 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/google/uuid v1.1.2 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
@@ -48,6 +50,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/onsi/ginkgo/v2 v2.9.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
@@ -57,12 +60,14 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
 	golang.org/x/sys v0.6.0 // indirect
 	golang.org/x/term v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.7.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
@@ -71,7 +76,9 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
+	k8s.io/code-generator v0.26.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
+	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
 	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
 	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
diff --git a/go.sum b/go.sum
index 9928ec35f..f6e327ec8 100644
--- a/go.sum
+++ b/go.sum
@@ -89,6 +89,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -108,6 +109,7 @@ github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@@ -170,6 +172,7 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -179,6 +182,7 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
@@ -237,6 +241,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
+github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
@@ -345,6 +350,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 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.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
+golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -499,6 +506,7 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -509,6 +517,7 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -635,8 +644,13 @@ k8s.io/apimachinery v0.26.3 h1:dQx6PNETJ7nODU3XPtrwkfuubs6w7sX0M8n61zHIV/k=
 k8s.io/apimachinery v0.26.3/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
 k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
 k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
+k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo=
+k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I=
 k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
 k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
+k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
 k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
@@ -652,5 +666,6 @@ sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN
 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

From edec16e358ede3c5256befa8254da45cd0b1a916 Mon Sep 17 00:00:00 2001
From: Jean-Yves <jean-yves.nolen@ubisoft.com>
Date: Fri, 7 Apr 2023 17:10:07 +0200
Subject: [PATCH 02/78] Add InfluxDB to Output Filters

Signed-off-by: Jean-Yves <jynolen+github@gmail.com>
---
 apis/fluentbit/v1alpha2/clusteroutput_types.go           | 3 +++
 apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apis/fluentbit/v1alpha2/clusteroutput_types.go b/apis/fluentbit/v1alpha2/clusteroutput_types.go
index 19b913391..b8a138584 100644
--- a/apis/fluentbit/v1alpha2/clusteroutput_types.go
+++ b/apis/fluentbit/v1alpha2/clusteroutput_types.go
@@ -72,6 +72,8 @@ type OutputSpec struct {
 	Loki *output.Loki `json:"loki,omitempty"`
 	// Syslog defines Syslog Output configuration.
 	Syslog *output.Syslog `json:"syslog,omitempty"`
+	// InfluxDB defines InfluxDB Output configuration.
+	InfluxDB *output.InfluxDB `json:"influxDB,omitempty"`
 	// DataDog defines DataDog Output configuration.
 	DataDog *output.DataDog `json:"datadog,omitempty"`
 	// Firehose defines Firehose Output configuration.
@@ -86,6 +88,7 @@ type OutputSpec struct {
 	OpenTelemetry *output.OpenTelemetry `json:"opentelemetry,omitempty"`
 	// PrometheusRemoteWrite_types defines Prometheus Remote Write configuration.
 	PrometheusRemoteWrite *output.PrometheusRemoteWrite `json:"prometheusRemoteWrite,omitempty"`
+
 	// CustomPlugin defines Custom Output configuration.
 	CustomPlugin *custom.CustomPlugin `json:"customPlugin,omitempty"`
 }
diff --git a/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go b/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go
index 0f2737ba1..2e8903ca8 100644
--- a/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go
+++ b/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go
@@ -34,7 +34,7 @@ type InfluxDB struct {
 	HTTPUser *plugins.Secret `json:"httpUser,omitempty"`
 	// Password for user defined in HTTP_User
 	HTTPPasswd *plugins.Secret `json:"httpPassword,omitempty"`
-	// Authentication token used with InfluDB v2 - if specified, both HTTPUser and HTTPPasswd are ignored
+	// Authentication token used with InfluxDB v2 - if specified, both HTTPUser and HTTPPasswd are ignored
 	HTTPToken *plugins.Secret `json:"httpToken,omitempty"`
 	// List of keys that needs to be tagged
 	TagKeys []string `json:"tagKeys,omitempty"`

From c14639929cbec365559d4eec7637319d82fe20b6 Mon Sep 17 00:00:00 2001
From: adiforluls <aditya.b.bharadwaj@oracle.com>
Date: Sun, 9 Apr 2023 00:58:34 +0530
Subject: [PATCH 03/78] fix rewrite_tag match rule and trim start of string
 pattern

Signed-off-by: adiforluls <aditya.b.bharadwaj@oracle.com>
---
 controllers/fluentbitconfig_controller.go | 6 ++++++
 pkg/utils/utils.go                        | 1 +
 2 files changed, 7 insertions(+)

diff --git a/controllers/fluentbitconfig_controller.go b/controllers/fluentbitconfig_controller.go
index 93f2b4511..f47121e7d 100644
--- a/controllers/fluentbitconfig_controller.go
+++ b/controllers/fluentbitconfig_controller.go
@@ -286,6 +286,12 @@ func (r *FluentBitConfigReconciler) generateRewriteTagConfig(cfg fluentbitv1alph
 			continue
 		}
 		tag = input.Spec.Tail.Tag
+		idx := strings.Index(tag, ".")
+		if idx == -1 {
+			tag = ""
+		} else {
+			tag = tag[:idx+1] + "*"
+		}
 	}
 	if tag == "" {
 		return ""
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
index 188498973..105edb33b 100644
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -50,5 +50,6 @@ func GenerateNamespacedMatchExpr(namespace string, match string) string {
 }
 
 func GenerateNamespacedMatchRegExpr(namespace string, matchRegex string) string {
+	matchRegex = strings.TrimPrefix(matchRegex, "^")
 	return fmt.Sprintf("^%x\\.%s", md5.Sum([]byte(namespace)), matchRegex)
 }

From a69991d645b55f2a56021f5846145b8b088d39c3 Mon Sep 17 00:00:00 2001
From: Jean-Yves NOLEN <jynolen+github@gmail.com>
Date: Wed, 12 Apr 2023 04:56:19 +0200
Subject: [PATCH 04/78] Fix/missing log level (#691)

* release 2.2.0

Signed-off-by: dehaocheng <dehaocheng@kubesphere.io>
Signed-off-by: Jean-Yves <jynolen+github@gmail.com>

* Add missing Log_Level

Signed-off-by: Jean-Yves <jynolen+github@gmail.com>

---------

Signed-off-by: dehaocheng <dehaocheng@kubesphere.io>
Signed-off-by: Jean-Yves <jynolen+github@gmail.com>
Co-authored-by: dehaocheng <dehaocheng@kubesphere.io>
---
 .../fluentbit/v1alpha2/clusterfilter_types.go |  5 ++
 .../v1alpha2/clusterfluentbitconfig_types.go  |  2 +-
 apis/fluentbit/v1alpha2/clusterinput_types.go |  5 ++
 .../fluentbit/v1alpha2/clusteroutput_types.go |  7 +++
 .../fluentbit.fluent.io_clusterfilters.yaml   |  9 ++++
 ...bit.fluent.io_clusterfluentbitconfigs.yaml |  1 +
 .../fluentbit.fluent.io_clusterinputs.yaml    |  9 ++++
 .../fluentbit.fluent.io_clusteroutputs.yaml   | 12 +++++
 .../crds/fluentbit.fluent.io_filters.yaml     |  9 ++++
 .../crds/fluentbit.fluent.io_outputs.yaml     | 12 +++++
 .../fluentbit.fluent.io_clusterfilters.yaml   |  9 ++++
 ...bit.fluent.io_clusterfluentbitconfigs.yaml |  1 +
 .../fluentbit.fluent.io_clusterinputs.yaml    |  9 ++++
 .../fluentbit.fluent.io_clusteroutputs.yaml   | 12 +++++
 .../bases/fluentbit.fluent.io_filters.yaml    |  9 ++++
 .../bases/fluentbit.fluent.io_outputs.yaml    | 12 +++++
 manifests/setup/fluent-operator-crd.yaml      | 52 +++++++++++++++++++
 manifests/setup/setup.yaml                    | 52 +++++++++++++++++++
 18 files changed, 226 insertions(+), 1 deletion(-)

diff --git a/apis/fluentbit/v1alpha2/clusterfilter_types.go b/apis/fluentbit/v1alpha2/clusterfilter_types.go
index 4cc5ffa56..d9ef6843c 100644
--- a/apis/fluentbit/v1alpha2/clusterfilter_types.go
+++ b/apis/fluentbit/v1alpha2/clusterfilter_types.go
@@ -40,6 +40,8 @@ type FilterSpec struct {
 	// A regular expression to match against the tags of incoming records.
 	// Use this option if you want to use the full regex syntax.
 	MatchRegex string `json:"matchRegex,omitempty"`
+	// +kubebuilder:validation:Enum:=off;error;warning;info;debug;trace
+	LogLevel string `json:"logLevel,omitempty"`
 	// A set of filter plugins in order.
 	FilterItems []FilterItem `json:"filters,omitempty"`
 }
@@ -117,6 +119,9 @@ func (list ClusterFilterList) Load(sl plugins.SecretLoader) (string, error) {
 			if p.Name() != "" {
 				buf.WriteString(fmt.Sprintf("    Name    %s\n", p.Name()))
 			}
+			if item.Spec.LogLevel != "" {
+				buf.WriteString(fmt.Sprintf("    Log_Level    %s\n", item.Spec.LogLevel))
+			}
 			if item.Spec.Match != "" {
 				buf.WriteString(fmt.Sprintf("    Match    %s\n", item.Spec.Match))
 			}
diff --git a/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go b/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go
index 743852d9c..2740cd9ea 100644
--- a/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go
+++ b/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go
@@ -76,7 +76,7 @@ type Service struct {
 	// File to log diagnostic output
 	LogFile string `json:"logFile,omitempty"`
 	// Diagnostic level (error/warning/info/debug/trace)
-	// +kubebuilder:validation:Enum:=error;warning;info;debug;trace
+	// +kubebuilder:validation:Enum:=off;error;warning;info;debug;trace
 	LogLevel string `json:"logLevel,omitempty"`
 	// Optional 'parsers' config file (can be multiple)
 	ParsersFile string `json:"parsersFile,omitempty"`
diff --git a/apis/fluentbit/v1alpha2/clusterinput_types.go b/apis/fluentbit/v1alpha2/clusterinput_types.go
index b234d62a7..7112a2e69 100644
--- a/apis/fluentbit/v1alpha2/clusterinput_types.go
+++ b/apis/fluentbit/v1alpha2/clusterinput_types.go
@@ -37,6 +37,8 @@ type InputSpec struct {
 	// A user friendly alias name for this input plugin.
 	// Used in metrics for distinction of each configured input.
 	Alias string `json:"alias,omitempty"`
+	// +kubebuilder:validation:Enum:=off;error;warning;info;debug;trace
+	LogLevel string `json:"logLevel,omitempty"`
 	// Dummy defines Dummy Input configuration.
 	Dummy *input.Dummy `json:"dummy,omitempty"`
 	// Tail defines Tail Input configuration.
@@ -101,6 +103,9 @@ func (list ClusterInputList) Load(sl plugins.SecretLoader) (string, error) {
 			if item.Spec.Alias != "" {
 				buf.WriteString(fmt.Sprintf("    Alias    %s\n", item.Spec.Alias))
 			}
+			if item.Spec.LogLevel != "" {
+				buf.WriteString(fmt.Sprintf("    Log_Level    %s\n", item.Spec.LogLevel))
+			}
 			kvs, err := p.Params(sl)
 			if err != nil {
 				return err
diff --git a/apis/fluentbit/v1alpha2/clusteroutput_types.go b/apis/fluentbit/v1alpha2/clusteroutput_types.go
index b8a138584..1d2e30d81 100644
--- a/apis/fluentbit/v1alpha2/clusteroutput_types.go
+++ b/apis/fluentbit/v1alpha2/clusteroutput_types.go
@@ -43,6 +43,10 @@ type OutputSpec struct {
 	// A user friendly alias name for this output plugin.
 	// Used in metrics for distinction of each configured output.
 	Alias string `json:"alias,omitempty"`
+	// Set the plugin's logging verbosity level. Allowed values are: off, error, warn, info, debug and trace, Defaults to the SERVICE section's Log_Level
+	// +kubebuilder:validation:Enum:=off;error;warning;info;debug;trace
+	LogLevel string `json:"logLevel,omitempty"`
+
 	// AzureBlob defines AzureBlob Output Configuration
 	AzureBlob *output.AzureBlob `json:"azureBlob,omitempty"`
 	// AzureLogAnalytics defines AzureLogAnalytics Output Configuration
@@ -142,6 +146,9 @@ func (list ClusterOutputList) Load(sl plugins.SecretLoader) (string, error) {
 			if item.Spec.Match != "" {
 				buf.WriteString(fmt.Sprintf("    Match    %s\n", item.Spec.Match))
 			}
+			if item.Spec.LogLevel != "" {
+				buf.WriteString(fmt.Sprintf("    Log_Level    %s\n", item.Spec.LogLevel))
+			}
 			if item.Spec.MatchRegex != "" {
 				buf.WriteString(fmt.Sprintf("    Match_Regex    %s\n", item.Spec.MatchRegex))
 			}
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml
index 647cdfefe..38064b4a6 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfilters.yaml
@@ -703,6 +703,15 @@ spec:
                       type: object
                   type: object
                 type: array
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               match:
                 description: A pattern to match against the tags of incoming records.
                   It's case-sensitive and support the star (*) character as a wildcard.
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
index cffdbe35f..43c89effe 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
@@ -287,6 +287,7 @@ spec:
                   logLevel:
                     description: Diagnostic level (error/warning/info/debug/trace)
                     enum:
+                    - "off"
                     - error
                     - warning
                     - info
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml
index d76be3455..fdf86612b 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml
@@ -80,6 +80,15 @@ spec:
                   tag:
                     type: string
                 type: object
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               nodeExporterMetrics:
                 description: NodeExporterMetrics defines Node Exporter Metrics Input
                   configuration.
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
index d40d3dc2d..b35ee1b7b 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
@@ -1098,6 +1098,18 @@ spec:
                       will be used.
                     type: string
                 type: object
+              logLevel:
+                description: 'Set the plugin''s logging verbosity level. Allowed values
+                  are: off, error, warn, info, debug and trace, Defaults to the SERVICE
+                  section''s Log_Level'
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               loki:
                 description: Loki defines Loki Output configuration.
                 properties:
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_filters.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_filters.yaml
index 46bc7ef73..f84c8b4d2 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_filters.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_filters.yaml
@@ -703,6 +703,15 @@ spec:
                       type: object
                   type: object
                 type: array
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               match:
                 description: A pattern to match against the tags of incoming records.
                   It's case-sensitive and support the star (*) character as a wildcard.
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
index 9b2b0e6b6..1f10d256f 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
@@ -1098,6 +1098,18 @@ spec:
                       will be used.
                     type: string
                 type: object
+              logLevel:
+                description: 'Set the plugin''s logging verbosity level. Allowed values
+                  are: off, error, warn, info, debug and trace, Defaults to the SERVICE
+                  section''s Log_Level'
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               loki:
                 description: Loki defines Loki Output configuration.
                 properties:
diff --git a/config/crd/bases/fluentbit.fluent.io_clusterfilters.yaml b/config/crd/bases/fluentbit.fluent.io_clusterfilters.yaml
index 647cdfefe..38064b4a6 100644
--- a/config/crd/bases/fluentbit.fluent.io_clusterfilters.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_clusterfilters.yaml
@@ -703,6 +703,15 @@ spec:
                       type: object
                   type: object
                 type: array
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               match:
                 description: A pattern to match against the tags of incoming records.
                   It's case-sensitive and support the star (*) character as a wildcard.
diff --git a/config/crd/bases/fluentbit.fluent.io_clusterfluentbitconfigs.yaml b/config/crd/bases/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
index cffdbe35f..43c89effe 100644
--- a/config/crd/bases/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
@@ -287,6 +287,7 @@ spec:
                   logLevel:
                     description: Diagnostic level (error/warning/info/debug/trace)
                     enum:
+                    - "off"
                     - error
                     - warning
                     - info
diff --git a/config/crd/bases/fluentbit.fluent.io_clusterinputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusterinputs.yaml
index d76be3455..fdf86612b 100644
--- a/config/crd/bases/fluentbit.fluent.io_clusterinputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_clusterinputs.yaml
@@ -80,6 +80,15 @@ spec:
                   tag:
                     type: string
                 type: object
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               nodeExporterMetrics:
                 description: NodeExporterMetrics defines Node Exporter Metrics Input
                   configuration.
diff --git a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
index d40d3dc2d..b35ee1b7b 100644
--- a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
@@ -1098,6 +1098,18 @@ spec:
                       will be used.
                     type: string
                 type: object
+              logLevel:
+                description: 'Set the plugin''s logging verbosity level. Allowed values
+                  are: off, error, warn, info, debug and trace, Defaults to the SERVICE
+                  section''s Log_Level'
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               loki:
                 description: Loki defines Loki Output configuration.
                 properties:
diff --git a/config/crd/bases/fluentbit.fluent.io_filters.yaml b/config/crd/bases/fluentbit.fluent.io_filters.yaml
index 46bc7ef73..f84c8b4d2 100644
--- a/config/crd/bases/fluentbit.fluent.io_filters.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_filters.yaml
@@ -703,6 +703,15 @@ spec:
                       type: object
                   type: object
                 type: array
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               match:
                 description: A pattern to match against the tags of incoming records.
                   It's case-sensitive and support the star (*) character as a wildcard.
diff --git a/config/crd/bases/fluentbit.fluent.io_outputs.yaml b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
index 9b2b0e6b6..1f10d256f 100644
--- a/config/crd/bases/fluentbit.fluent.io_outputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
@@ -1098,6 +1098,18 @@ spec:
                       will be used.
                     type: string
                 type: object
+              logLevel:
+                description: 'Set the plugin''s logging verbosity level. Allowed values
+                  are: off, error, warn, info, debug and trace, Defaults to the SERVICE
+                  section''s Log_Level'
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               loki:
                 description: Loki defines Loki Output configuration.
                 properties:
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index a2842c895..bf089e808 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -701,6 +701,15 @@ spec:
                       type: object
                   type: object
                 type: array
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               match:
                 description: A pattern to match against the tags of incoming records.
                   It's case-sensitive and support the star (*) character as a wildcard.
@@ -1440,6 +1449,7 @@ spec:
                   logLevel:
                     description: Diagnostic level (error/warning/info/debug/trace)
                     enum:
+                    - "off"
                     - error
                     - warning
                     - info
@@ -1717,6 +1727,15 @@ spec:
                   tag:
                     type: string
                 type: object
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               nodeExporterMetrics:
                 description: NodeExporterMetrics defines Node Exporter Metrics Input
                   configuration.
@@ -3089,6 +3108,18 @@ spec:
                       will be used.
                     type: string
                 type: object
+              logLevel:
+                description: 'Set the plugin''s logging verbosity level. Allowed values
+                  are: off, error, warn, info, debug and trace, Defaults to the SERVICE
+                  section''s Log_Level'
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               loki:
                 description: Loki defines Loki Output configuration.
                 properties:
@@ -10227,6 +10258,15 @@ spec:
                       type: object
                   type: object
                 type: array
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               match:
                 description: A pattern to match against the tags of incoming records.
                   It's case-sensitive and support the star (*) character as a wildcard.
@@ -22350,6 +22390,18 @@ spec:
                       will be used.
                     type: string
                 type: object
+              logLevel:
+                description: 'Set the plugin''s logging verbosity level. Allowed values
+                  are: off, error, warn, info, debug and trace, Defaults to the SERVICE
+                  section''s Log_Level'
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               loki:
                 description: Loki defines Loki Output configuration.
                 properties:
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index db33e08e3..39b27fcee 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -701,6 +701,15 @@ spec:
                       type: object
                   type: object
                 type: array
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               match:
                 description: A pattern to match against the tags of incoming records.
                   It's case-sensitive and support the star (*) character as a wildcard.
@@ -1440,6 +1449,7 @@ spec:
                   logLevel:
                     description: Diagnostic level (error/warning/info/debug/trace)
                     enum:
+                    - "off"
                     - error
                     - warning
                     - info
@@ -1717,6 +1727,15 @@ spec:
                   tag:
                     type: string
                 type: object
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               nodeExporterMetrics:
                 description: NodeExporterMetrics defines Node Exporter Metrics Input
                   configuration.
@@ -3089,6 +3108,18 @@ spec:
                       will be used.
                     type: string
                 type: object
+              logLevel:
+                description: 'Set the plugin''s logging verbosity level. Allowed values
+                  are: off, error, warn, info, debug and trace, Defaults to the SERVICE
+                  section''s Log_Level'
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               loki:
                 description: Loki defines Loki Output configuration.
                 properties:
@@ -10227,6 +10258,15 @@ spec:
                       type: object
                   type: object
                 type: array
+              logLevel:
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               match:
                 description: A pattern to match against the tags of incoming records.
                   It's case-sensitive and support the star (*) character as a wildcard.
@@ -22350,6 +22390,18 @@ spec:
                       will be used.
                     type: string
                 type: object
+              logLevel:
+                description: 'Set the plugin''s logging verbosity level. Allowed values
+                  are: off, error, warn, info, debug and trace, Defaults to the SERVICE
+                  section''s Log_Level'
+                enum:
+                - "off"
+                - error
+                - warning
+                - info
+                - debug
+                - trace
+                type: string
               loki:
                 description: Loki defines Loki Output configuration.
                 properties:

From a6ecadf59d4e45c886369d5b2e70c326abb37b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Nov=C3=A1k?= <tomas.novak@bcas.cz>
Date: Wed, 12 Apr 2023 13:35:43 +0000
Subject: [PATCH 05/78] Add EnvVars support to FluentD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomáš Novák <tomas.novak@bcas.cz>
---
 apis/fluentd/v1alpha1/fluentd_types.go        |   2 +
 .../fluentd/v1alpha1/zz_generated.deepcopy.go |   7 ++
 .../crds/fluentd.fluent.io_fluentds.yaml      | 110 ++++++++++++++++++
 .../crd/bases/fluentd.fluent.io_fluentds.yaml | 110 ++++++++++++++++++
 docs/fluentd.md                               |   1 +
 pkg/operator/sts.go                           |   4 +
 6 files changed, 234 insertions(+)

diff --git a/apis/fluentd/v1alpha1/fluentd_types.go b/apis/fluentd/v1alpha1/fluentd_types.go
index 0232a3070..3a6895e8b 100644
--- a/apis/fluentd/v1alpha1/fluentd_types.go
+++ b/apis/fluentd/v1alpha1/fluentd_types.go
@@ -46,6 +46,8 @@ type FluentdSpec struct {
 	Image string `json:"image,omitempty"`
 	// Fluentd Watcher command line arguments.
 	Args []string `json:"args,omitempty"`
+	// EnvVars represent environment variables that can be passed to fluentd pods.
+	EnvVars []corev1.EnvVar `json:"envVars,omitempty"`
 	// FluentdCfgSelector defines the selectors to select the fluentd config CRs.
 	FluentdCfgSelector metav1.LabelSelector `json:"fluentdCfgSelector,omitempty"`
 	// Buffer definition
diff --git a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
index d4195a81e..10fa41657 100644
--- a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
@@ -709,6 +709,13 @@ func (in *FluentdSpec) DeepCopyInto(out *FluentdSpec) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
+	if in.EnvVars != nil {
+		in, out := &in.EnvVars, &out.EnvVars
+		*out = make([]corev1.EnvVar, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
 	in.FluentdCfgSelector.DeepCopyInto(&out.FluentdCfgSelector)
 	if in.BufferVolume != nil {
 		in, out := &in.BufferVolume, &out.BufferVolume
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
index 972055ed4..46be7bca3 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
@@ -870,6 +870,116 @@ spec:
                 items:
                   type: string
                 type: array
+              envVars:
+                description: EnvVars represent environment variables that can be passed
+                  to fluentd pods.
+                items:
+                  description: EnvVar represents an environment variable present in
+                    a Container.
+                  properties:
+                    name:
+                      description: Name of the environment variable. Must be a C_IDENTIFIER.
+                      type: string
+                    value:
+                      description: 'Variable references $(VAR_NAME) are expanded using
+                        the previously defined environment variables in the container
+                        and any service environment variables. If a variable cannot
+                        be resolved, the reference in the input string will be unchanged.
+                        Double $$ are reduced to a single $, which allows for escaping
+                        the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the
+                        string literal "$(VAR_NAME)". Escaped references will never
+                        be expanded, regardless of whether the variable exists or
+                        not. Defaults to "".'
+                      type: string
+                    valueFrom:
+                      description: Source for the environment variable's value. Cannot
+                        be used if value is not empty.
+                      properties:
+                        configMapKeyRef:
+                          description: Selects a key of a ConfigMap.
+                          properties:
+                            key:
+                              description: The key to select.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the ConfigMap or its key
+                                must be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        fieldRef:
+                          description: 'Selects a field of the pod: supports metadata.name,
+                            metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
+                            spec.nodeName, spec.serviceAccountName, status.hostIP,
+                            status.podIP, status.podIPs.'
+                          properties:
+                            apiVersion:
+                              description: Version of the schema the FieldPath is
+                                written in terms of, defaults to "v1".
+                              type: string
+                            fieldPath:
+                              description: Path of the field to select in the specified
+                                API version.
+                              type: string
+                          required:
+                          - fieldPath
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        resourceFieldRef:
+                          description: 'Selects a resource of the container: only
+                            resources limits and requests (limits.cpu, limits.memory,
+                            limits.ephemeral-storage, requests.cpu, requests.memory
+                            and requests.ephemeral-storage) are currently supported.'
+                          properties:
+                            containerName:
+                              description: 'Container name: required for volumes,
+                                optional for env vars'
+                              type: string
+                            divisor:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Specifies the output format of the exposed
+                                resources, defaults to "1"
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            resource:
+                              description: 'Required: resource to select'
+                              type: string
+                          required:
+                          - resource
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        secretKeyRef:
+                          description: Selects a key of a secret in the pod's namespace
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                  required:
+                  - name
+                  type: object
+                type: array
               buffer:
                 description: Buffer definition
                 properties:
diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
index 972055ed4..46be7bca3 100644
--- a/config/crd/bases/fluentd.fluent.io_fluentds.yaml
+++ b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
@@ -870,6 +870,116 @@ spec:
                 items:
                   type: string
                 type: array
+              envVars:
+                description: EnvVars represent environment variables that can be passed
+                  to fluentd pods.
+                items:
+                  description: EnvVar represents an environment variable present in
+                    a Container.
+                  properties:
+                    name:
+                      description: Name of the environment variable. Must be a C_IDENTIFIER.
+                      type: string
+                    value:
+                      description: 'Variable references $(VAR_NAME) are expanded using
+                        the previously defined environment variables in the container
+                        and any service environment variables. If a variable cannot
+                        be resolved, the reference in the input string will be unchanged.
+                        Double $$ are reduced to a single $, which allows for escaping
+                        the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the
+                        string literal "$(VAR_NAME)". Escaped references will never
+                        be expanded, regardless of whether the variable exists or
+                        not. Defaults to "".'
+                      type: string
+                    valueFrom:
+                      description: Source for the environment variable's value. Cannot
+                        be used if value is not empty.
+                      properties:
+                        configMapKeyRef:
+                          description: Selects a key of a ConfigMap.
+                          properties:
+                            key:
+                              description: The key to select.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the ConfigMap or its key
+                                must be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        fieldRef:
+                          description: 'Selects a field of the pod: supports metadata.name,
+                            metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
+                            spec.nodeName, spec.serviceAccountName, status.hostIP,
+                            status.podIP, status.podIPs.'
+                          properties:
+                            apiVersion:
+                              description: Version of the schema the FieldPath is
+                                written in terms of, defaults to "v1".
+                              type: string
+                            fieldPath:
+                              description: Path of the field to select in the specified
+                                API version.
+                              type: string
+                          required:
+                          - fieldPath
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        resourceFieldRef:
+                          description: 'Selects a resource of the container: only
+                            resources limits and requests (limits.cpu, limits.memory,
+                            limits.ephemeral-storage, requests.cpu, requests.memory
+                            and requests.ephemeral-storage) are currently supported.'
+                          properties:
+                            containerName:
+                              description: 'Container name: required for volumes,
+                                optional for env vars'
+                              type: string
+                            divisor:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Specifies the output format of the exposed
+                                resources, defaults to "1"
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            resource:
+                              description: 'Required: resource to select'
+                              type: string
+                          required:
+                          - resource
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        secretKeyRef:
+                          description: Selects a key of a secret in the pod's namespace
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                  required:
+                  - name
+                  type: object
+                type: array
               buffer:
                 description: Buffer definition
                 properties:
diff --git a/docs/fluentd.md b/docs/fluentd.md
index 03043bad2..a212a0170 100644
--- a/docs/fluentd.md
+++ b/docs/fluentd.md
@@ -291,6 +291,7 @@ FluentdSpec defines the desired state of Fluentd
 | workers | Numbers of the workers in Fluentd instance | *int32 |
 | image | Fluentd image. | string |
 | args | Fluentd Watcher command line arguments. | []string |
+| envVars | EnvVars represent environment variables that can be passed to fluentd pods. | []corev1.EnvVar |
 | fluentdCfgSelector | FluentdCfgSelector defines the selectors to select the fluentd config CRs. | [metav1.LabelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#labelselector-v1-meta) |
 | buffer | Buffer definition | *BufferVolume |
 | imagePullPolicy | Fluentd image pull policy. | corev1.PullPolicy |
diff --git a/pkg/operator/sts.go b/pkg/operator/sts.go
index 4ff99c02b..b74829d0d 100644
--- a/pkg/operator/sts.go
+++ b/pkg/operator/sts.go
@@ -132,6 +132,10 @@ func MakeStatefulset(fd fluentdv1alpha1.Fluentd) *appsv1.StatefulSet {
 		sts.Spec.VolumeClaimTemplates = append(sts.Spec.VolumeClaimTemplates, fd.Spec.VolumeClaimTemplates...)
 	}
 
+	if fd.Spec.EnvVars != nil {
+		sts.Spec.Template.Spec.Containers[0].Env = append(sts.Spec.Template.Spec.Containers[0].Env, fd.Spec.EnvVars...)
+	}
+
 	// Mount host or emptydir VolumeSource
 	if fd.Spec.BufferVolume != nil && !fd.Spec.BufferVolume.DisableBufferVolume {
 		bufferVolName := fmt.Sprintf("%s-buffer", fd.Name)

From 34a1bfe3f50ab0c2a7bdce534d1d1124c4bc551f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Nov=C3=A1k?= <tomas.novak@bcas.cz>
Date: Wed, 12 Apr 2023 14:01:45 +0000
Subject: [PATCH 06/78] Add Pod Annotations support to FluentD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomáš Novák <tomas.novak@bcas.cz>
---
 apis/fluentd/v1alpha1/fluentd_types.go             |  2 ++
 apis/fluentd/v1alpha1/zz_generated.deepcopy.go     |  7 +++++++
 .../crds/fluentd.fluent.io_fluentds.yaml           |  5 +++++
 config/crd/bases/fluentd.fluent.io_fluentds.yaml   |  5 +++++
 docs/fluentd.md                                    |  1 +
 pkg/operator/sts.go                                | 14 ++++++++------
 6 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/apis/fluentd/v1alpha1/fluentd_types.go b/apis/fluentd/v1alpha1/fluentd_types.go
index 0232a3070..86d88354e 100644
--- a/apis/fluentd/v1alpha1/fluentd_types.go
+++ b/apis/fluentd/v1alpha1/fluentd_types.go
@@ -58,6 +58,8 @@ type FluentdSpec struct {
 	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
 	// NodeSelector
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+	// Annotations to add to each Fluentd pod.
+	Annotations map[string]string `json:"annotations,omitempty"`
 	// Annotations to add to the Fluentd service account
 	ServiceAccountAnnotations map[string]string `json:"serviceAccountAnnotations,omitempty"`
 	// Pod's scheduling constraints.
diff --git a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
index d4195a81e..a4154fb0c 100644
--- a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
@@ -728,6 +728,13 @@ func (in *FluentdSpec) DeepCopyInto(out *FluentdSpec) {
 			(*out)[key] = val
 		}
 	}
+	if in.Annotations != nil {
+		in, out := &in.Annotations, &out.Annotations
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
 	if in.ServiceAccountAnnotations != nil {
 		in, out := &in.ServiceAccountAnnotations, &out.ServiceAccountAnnotations
 		*out = make(map[string]string, len(*in))
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
index 972055ed4..3e7da0a17 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
@@ -865,6 +865,11 @@ spec:
                         type: array
                     type: object
                 type: object
+              annotations:
+                additionalProperties:
+                  type: string
+                description: Annotations to add to each Fluentd pod.
+                type: objects
               args:
                 description: Fluentd Watcher command line arguments.
                 items:
diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
index 972055ed4..710c7629e 100644
--- a/config/crd/bases/fluentd.fluent.io_fluentds.yaml
+++ b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
@@ -865,6 +865,11 @@ spec:
                         type: array
                     type: object
                 type: object
+              annotations:
+                additionalProperties:
+                  type: string
+                description: Annotations to add to each Fluentd pod.
+                type: object
               args:
                 description: Fluentd Watcher command line arguments.
                 items:
diff --git a/docs/fluentd.md b/docs/fluentd.md
index 03043bad2..daf3c7f4a 100644
--- a/docs/fluentd.md
+++ b/docs/fluentd.md
@@ -297,6 +297,7 @@ FluentdSpec defines the desired state of Fluentd
 | imagePullSecrets | Fluentd image pull secret | []corev1.LocalObjectReference |
 | resources | Compute Resources required by container. | corev1.ResourceRequirements |
 | nodeSelector | NodeSelector | map[string]string |
+| annotations | Annotations to add to each Fluentd pod. | map[string]string |
 | serviceAccountAnnotations | Annotations to add to the Fluentd service account | map[string]string |
 | affinity | Pod's scheduling constraints. | *corev1.Affinity |
 | tolerations | Tolerations | [][corev1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#toleration-v1-core) |
diff --git a/pkg/operator/sts.go b/pkg/operator/sts.go
index 4ff99c02b..7d3c82c3a 100644
--- a/pkg/operator/sts.go
+++ b/pkg/operator/sts.go
@@ -53,9 +53,10 @@ func MakeStatefulset(fd fluentdv1alpha1.Fluentd) *appsv1.StatefulSet {
 
 	sts := appsv1.StatefulSet{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      fd.Name,
-			Namespace: fd.Namespace,
-			Labels:    labels,
+			Name:        fd.Name,
+			Namespace:   fd.Namespace,
+			Labels:      labels,
+			Annotations: fd.Annotations,
 		},
 		Spec: appsv1.StatefulSetSpec{
 			Replicas: &replicas,
@@ -64,9 +65,10 @@ func MakeStatefulset(fd fluentdv1alpha1.Fluentd) *appsv1.StatefulSet {
 			},
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      fd.Name,
-					Namespace: fd.Namespace,
-					Labels:    labels,
+					Name:        fd.Name,
+					Namespace:   fd.Namespace,
+					Labels:      labels,
+					Annotations: fd.Spec.Annotations,
 				},
 				Spec: corev1.PodSpec{
 					ServiceAccountName: fd.Name,

From 3a0da3dc01cf2cbba6744371099dd45a973df9c8 Mon Sep 17 00:00:00 2001
From: flxman <felix.farjsjo@gmail.com>
Date: Wed, 26 Apr 2023 16:34:49 +0200
Subject: [PATCH 07/78] fluent operator & fluentbit: Added tolerations,
 nodeSelector + more (#704)

* Added tolerations, nodeSelector, priorityClassName

Signed-off-by: flxman <felix.farjsjo@gmail.com>

* Added podSecurityContext for fluent-operator

Signed-off-by: illrill <richard.jimmy.johansson@gmail.com>

* Different style of indentation

Signed-off-by: illrill <richard.jimmy.johansson@gmail.com>

---------

Signed-off-by: flxman <felix.farjsjo@gmail.com>
Signed-off-by: illrill <richard.jimmy.johansson@gmail.com>
Co-authored-by: illrill <richard.jimmy.johansson@gmail.com>
---
 .../templates/fluent-operator-deployment.yaml | 17 +++++++++++++++-
 .../templates/fluentbit-fluentBit.yaml        | 13 ++++++++++--
 charts/fluent-operator/values.yaml            | 20 ++++++++++++++++---
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/charts/fluent-operator/templates/fluent-operator-deployment.yaml b/charts/fluent-operator/templates/fluent-operator-deployment.yaml
index 470ac3d48..bca4c2a83 100644
--- a/charts/fluent-operator/templates/fluent-operator-deployment.yaml
+++ b/charts/fluent-operator/templates/fluent-operator-deployment.yaml
@@ -95,7 +95,22 @@ spec:
         - name: env
           mountPath: /fluent-operator
       serviceAccountName: fluent-operator
+      {{- if .Values.operator.priorityClassName }}
+      priorityClassName: {{ .Values.operator.priorityClassName | quote }}
+      {{- end }}
       {{- if .Values.operator.imagePullSecrets }}
       imagePullSecrets:
-      {{- toYaml .Values.operator.imagePullSecrets | nindent 8 }}
+        {{ toYaml .Values.operator.imagePullSecrets | nindent 8 }}
+      {{- end }}
+      {{- if .Values.operator.tolerations }}
+      tolerations:
+        {{ toYaml .Values.operator.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.operator.nodeSelector }}
+      nodeSelector:
+        {{ toYaml .Values.operator.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.operator.podSecurityContext }}
+      podSecurityContext:
+        {{ toYaml .Values.operator.podSecurityContext | nindent 8 }}
       {{- end }}
diff --git a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
index 10d2b19ee..6f03e229e 100644
--- a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
+++ b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
@@ -18,8 +18,17 @@ spec:
   resources:
 {{- toYaml .Values.fluentbit.resources | nindent 4  }}
   fluentBitConfigName: fluent-bit-config
+{{- with .Values.fluentbit.tolerations }}
   tolerations:
-    - operator: Exists
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- with .Values.fluentbit.nodeSelector }}
+  nodeSelector:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if .Values.fluentbit.priorityClassName }}
+  priorityClassName: {{ .Values.fluentbit.priorityClassName | quote }}
+{{- end }}
   affinity:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution:
@@ -53,4 +62,4 @@ spec:
 {{ toYaml .Values.fluentbit.labels | indent 4 }}
   {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 86cb1669d..8b695689c 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -17,7 +17,15 @@ operator:
   container:
     repository: "kubesphere/fluent-operator"
     tag: "latest"
-    # FluentBit operator resources. Usually user needn't to adjust these.
+  # nodeSelector configuration for Fluent Operator. Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  nodeSelector: {}
+  # Node tolerations applied to Fluent Operator. Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  tolerations: []
+  # Priority class applied to Fluent Operator. Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass
+  priorityClassName: ""
+  # Pod security context for Fluent Operator. Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  podSecurityContext: {}
+  # Fluent Operator resources. Usually user needn't to adjust these.
   resources:
     limits:
       cpu: 100m
@@ -83,7 +91,13 @@ fluentbit:
   additionalVolumes: []
   # Pod volumes to mount into the container's filesystem.
   additionalVolumesMounts: []
-
+  # nodeSelector configuration for Fluent Bit pods. Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  nodeSelector: {}
+  # Node tolerations applied to Fluent Bit pods. Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+  tolerations: 
+  - operator: Exists
+  # Priority Class applied to Fluent Bit pods. Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass
+  priorityClassName: ""
   # Remove the above empty volumes and volumesMounts, and then set additionalVolumes and additionalVolumesMounts as below if you want to collect node exporter metrics
   # additionalVolumes:
   #   - name: hostProc
@@ -234,4 +248,4 @@ fluentd:
 
 nameOverride: ""
 fullnameOverride: ""
-namespaceOverride: ""
+namespaceOverride: ""
\ No newline at end of file

From 31c63a649440b5fb632a478b217c8b15b421b583 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Apr 2023 22:35:31 +0800
Subject: [PATCH 08/78] build(deps): Bump k8s.io/apimachinery from 0.26.3 to
 0.27.1 (#701)

Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.26.3 to 0.27.1.
- [Release notes](https://github.com/kubernetes/apimachinery/releases)
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.26.3...v0.27.1)

---
updated-dependencies:
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 26 ++++++++-------------
 go.sum | 72 +++++++++++++++++++++++++---------------------------------
 2 files changed, 41 insertions(+), 57 deletions(-)

diff --git a/go.mod b/go.mod
index a6cbcc4b8..9914513ee 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.27.6
 	k8s.io/api v0.26.3
-	k8s.io/apimachinery v0.26.3
+	k8s.io/apimachinery v0.27.1
 	k8s.io/client-go v0.26.3
 	k8s.io/klog/v2 v2.90.1
 	sigs.k8s.io/controller-runtime v0.14.6
@@ -29,45 +29,41 @@ require (
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-logr/zapr v1.2.3 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/swag v0.19.14 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.1 // indirect
+	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
-	github.com/google/uuid v1.1.2 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
-	github.com/onsi/ginkgo/v2 v2.9.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
 	golang.org/x/sys v0.6.0 // indirect
 	golang.org/x/term v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
@@ -76,11 +72,9 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
-	k8s.io/code-generator v0.26.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
-	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
-	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
+	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
diff --git a/go.sum b/go.sum
index f6e327ec8..05c0962b8 100644
--- a/go.sum
+++ b/go.sum
@@ -89,7 +89,6 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
-github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -98,18 +97,15 @@ github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
 github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4=
 github.com/go-openapi/errors v0.20.3 h1:rz6kiC84sqNQoqrtulzaL/VERgkoCyB6WdEkc2ujzUc=
 github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk=
-github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
-github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
-github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
+github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
+github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8=
+github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
+github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
+github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@@ -171,18 +167,16 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
@@ -207,14 +201,14 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM=
 github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
@@ -229,7 +223,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
@@ -241,7 +234,6 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
-github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
@@ -279,6 +271,8 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
 github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
@@ -287,13 +281,18 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -350,8 +349,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 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.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
-golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -506,7 +503,6 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -517,7 +513,6 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
-golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -608,8 +603,9 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
@@ -640,32 +636,26 @@ k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU=
 k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE=
 k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI=
 k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM=
-k8s.io/apimachinery v0.26.3 h1:dQx6PNETJ7nODU3XPtrwkfuubs6w7sX0M8n61zHIV/k=
-k8s.io/apimachinery v0.26.3/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
+k8s.io/apimachinery v0.27.1 h1:EGuZiLI95UQQcClhanryclaQE6xjg1Bts6/L3cD7zyc=
+k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
 k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
 k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
-k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo=
-k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I=
 k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
 k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
-k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
-k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
 k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
-k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y=
-k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
+k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
+k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
+k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/controller-runtime v0.14.6 h1:oxstGVvXGNnMvY7TAESYk+lzr6S3V5VFxQ6d92KcwQA=
 sigs.k8s.io/controller-runtime v0.14.6/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
-sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
-sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

From 35aaa2d9c1969254d8da1175871c2fbcbfc4fb7f Mon Sep 17 00:00:00 2001
From: flxman <felix.farjsjo@gmail.com>
Date: Fri, 28 Apr 2023 15:04:45 +0200
Subject: [PATCH 09/78] envVars support in fluentbit helm template

Signed-off-by: flxman <felix.farjsjo@gmail.com>
---
 charts/fluent-operator/templates/fluentbit-fluentBit.yaml | 4 ++++
 charts/fluent-operator/values.yaml                        | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
index 6f03e229e..1038ef609 100644
--- a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
+++ b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
@@ -18,6 +18,10 @@ spec:
   resources:
 {{- toYaml .Values.fluentbit.resources | nindent 4  }}
   fluentBitConfigName: fluent-bit-config
+{{- if .Values.fluentbit.envVars }}
+  envVars:
+{{ toYaml .Values.fluentbit.envVars | indent 4 }}
+{{- end }}
 {{- with .Values.fluentbit.tolerations }}
   tolerations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 8b695689c..e85202de0 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -98,6 +98,11 @@ fluentbit:
   - operator: Exists
   # Priority Class applied to Fluent Bit pods. Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass
   priorityClassName: ""
+  # Environment variables that can be passed to fluentbit pods
+  envVars: []
+  #  - name: FOO
+  #    value: "bar"
+
   # Remove the above empty volumes and volumesMounts, and then set additionalVolumes and additionalVolumesMounts as below if you want to collect node exporter metrics
   # additionalVolumes:
   #   - name: hostProc

From c30275f2f342e82daa4e3dd00f6e14fb0717d177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Mj=C3=B8nes=20Loe?= <jens_loe@hotmail.com>
Date: Fri, 28 Apr 2023 17:50:20 +0200
Subject: [PATCH 10/78] Add uri field for each telemetry type, remove old uri
 field
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jens Mjønes Loe <jens_loe@hotmail.com>
---
 .../plugins/output/open_telemetry_types.go    | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/apis/fluentbit/v1alpha2/plugins/output/open_telemetry_types.go b/apis/fluentbit/v1alpha2/plugins/output/open_telemetry_types.go
index 636670d60..7988f11c1 100644
--- a/apis/fluentbit/v1alpha2/plugins/output/open_telemetry_types.go
+++ b/apis/fluentbit/v1alpha2/plugins/output/open_telemetry_types.go
@@ -2,14 +2,14 @@ package output
 
 import (
 	"fmt"
+
 	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins"
 	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params"
 )
 
 // +kubebuilder:object:generate:=true
 
-// OpenTelemetry is An output plugin to submit Metrics to an OpenTelemetry endpoint, <br />
-// allows taking metrics from Fluent Bit and submit them to an OpenTelemetry HTTP endpoint. <br />
+// The OpenTelemetry plugin allows you to take logs, metrics, and traces from Fluent Bit and submit them to an OpenTelemetry HTTP endpoint. <br />
 // **For full documentation, refer to https://docs.fluentbit.io/manual/pipeline/outputs/opentelemetry**
 type OpenTelemetry struct {
 	// IP address or hostname of the target HTTP Server, default `127.0.0.1`
@@ -25,8 +25,12 @@ type OpenTelemetry struct {
 	// Specify an HTTP Proxy. The expected format of this value is http://HOST:PORT. Note that HTTPS is not currently supported.
 	// It is recommended not to set this and to configure the HTTP proxy environment variables instead as they support both HTTP and HTTPS.
 	Proxy string `json:"proxy,omitempty"`
-	// Specify an optional HTTP URI for the target web server, e.g: /something
-	Uri string `json:"uri,omitempty"`
+	// Specify an optional HTTP URI for the target web server listening for metrics, e.g: /v1/metrics
+	MetricsUri string `json:"metricsUri,omitempty"`
+	// Specify an optional HTTP URI for the target web server listening for logs, e.g: /v1/logs
+	LogsUri string `json:"logsUri,omitempty"`
+	// Specify an optional HTTP URI for the target web server listening for traces, e.g: /v1/traces
+	TracesUri string `json:"tracesUri,omitempty"`
 	// Add a HTTP header key/value pair. Multiple headers can be set.
 	Header map[string]string `json:"header,omitempty"`
 	// Log the response payload within the Fluent Bit log.
@@ -67,8 +71,14 @@ func (o *OpenTelemetry) Params(sl plugins.SecretLoader) (*params.KVs, error) {
 	if o.Proxy != "" {
 		kvs.Insert("proxy", o.Proxy)
 	}
-	if o.Uri != "" {
-		kvs.Insert("uri", o.Uri)
+	if o.MetricsUri != "" {
+		kvs.Insert("metrics_uri", o.MetricsUri)
+	}
+	if o.LogsUri != "" {
+		kvs.Insert("logs_uri", o.LogsUri)
+	}
+	if o.TracesUri != "" {
+		kvs.Insert("traces_uri", o.TracesUri)
 	}
 	kvs.InsertStringMap(o.Header, func(k, v string) (string, string) {
 		return "header", fmt.Sprintf(" %s    %s", k, v)

From 57777b03aa90d2c0b52eaa95fecc0f0c54948c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Mj=C3=B8nes=20Loe?= <jens_loe@hotmail.com>
Date: Sat, 29 Apr 2023 16:19:45 +0200
Subject: [PATCH 11/78] generate manifests with command "make manifests"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jens Mjønes Loe <jens_loe@hotmail.com>
---
 .../fluentbit.fluent.io_clusteroutputs.yaml   | 211 ++++++-
 .../crds/fluentbit.fluent.io_outputs.yaml     | 211 ++++++-
 .../crds/fluentd.fluent.io_fluentds.yaml      | 222 ++++----
 .../fluentbit.fluent.io_clusteroutputs.yaml   | 211 ++++++-
 .../bases/fluentbit.fluent.io_outputs.yaml    | 211 ++++++-
 .../crd/bases/fluentd.fluent.io_fluentds.yaml | 220 +++----
 go.mod                                        |   4 +
 go.sum                                        |  11 +
 manifests/setup/fluent-operator-crd.yaml      | 537 +++++++++++++++++-
 manifests/setup/setup.yaml                    | 537 +++++++++++++++++-
 10 files changed, 2138 insertions(+), 237 deletions(-)

diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
index b35ee1b7b..1a479bca8 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
@@ -1039,6 +1039,205 @@ spec:
                       server, e.g: /something'
                     type: string
                 type: object
+              influxDB:
+                description: InfluxDB defines InfluxDB Output configuration.
+                properties:
+                  autoTags:
+                    description: Automatically tag keys where value is string.
+                    type: boolean
+                  bucket:
+                    description: InfluxDB bucket name where records will be inserted
+                      - if specified, database is ignored and v2 of API is used
+                    type: string
+                  database:
+                    description: InfluxDB database name where records will be inserted.
+                    type: string
+                  host:
+                    description: IP address or hostname of the target InfluxDB service.
+                    format: ipv6
+                    type: string
+                  httpPassword:
+                    description: Password for user defined in HTTP_User
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpToken:
+                    description: Authentication token used with InfluxDB v2 - if specified,
+                      both HTTPUser and HTTPPasswd are ignored
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpUser:
+                    description: Optional username for HTTP Basic Authentication
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  org:
+                    description: InfluxDB organization name where the bucket is (v2
+                      only)
+                    type: string
+                  port:
+                    description: TCP port of the target InfluxDB service.
+                    format: int32
+                    maximum: 65536
+                    minimum: 0
+                    type: integer
+                  sequenceTag:
+                    description: The name of the tag whose value is incremented for
+                      the consecutive simultaneous events.
+                    type: string
+                  tagKeys:
+                    description: List of keys that needs to be tagged
+                    items:
+                      type: string
+                    type: array
+                  tagListKey:
+                    description: Key of the string array optionally contained within
+                      each log record that contains tag keys for that record
+                    type: string
+                  tagsListEnabled:
+                    description: Dynamically tag keys which are in the string array
+                      at Tags_List_Key key.
+                    type: boolean
+                  tls:
+                    description: Fluent Bit provides integrated support for Transport
+                      Layer Security (TLS) and it predecessor Secure Sockets Layer
+                      (SSL) respectively.
+                    properties:
+                      caFile:
+                        description: Absolute path to CA certificate file
+                        type: string
+                      caPath:
+                        description: Absolute path to scan for certificate files
+                        type: string
+                      crtFile:
+                        description: Absolute path to Certificate file
+                        type: string
+                      debug:
+                        description: 'Set TLS debug verbosity level. It accept the
+                          following values: 0 (No debug), 1 (Error), 2 (State change),
+                          3 (Informational) and 4 Verbose'
+                        enum:
+                        - 0
+                        - 1
+                        - 2
+                        - 3
+                        - 4
+                        format: int32
+                        type: integer
+                      keyFile:
+                        description: Absolute path to private Key file
+                        type: string
+                      keyPassword:
+                        description: Optional password for tls.key_file file
+                        properties:
+                          valueFrom:
+                            description: ValueSource defines how to find a value's
+                              key.
+                            properties:
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info:
+                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      TODO: Add other useful fields. apiVersion, kind,
+                                      uid?'
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        type: object
+                      verify:
+                        description: Force certificate validation
+                        type: boolean
+                      vhost:
+                        description: Hostname to be used for TLS SNI extension
+                        type: string
+                    type: object
+                required:
+                - host
+                type: object
               kafka:
                 description: Kafka defines Kafka Output configuration.
                 properties:
@@ -1663,6 +1862,14 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for logs, e.g: /v1/logs'
+                    type: string
+                  metricsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for metrics, e.g: /v1/metrics'
+                    type: string
                   port:
                     description: TCP port of the target OpenSearch instance, default
                       `80`
@@ -1744,9 +1951,9 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
-                  uri:
+                  tracesUri:
                     description: 'Specify an optional HTTP URI for the target web
-                      server, e.g: /something'
+                      server listening for traces, e.g: /v1/traces'
                     type: string
                 type: object
               prometheusRemoteWrite:
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
index 1f10d256f..2811de1f4 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
@@ -1039,6 +1039,205 @@ spec:
                       server, e.g: /something'
                     type: string
                 type: object
+              influxDB:
+                description: InfluxDB defines InfluxDB Output configuration.
+                properties:
+                  autoTags:
+                    description: Automatically tag keys where value is string.
+                    type: boolean
+                  bucket:
+                    description: InfluxDB bucket name where records will be inserted
+                      - if specified, database is ignored and v2 of API is used
+                    type: string
+                  database:
+                    description: InfluxDB database name where records will be inserted.
+                    type: string
+                  host:
+                    description: IP address or hostname of the target InfluxDB service.
+                    format: ipv6
+                    type: string
+                  httpPassword:
+                    description: Password for user defined in HTTP_User
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpToken:
+                    description: Authentication token used with InfluxDB v2 - if specified,
+                      both HTTPUser and HTTPPasswd are ignored
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpUser:
+                    description: Optional username for HTTP Basic Authentication
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  org:
+                    description: InfluxDB organization name where the bucket is (v2
+                      only)
+                    type: string
+                  port:
+                    description: TCP port of the target InfluxDB service.
+                    format: int32
+                    maximum: 65536
+                    minimum: 0
+                    type: integer
+                  sequenceTag:
+                    description: The name of the tag whose value is incremented for
+                      the consecutive simultaneous events.
+                    type: string
+                  tagKeys:
+                    description: List of keys that needs to be tagged
+                    items:
+                      type: string
+                    type: array
+                  tagListKey:
+                    description: Key of the string array optionally contained within
+                      each log record that contains tag keys for that record
+                    type: string
+                  tagsListEnabled:
+                    description: Dynamically tag keys which are in the string array
+                      at Tags_List_Key key.
+                    type: boolean
+                  tls:
+                    description: Fluent Bit provides integrated support for Transport
+                      Layer Security (TLS) and it predecessor Secure Sockets Layer
+                      (SSL) respectively.
+                    properties:
+                      caFile:
+                        description: Absolute path to CA certificate file
+                        type: string
+                      caPath:
+                        description: Absolute path to scan for certificate files
+                        type: string
+                      crtFile:
+                        description: Absolute path to Certificate file
+                        type: string
+                      debug:
+                        description: 'Set TLS debug verbosity level. It accept the
+                          following values: 0 (No debug), 1 (Error), 2 (State change),
+                          3 (Informational) and 4 Verbose'
+                        enum:
+                        - 0
+                        - 1
+                        - 2
+                        - 3
+                        - 4
+                        format: int32
+                        type: integer
+                      keyFile:
+                        description: Absolute path to private Key file
+                        type: string
+                      keyPassword:
+                        description: Optional password for tls.key_file file
+                        properties:
+                          valueFrom:
+                            description: ValueSource defines how to find a value's
+                              key.
+                            properties:
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info:
+                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      TODO: Add other useful fields. apiVersion, kind,
+                                      uid?'
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        type: object
+                      verify:
+                        description: Force certificate validation
+                        type: boolean
+                      vhost:
+                        description: Hostname to be used for TLS SNI extension
+                        type: string
+                    type: object
+                required:
+                - host
+                type: object
               kafka:
                 description: Kafka defines Kafka Output configuration.
                 properties:
@@ -1663,6 +1862,14 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for logs, e.g: /v1/logs'
+                    type: string
+                  metricsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for metrics, e.g: /v1/metrics'
+                    type: string
                   port:
                     description: TCP port of the target OpenSearch instance, default
                       `80`
@@ -1744,9 +1951,9 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
-                  uri:
+                  tracesUri:
                     description: 'Specify an optional HTTP URI for the target web
-                      server, e.g: /something'
+                      server listening for traces, e.g: /v1/traces'
                     type: string
                 type: object
               prometheusRemoteWrite:
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
index 16ce03244..eced921de 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
@@ -869,122 +869,12 @@ spec:
                 additionalProperties:
                   type: string
                 description: Annotations to add to each Fluentd pod.
-                type: objects
+                type: object
               args:
                 description: Fluentd Watcher command line arguments.
                 items:
                   type: string
                 type: array
-              envVars:
-                description: EnvVars represent environment variables that can be passed
-                  to fluentd pods.
-                items:
-                  description: EnvVar represents an environment variable present in
-                    a Container.
-                  properties:
-                    name:
-                      description: Name of the environment variable. Must be a C_IDENTIFIER.
-                      type: string
-                    value:
-                      description: 'Variable references $(VAR_NAME) are expanded using
-                        the previously defined environment variables in the container
-                        and any service environment variables. If a variable cannot
-                        be resolved, the reference in the input string will be unchanged.
-                        Double $$ are reduced to a single $, which allows for escaping
-                        the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the
-                        string literal "$(VAR_NAME)". Escaped references will never
-                        be expanded, regardless of whether the variable exists or
-                        not. Defaults to "".'
-                      type: string
-                    valueFrom:
-                      description: Source for the environment variable's value. Cannot
-                        be used if value is not empty.
-                      properties:
-                        configMapKeyRef:
-                          description: Selects a key of a ConfigMap.
-                          properties:
-                            key:
-                              description: The key to select.
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                TODO: Add other useful fields. apiVersion, kind, uid?'
-                              type: string
-                            optional:
-                              description: Specify whether the ConfigMap or its key
-                                must be defined
-                              type: boolean
-                          required:
-                          - key
-                          type: object
-                          x-kubernetes-map-type: atomic
-                        fieldRef:
-                          description: 'Selects a field of the pod: supports metadata.name,
-                            metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
-                            spec.nodeName, spec.serviceAccountName, status.hostIP,
-                            status.podIP, status.podIPs.'
-                          properties:
-                            apiVersion:
-                              description: Version of the schema the FieldPath is
-                                written in terms of, defaults to "v1".
-                              type: string
-                            fieldPath:
-                              description: Path of the field to select in the specified
-                                API version.
-                              type: string
-                          required:
-                          - fieldPath
-                          type: object
-                          x-kubernetes-map-type: atomic
-                        resourceFieldRef:
-                          description: 'Selects a resource of the container: only
-                            resources limits and requests (limits.cpu, limits.memory,
-                            limits.ephemeral-storage, requests.cpu, requests.memory
-                            and requests.ephemeral-storage) are currently supported.'
-                          properties:
-                            containerName:
-                              description: 'Container name: required for volumes,
-                                optional for env vars'
-                              type: string
-                            divisor:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Specifies the output format of the exposed
-                                resources, defaults to "1"
-                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                              x-kubernetes-int-or-string: true
-                            resource:
-                              description: 'Required: resource to select'
-                              type: string
-                          required:
-                          - resource
-                          type: object
-                          x-kubernetes-map-type: atomic
-                        secretKeyRef:
-                          description: Selects a key of a secret in the pod's namespace
-                          properties:
-                            key:
-                              description: The key of the secret to select from.  Must
-                                be a valid secret key.
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                TODO: Add other useful fields. apiVersion, kind, uid?'
-                              type: string
-                            optional:
-                              description: Specify whether the Secret or its key must
-                                be defined
-                              type: boolean
-                          required:
-                          - key
-                          type: object
-                          x-kubernetes-map-type: atomic
-                      type: object
-                  required:
-                  - name
-                  type: object
-                type: array
               buffer:
                 description: Buffer definition
                 properties:
@@ -1376,6 +1266,116 @@ spec:
                 description: By default will build the related service according to
                   the globalinputs definition.
                 type: boolean
+              envVars:
+                description: EnvVars represent environment variables that can be passed
+                  to fluentd pods.
+                items:
+                  description: EnvVar represents an environment variable present in
+                    a Container.
+                  properties:
+                    name:
+                      description: Name of the environment variable. Must be a C_IDENTIFIER.
+                      type: string
+                    value:
+                      description: 'Variable references $(VAR_NAME) are expanded using
+                        the previously defined environment variables in the container
+                        and any service environment variables. If a variable cannot
+                        be resolved, the reference in the input string will be unchanged.
+                        Double $$ are reduced to a single $, which allows for escaping
+                        the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the
+                        string literal "$(VAR_NAME)". Escaped references will never
+                        be expanded, regardless of whether the variable exists or
+                        not. Defaults to "".'
+                      type: string
+                    valueFrom:
+                      description: Source for the environment variable's value. Cannot
+                        be used if value is not empty.
+                      properties:
+                        configMapKeyRef:
+                          description: Selects a key of a ConfigMap.
+                          properties:
+                            key:
+                              description: The key to select.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the ConfigMap or its key
+                                must be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        fieldRef:
+                          description: 'Selects a field of the pod: supports metadata.name,
+                            metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
+                            spec.nodeName, spec.serviceAccountName, status.hostIP,
+                            status.podIP, status.podIPs.'
+                          properties:
+                            apiVersion:
+                              description: Version of the schema the FieldPath is
+                                written in terms of, defaults to "v1".
+                              type: string
+                            fieldPath:
+                              description: Path of the field to select in the specified
+                                API version.
+                              type: string
+                          required:
+                          - fieldPath
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        resourceFieldRef:
+                          description: 'Selects a resource of the container: only
+                            resources limits and requests (limits.cpu, limits.memory,
+                            limits.ephemeral-storage, requests.cpu, requests.memory
+                            and requests.ephemeral-storage) are currently supported.'
+                          properties:
+                            containerName:
+                              description: 'Container name: required for volumes,
+                                optional for env vars'
+                              type: string
+                            divisor:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Specifies the output format of the exposed
+                                resources, defaults to "1"
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            resource:
+                              description: 'Required: resource to select'
+                              type: string
+                          required:
+                          - resource
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        secretKeyRef:
+                          description: Selects a key of a secret in the pod's namespace
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                  required:
+                  - name
+                  type: object
+                type: array
               fluentdCfgSelector:
                 description: FluentdCfgSelector defines the selectors to select the
                   fluentd config CRs.
diff --git a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
index b35ee1b7b..1a479bca8 100644
--- a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
@@ -1039,6 +1039,205 @@ spec:
                       server, e.g: /something'
                     type: string
                 type: object
+              influxDB:
+                description: InfluxDB defines InfluxDB Output configuration.
+                properties:
+                  autoTags:
+                    description: Automatically tag keys where value is string.
+                    type: boolean
+                  bucket:
+                    description: InfluxDB bucket name where records will be inserted
+                      - if specified, database is ignored and v2 of API is used
+                    type: string
+                  database:
+                    description: InfluxDB database name where records will be inserted.
+                    type: string
+                  host:
+                    description: IP address or hostname of the target InfluxDB service.
+                    format: ipv6
+                    type: string
+                  httpPassword:
+                    description: Password for user defined in HTTP_User
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpToken:
+                    description: Authentication token used with InfluxDB v2 - if specified,
+                      both HTTPUser and HTTPPasswd are ignored
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpUser:
+                    description: Optional username for HTTP Basic Authentication
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  org:
+                    description: InfluxDB organization name where the bucket is (v2
+                      only)
+                    type: string
+                  port:
+                    description: TCP port of the target InfluxDB service.
+                    format: int32
+                    maximum: 65536
+                    minimum: 0
+                    type: integer
+                  sequenceTag:
+                    description: The name of the tag whose value is incremented for
+                      the consecutive simultaneous events.
+                    type: string
+                  tagKeys:
+                    description: List of keys that needs to be tagged
+                    items:
+                      type: string
+                    type: array
+                  tagListKey:
+                    description: Key of the string array optionally contained within
+                      each log record that contains tag keys for that record
+                    type: string
+                  tagsListEnabled:
+                    description: Dynamically tag keys which are in the string array
+                      at Tags_List_Key key.
+                    type: boolean
+                  tls:
+                    description: Fluent Bit provides integrated support for Transport
+                      Layer Security (TLS) and it predecessor Secure Sockets Layer
+                      (SSL) respectively.
+                    properties:
+                      caFile:
+                        description: Absolute path to CA certificate file
+                        type: string
+                      caPath:
+                        description: Absolute path to scan for certificate files
+                        type: string
+                      crtFile:
+                        description: Absolute path to Certificate file
+                        type: string
+                      debug:
+                        description: 'Set TLS debug verbosity level. It accept the
+                          following values: 0 (No debug), 1 (Error), 2 (State change),
+                          3 (Informational) and 4 Verbose'
+                        enum:
+                        - 0
+                        - 1
+                        - 2
+                        - 3
+                        - 4
+                        format: int32
+                        type: integer
+                      keyFile:
+                        description: Absolute path to private Key file
+                        type: string
+                      keyPassword:
+                        description: Optional password for tls.key_file file
+                        properties:
+                          valueFrom:
+                            description: ValueSource defines how to find a value's
+                              key.
+                            properties:
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info:
+                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      TODO: Add other useful fields. apiVersion, kind,
+                                      uid?'
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        type: object
+                      verify:
+                        description: Force certificate validation
+                        type: boolean
+                      vhost:
+                        description: Hostname to be used for TLS SNI extension
+                        type: string
+                    type: object
+                required:
+                - host
+                type: object
               kafka:
                 description: Kafka defines Kafka Output configuration.
                 properties:
@@ -1663,6 +1862,14 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for logs, e.g: /v1/logs'
+                    type: string
+                  metricsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for metrics, e.g: /v1/metrics'
+                    type: string
                   port:
                     description: TCP port of the target OpenSearch instance, default
                       `80`
@@ -1744,9 +1951,9 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
-                  uri:
+                  tracesUri:
                     description: 'Specify an optional HTTP URI for the target web
-                      server, e.g: /something'
+                      server listening for traces, e.g: /v1/traces'
                     type: string
                 type: object
               prometheusRemoteWrite:
diff --git a/config/crd/bases/fluentbit.fluent.io_outputs.yaml b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
index 1f10d256f..2811de1f4 100644
--- a/config/crd/bases/fluentbit.fluent.io_outputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
@@ -1039,6 +1039,205 @@ spec:
                       server, e.g: /something'
                     type: string
                 type: object
+              influxDB:
+                description: InfluxDB defines InfluxDB Output configuration.
+                properties:
+                  autoTags:
+                    description: Automatically tag keys where value is string.
+                    type: boolean
+                  bucket:
+                    description: InfluxDB bucket name where records will be inserted
+                      - if specified, database is ignored and v2 of API is used
+                    type: string
+                  database:
+                    description: InfluxDB database name where records will be inserted.
+                    type: string
+                  host:
+                    description: IP address or hostname of the target InfluxDB service.
+                    format: ipv6
+                    type: string
+                  httpPassword:
+                    description: Password for user defined in HTTP_User
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpToken:
+                    description: Authentication token used with InfluxDB v2 - if specified,
+                      both HTTPUser and HTTPPasswd are ignored
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpUser:
+                    description: Optional username for HTTP Basic Authentication
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  org:
+                    description: InfluxDB organization name where the bucket is (v2
+                      only)
+                    type: string
+                  port:
+                    description: TCP port of the target InfluxDB service.
+                    format: int32
+                    maximum: 65536
+                    minimum: 0
+                    type: integer
+                  sequenceTag:
+                    description: The name of the tag whose value is incremented for
+                      the consecutive simultaneous events.
+                    type: string
+                  tagKeys:
+                    description: List of keys that needs to be tagged
+                    items:
+                      type: string
+                    type: array
+                  tagListKey:
+                    description: Key of the string array optionally contained within
+                      each log record that contains tag keys for that record
+                    type: string
+                  tagsListEnabled:
+                    description: Dynamically tag keys which are in the string array
+                      at Tags_List_Key key.
+                    type: boolean
+                  tls:
+                    description: Fluent Bit provides integrated support for Transport
+                      Layer Security (TLS) and it predecessor Secure Sockets Layer
+                      (SSL) respectively.
+                    properties:
+                      caFile:
+                        description: Absolute path to CA certificate file
+                        type: string
+                      caPath:
+                        description: Absolute path to scan for certificate files
+                        type: string
+                      crtFile:
+                        description: Absolute path to Certificate file
+                        type: string
+                      debug:
+                        description: 'Set TLS debug verbosity level. It accept the
+                          following values: 0 (No debug), 1 (Error), 2 (State change),
+                          3 (Informational) and 4 Verbose'
+                        enum:
+                        - 0
+                        - 1
+                        - 2
+                        - 3
+                        - 4
+                        format: int32
+                        type: integer
+                      keyFile:
+                        description: Absolute path to private Key file
+                        type: string
+                      keyPassword:
+                        description: Optional password for tls.key_file file
+                        properties:
+                          valueFrom:
+                            description: ValueSource defines how to find a value's
+                              key.
+                            properties:
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info:
+                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      TODO: Add other useful fields. apiVersion, kind,
+                                      uid?'
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        type: object
+                      verify:
+                        description: Force certificate validation
+                        type: boolean
+                      vhost:
+                        description: Hostname to be used for TLS SNI extension
+                        type: string
+                    type: object
+                required:
+                - host
+                type: object
               kafka:
                 description: Kafka defines Kafka Output configuration.
                 properties:
@@ -1663,6 +1862,14 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for logs, e.g: /v1/logs'
+                    type: string
+                  metricsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for metrics, e.g: /v1/metrics'
+                    type: string
                   port:
                     description: TCP port of the target OpenSearch instance, default
                       `80`
@@ -1744,9 +1951,9 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
-                  uri:
+                  tracesUri:
                     description: 'Specify an optional HTTP URI for the target web
-                      server, e.g: /something'
+                      server listening for traces, e.g: /v1/traces'
                     type: string
                 type: object
               prometheusRemoteWrite:
diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
index 2a7e798ab..eced921de 100644
--- a/config/crd/bases/fluentd.fluent.io_fluentds.yaml
+++ b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
@@ -875,116 +875,6 @@ spec:
                 items:
                   type: string
                 type: array
-              envVars:
-                description: EnvVars represent environment variables that can be passed
-                  to fluentd pods.
-                items:
-                  description: EnvVar represents an environment variable present in
-                    a Container.
-                  properties:
-                    name:
-                      description: Name of the environment variable. Must be a C_IDENTIFIER.
-                      type: string
-                    value:
-                      description: 'Variable references $(VAR_NAME) are expanded using
-                        the previously defined environment variables in the container
-                        and any service environment variables. If a variable cannot
-                        be resolved, the reference in the input string will be unchanged.
-                        Double $$ are reduced to a single $, which allows for escaping
-                        the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the
-                        string literal "$(VAR_NAME)". Escaped references will never
-                        be expanded, regardless of whether the variable exists or
-                        not. Defaults to "".'
-                      type: string
-                    valueFrom:
-                      description: Source for the environment variable's value. Cannot
-                        be used if value is not empty.
-                      properties:
-                        configMapKeyRef:
-                          description: Selects a key of a ConfigMap.
-                          properties:
-                            key:
-                              description: The key to select.
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                TODO: Add other useful fields. apiVersion, kind, uid?'
-                              type: string
-                            optional:
-                              description: Specify whether the ConfigMap or its key
-                                must be defined
-                              type: boolean
-                          required:
-                          - key
-                          type: object
-                          x-kubernetes-map-type: atomic
-                        fieldRef:
-                          description: 'Selects a field of the pod: supports metadata.name,
-                            metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
-                            spec.nodeName, spec.serviceAccountName, status.hostIP,
-                            status.podIP, status.podIPs.'
-                          properties:
-                            apiVersion:
-                              description: Version of the schema the FieldPath is
-                                written in terms of, defaults to "v1".
-                              type: string
-                            fieldPath:
-                              description: Path of the field to select in the specified
-                                API version.
-                              type: string
-                          required:
-                          - fieldPath
-                          type: object
-                          x-kubernetes-map-type: atomic
-                        resourceFieldRef:
-                          description: 'Selects a resource of the container: only
-                            resources limits and requests (limits.cpu, limits.memory,
-                            limits.ephemeral-storage, requests.cpu, requests.memory
-                            and requests.ephemeral-storage) are currently supported.'
-                          properties:
-                            containerName:
-                              description: 'Container name: required for volumes,
-                                optional for env vars'
-                              type: string
-                            divisor:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              description: Specifies the output format of the exposed
-                                resources, defaults to "1"
-                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                              x-kubernetes-int-or-string: true
-                            resource:
-                              description: 'Required: resource to select'
-                              type: string
-                          required:
-                          - resource
-                          type: object
-                          x-kubernetes-map-type: atomic
-                        secretKeyRef:
-                          description: Selects a key of a secret in the pod's namespace
-                          properties:
-                            key:
-                              description: The key of the secret to select from.  Must
-                                be a valid secret key.
-                              type: string
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                TODO: Add other useful fields. apiVersion, kind, uid?'
-                              type: string
-                            optional:
-                              description: Specify whether the Secret or its key must
-                                be defined
-                              type: boolean
-                          required:
-                          - key
-                          type: object
-                          x-kubernetes-map-type: atomic
-                      type: object
-                  required:
-                  - name
-                  type: object
-                type: array
               buffer:
                 description: Buffer definition
                 properties:
@@ -1376,6 +1266,116 @@ spec:
                 description: By default will build the related service according to
                   the globalinputs definition.
                 type: boolean
+              envVars:
+                description: EnvVars represent environment variables that can be passed
+                  to fluentd pods.
+                items:
+                  description: EnvVar represents an environment variable present in
+                    a Container.
+                  properties:
+                    name:
+                      description: Name of the environment variable. Must be a C_IDENTIFIER.
+                      type: string
+                    value:
+                      description: 'Variable references $(VAR_NAME) are expanded using
+                        the previously defined environment variables in the container
+                        and any service environment variables. If a variable cannot
+                        be resolved, the reference in the input string will be unchanged.
+                        Double $$ are reduced to a single $, which allows for escaping
+                        the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the
+                        string literal "$(VAR_NAME)". Escaped references will never
+                        be expanded, regardless of whether the variable exists or
+                        not. Defaults to "".'
+                      type: string
+                    valueFrom:
+                      description: Source for the environment variable's value. Cannot
+                        be used if value is not empty.
+                      properties:
+                        configMapKeyRef:
+                          description: Selects a key of a ConfigMap.
+                          properties:
+                            key:
+                              description: The key to select.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the ConfigMap or its key
+                                must be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        fieldRef:
+                          description: 'Selects a field of the pod: supports metadata.name,
+                            metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
+                            spec.nodeName, spec.serviceAccountName, status.hostIP,
+                            status.podIP, status.podIPs.'
+                          properties:
+                            apiVersion:
+                              description: Version of the schema the FieldPath is
+                                written in terms of, defaults to "v1".
+                              type: string
+                            fieldPath:
+                              description: Path of the field to select in the specified
+                                API version.
+                              type: string
+                          required:
+                          - fieldPath
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        resourceFieldRef:
+                          description: 'Selects a resource of the container: only
+                            resources limits and requests (limits.cpu, limits.memory,
+                            limits.ephemeral-storage, requests.cpu, requests.memory
+                            and requests.ephemeral-storage) are currently supported.'
+                          properties:
+                            containerName:
+                              description: 'Container name: required for volumes,
+                                optional for env vars'
+                              type: string
+                            divisor:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Specifies the output format of the exposed
+                                resources, defaults to "1"
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            resource:
+                              description: 'Required: resource to select'
+                              type: string
+                          required:
+                          - resource
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        secretKeyRef:
+                          description: Selects a key of a secret in the pod's namespace
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                  required:
+                  - name
+                  type: object
+                type: array
               fluentdCfgSelector:
                 description: FluentdCfgSelector defines the selectors to select the
                   fluentd config CRs.
diff --git a/go.mod b/go.mod
index 9914513ee..95e53d6bb 100644
--- a/go.mod
+++ b/go.mod
@@ -58,12 +58,14 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
 	golang.org/x/sys v0.6.0 // indirect
 	golang.org/x/term v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.7.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
@@ -72,7 +74,9 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
+	k8s.io/code-generator v0.26.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
+	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
 	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
diff --git a/go.sum b/go.sum
index 05c0962b8..cf28da8f1 100644
--- a/go.sum
+++ b/go.sum
@@ -89,6 +89,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -349,6 +350,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 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.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
+golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -503,6 +506,7 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -513,6 +517,7 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -640,8 +645,13 @@ k8s.io/apimachinery v0.27.1 h1:EGuZiLI95UQQcClhanryclaQE6xjg1Bts6/L3cD7zyc=
 k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
 k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
 k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
+k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo=
+k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I=
 k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
 k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
+k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
 k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
@@ -657,5 +667,6 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index bf089e808..977385a17 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -3049,6 +3049,205 @@ spec:
                       server, e.g: /something'
                     type: string
                 type: object
+              influxDB:
+                description: InfluxDB defines InfluxDB Output configuration.
+                properties:
+                  autoTags:
+                    description: Automatically tag keys where value is string.
+                    type: boolean
+                  bucket:
+                    description: InfluxDB bucket name where records will be inserted
+                      - if specified, database is ignored and v2 of API is used
+                    type: string
+                  database:
+                    description: InfluxDB database name where records will be inserted.
+                    type: string
+                  host:
+                    description: IP address or hostname of the target InfluxDB service.
+                    format: ipv6
+                    type: string
+                  httpPassword:
+                    description: Password for user defined in HTTP_User
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpToken:
+                    description: Authentication token used with InfluxDB v2 - if specified,
+                      both HTTPUser and HTTPPasswd are ignored
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpUser:
+                    description: Optional username for HTTP Basic Authentication
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  org:
+                    description: InfluxDB organization name where the bucket is (v2
+                      only)
+                    type: string
+                  port:
+                    description: TCP port of the target InfluxDB service.
+                    format: int32
+                    maximum: 65536
+                    minimum: 0
+                    type: integer
+                  sequenceTag:
+                    description: The name of the tag whose value is incremented for
+                      the consecutive simultaneous events.
+                    type: string
+                  tagKeys:
+                    description: List of keys that needs to be tagged
+                    items:
+                      type: string
+                    type: array
+                  tagListKey:
+                    description: Key of the string array optionally contained within
+                      each log record that contains tag keys for that record
+                    type: string
+                  tagsListEnabled:
+                    description: Dynamically tag keys which are in the string array
+                      at Tags_List_Key key.
+                    type: boolean
+                  tls:
+                    description: Fluent Bit provides integrated support for Transport
+                      Layer Security (TLS) and it predecessor Secure Sockets Layer
+                      (SSL) respectively.
+                    properties:
+                      caFile:
+                        description: Absolute path to CA certificate file
+                        type: string
+                      caPath:
+                        description: Absolute path to scan for certificate files
+                        type: string
+                      crtFile:
+                        description: Absolute path to Certificate file
+                        type: string
+                      debug:
+                        description: 'Set TLS debug verbosity level. It accept the
+                          following values: 0 (No debug), 1 (Error), 2 (State change),
+                          3 (Informational) and 4 Verbose'
+                        enum:
+                        - 0
+                        - 1
+                        - 2
+                        - 3
+                        - 4
+                        format: int32
+                        type: integer
+                      keyFile:
+                        description: Absolute path to private Key file
+                        type: string
+                      keyPassword:
+                        description: Optional password for tls.key_file file
+                        properties:
+                          valueFrom:
+                            description: ValueSource defines how to find a value's
+                              key.
+                            properties:
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info:
+                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      TODO: Add other useful fields. apiVersion, kind,
+                                      uid?'
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        type: object
+                      verify:
+                        description: Force certificate validation
+                        type: boolean
+                      vhost:
+                        description: Hostname to be used for TLS SNI extension
+                        type: string
+                    type: object
+                required:
+                - host
+                type: object
               kafka:
                 description: Kafka defines Kafka Output configuration.
                 properties:
@@ -3673,6 +3872,14 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for logs, e.g: /v1/logs'
+                    type: string
+                  metricsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for metrics, e.g: /v1/metrics'
+                    type: string
                   port:
                     description: TCP port of the target OpenSearch instance, default
                       `80`
@@ -3754,9 +3961,9 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
-                  uri:
+                  tracesUri:
                     description: 'Specify an optional HTTP URI for the target web
-                      server, e.g: /something'
+                      server listening for traces, e.g: /v1/traces'
                     type: string
                 type: object
               prometheusRemoteWrite:
@@ -18232,6 +18439,11 @@ spec:
                         type: array
                     type: object
                 type: object
+              annotations:
+                additionalProperties:
+                  type: string
+                description: Annotations to add to each Fluentd pod.
+                type: object
               args:
                 description: Fluentd Watcher command line arguments.
                 items:
@@ -18628,6 +18840,116 @@ spec:
                 description: By default will build the related service according to
                   the globalinputs definition.
                 type: boolean
+              envVars:
+                description: EnvVars represent environment variables that can be passed
+                  to fluentd pods.
+                items:
+                  description: EnvVar represents an environment variable present in
+                    a Container.
+                  properties:
+                    name:
+                      description: Name of the environment variable. Must be a C_IDENTIFIER.
+                      type: string
+                    value:
+                      description: 'Variable references $(VAR_NAME) are expanded using
+                        the previously defined environment variables in the container
+                        and any service environment variables. If a variable cannot
+                        be resolved, the reference in the input string will be unchanged.
+                        Double $$ are reduced to a single $, which allows for escaping
+                        the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the
+                        string literal "$(VAR_NAME)". Escaped references will never
+                        be expanded, regardless of whether the variable exists or
+                        not. Defaults to "".'
+                      type: string
+                    valueFrom:
+                      description: Source for the environment variable's value. Cannot
+                        be used if value is not empty.
+                      properties:
+                        configMapKeyRef:
+                          description: Selects a key of a ConfigMap.
+                          properties:
+                            key:
+                              description: The key to select.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the ConfigMap or its key
+                                must be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        fieldRef:
+                          description: 'Selects a field of the pod: supports metadata.name,
+                            metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
+                            spec.nodeName, spec.serviceAccountName, status.hostIP,
+                            status.podIP, status.podIPs.'
+                          properties:
+                            apiVersion:
+                              description: Version of the schema the FieldPath is
+                                written in terms of, defaults to "v1".
+                              type: string
+                            fieldPath:
+                              description: Path of the field to select in the specified
+                                API version.
+                              type: string
+                          required:
+                          - fieldPath
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        resourceFieldRef:
+                          description: 'Selects a resource of the container: only
+                            resources limits and requests (limits.cpu, limits.memory,
+                            limits.ephemeral-storage, requests.cpu, requests.memory
+                            and requests.ephemeral-storage) are currently supported.'
+                          properties:
+                            containerName:
+                              description: 'Container name: required for volumes,
+                                optional for env vars'
+                              type: string
+                            divisor:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Specifies the output format of the exposed
+                                resources, defaults to "1"
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            resource:
+                              description: 'Required: resource to select'
+                              type: string
+                          required:
+                          - resource
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        secretKeyRef:
+                          description: Selects a key of a secret in the pod's namespace
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                  required:
+                  - name
+                  type: object
+                type: array
               fluentdCfgSelector:
                 description: FluentdCfgSelector defines the selectors to select the
                   fluentd config CRs.
@@ -22331,6 +22653,205 @@ spec:
                       server, e.g: /something'
                     type: string
                 type: object
+              influxDB:
+                description: InfluxDB defines InfluxDB Output configuration.
+                properties:
+                  autoTags:
+                    description: Automatically tag keys where value is string.
+                    type: boolean
+                  bucket:
+                    description: InfluxDB bucket name where records will be inserted
+                      - if specified, database is ignored and v2 of API is used
+                    type: string
+                  database:
+                    description: InfluxDB database name where records will be inserted.
+                    type: string
+                  host:
+                    description: IP address or hostname of the target InfluxDB service.
+                    format: ipv6
+                    type: string
+                  httpPassword:
+                    description: Password for user defined in HTTP_User
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpToken:
+                    description: Authentication token used with InfluxDB v2 - if specified,
+                      both HTTPUser and HTTPPasswd are ignored
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpUser:
+                    description: Optional username for HTTP Basic Authentication
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  org:
+                    description: InfluxDB organization name where the bucket is (v2
+                      only)
+                    type: string
+                  port:
+                    description: TCP port of the target InfluxDB service.
+                    format: int32
+                    maximum: 65536
+                    minimum: 0
+                    type: integer
+                  sequenceTag:
+                    description: The name of the tag whose value is incremented for
+                      the consecutive simultaneous events.
+                    type: string
+                  tagKeys:
+                    description: List of keys that needs to be tagged
+                    items:
+                      type: string
+                    type: array
+                  tagListKey:
+                    description: Key of the string array optionally contained within
+                      each log record that contains tag keys for that record
+                    type: string
+                  tagsListEnabled:
+                    description: Dynamically tag keys which are in the string array
+                      at Tags_List_Key key.
+                    type: boolean
+                  tls:
+                    description: Fluent Bit provides integrated support for Transport
+                      Layer Security (TLS) and it predecessor Secure Sockets Layer
+                      (SSL) respectively.
+                    properties:
+                      caFile:
+                        description: Absolute path to CA certificate file
+                        type: string
+                      caPath:
+                        description: Absolute path to scan for certificate files
+                        type: string
+                      crtFile:
+                        description: Absolute path to Certificate file
+                        type: string
+                      debug:
+                        description: 'Set TLS debug verbosity level. It accept the
+                          following values: 0 (No debug), 1 (Error), 2 (State change),
+                          3 (Informational) and 4 Verbose'
+                        enum:
+                        - 0
+                        - 1
+                        - 2
+                        - 3
+                        - 4
+                        format: int32
+                        type: integer
+                      keyFile:
+                        description: Absolute path to private Key file
+                        type: string
+                      keyPassword:
+                        description: Optional password for tls.key_file file
+                        properties:
+                          valueFrom:
+                            description: ValueSource defines how to find a value's
+                              key.
+                            properties:
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info:
+                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      TODO: Add other useful fields. apiVersion, kind,
+                                      uid?'
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        type: object
+                      verify:
+                        description: Force certificate validation
+                        type: boolean
+                      vhost:
+                        description: Hostname to be used for TLS SNI extension
+                        type: string
+                    type: object
+                required:
+                - host
+                type: object
               kafka:
                 description: Kafka defines Kafka Output configuration.
                 properties:
@@ -22955,6 +23476,14 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for logs, e.g: /v1/logs'
+                    type: string
+                  metricsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for metrics, e.g: /v1/metrics'
+                    type: string
                   port:
                     description: TCP port of the target OpenSearch instance, default
                       `80`
@@ -23036,9 +23565,9 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
-                  uri:
+                  tracesUri:
                     description: 'Specify an optional HTTP URI for the target web
-                      server, e.g: /something'
+                      server listening for traces, e.g: /v1/traces'
                     type: string
                 type: object
               prometheusRemoteWrite:
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index 39b27fcee..7e5349e7f 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -3049,6 +3049,205 @@ spec:
                       server, e.g: /something'
                     type: string
                 type: object
+              influxDB:
+                description: InfluxDB defines InfluxDB Output configuration.
+                properties:
+                  autoTags:
+                    description: Automatically tag keys where value is string.
+                    type: boolean
+                  bucket:
+                    description: InfluxDB bucket name where records will be inserted
+                      - if specified, database is ignored and v2 of API is used
+                    type: string
+                  database:
+                    description: InfluxDB database name where records will be inserted.
+                    type: string
+                  host:
+                    description: IP address or hostname of the target InfluxDB service.
+                    format: ipv6
+                    type: string
+                  httpPassword:
+                    description: Password for user defined in HTTP_User
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpToken:
+                    description: Authentication token used with InfluxDB v2 - if specified,
+                      both HTTPUser and HTTPPasswd are ignored
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpUser:
+                    description: Optional username for HTTP Basic Authentication
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  org:
+                    description: InfluxDB organization name where the bucket is (v2
+                      only)
+                    type: string
+                  port:
+                    description: TCP port of the target InfluxDB service.
+                    format: int32
+                    maximum: 65536
+                    minimum: 0
+                    type: integer
+                  sequenceTag:
+                    description: The name of the tag whose value is incremented for
+                      the consecutive simultaneous events.
+                    type: string
+                  tagKeys:
+                    description: List of keys that needs to be tagged
+                    items:
+                      type: string
+                    type: array
+                  tagListKey:
+                    description: Key of the string array optionally contained within
+                      each log record that contains tag keys for that record
+                    type: string
+                  tagsListEnabled:
+                    description: Dynamically tag keys which are in the string array
+                      at Tags_List_Key key.
+                    type: boolean
+                  tls:
+                    description: Fluent Bit provides integrated support for Transport
+                      Layer Security (TLS) and it predecessor Secure Sockets Layer
+                      (SSL) respectively.
+                    properties:
+                      caFile:
+                        description: Absolute path to CA certificate file
+                        type: string
+                      caPath:
+                        description: Absolute path to scan for certificate files
+                        type: string
+                      crtFile:
+                        description: Absolute path to Certificate file
+                        type: string
+                      debug:
+                        description: 'Set TLS debug verbosity level. It accept the
+                          following values: 0 (No debug), 1 (Error), 2 (State change),
+                          3 (Informational) and 4 Verbose'
+                        enum:
+                        - 0
+                        - 1
+                        - 2
+                        - 3
+                        - 4
+                        format: int32
+                        type: integer
+                      keyFile:
+                        description: Absolute path to private Key file
+                        type: string
+                      keyPassword:
+                        description: Optional password for tls.key_file file
+                        properties:
+                          valueFrom:
+                            description: ValueSource defines how to find a value's
+                              key.
+                            properties:
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info:
+                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      TODO: Add other useful fields. apiVersion, kind,
+                                      uid?'
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        type: object
+                      verify:
+                        description: Force certificate validation
+                        type: boolean
+                      vhost:
+                        description: Hostname to be used for TLS SNI extension
+                        type: string
+                    type: object
+                required:
+                - host
+                type: object
               kafka:
                 description: Kafka defines Kafka Output configuration.
                 properties:
@@ -3673,6 +3872,14 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for logs, e.g: /v1/logs'
+                    type: string
+                  metricsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for metrics, e.g: /v1/metrics'
+                    type: string
                   port:
                     description: TCP port of the target OpenSearch instance, default
                       `80`
@@ -3754,9 +3961,9 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
-                  uri:
+                  tracesUri:
                     description: 'Specify an optional HTTP URI for the target web
-                      server, e.g: /something'
+                      server listening for traces, e.g: /v1/traces'
                     type: string
                 type: object
               prometheusRemoteWrite:
@@ -18232,6 +18439,11 @@ spec:
                         type: array
                     type: object
                 type: object
+              annotations:
+                additionalProperties:
+                  type: string
+                description: Annotations to add to each Fluentd pod.
+                type: object
               args:
                 description: Fluentd Watcher command line arguments.
                 items:
@@ -18628,6 +18840,116 @@ spec:
                 description: By default will build the related service according to
                   the globalinputs definition.
                 type: boolean
+              envVars:
+                description: EnvVars represent environment variables that can be passed
+                  to fluentd pods.
+                items:
+                  description: EnvVar represents an environment variable present in
+                    a Container.
+                  properties:
+                    name:
+                      description: Name of the environment variable. Must be a C_IDENTIFIER.
+                      type: string
+                    value:
+                      description: 'Variable references $(VAR_NAME) are expanded using
+                        the previously defined environment variables in the container
+                        and any service environment variables. If a variable cannot
+                        be resolved, the reference in the input string will be unchanged.
+                        Double $$ are reduced to a single $, which allows for escaping
+                        the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the
+                        string literal "$(VAR_NAME)". Escaped references will never
+                        be expanded, regardless of whether the variable exists or
+                        not. Defaults to "".'
+                      type: string
+                    valueFrom:
+                      description: Source for the environment variable's value. Cannot
+                        be used if value is not empty.
+                      properties:
+                        configMapKeyRef:
+                          description: Selects a key of a ConfigMap.
+                          properties:
+                            key:
+                              description: The key to select.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the ConfigMap or its key
+                                must be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        fieldRef:
+                          description: 'Selects a field of the pod: supports metadata.name,
+                            metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
+                            spec.nodeName, spec.serviceAccountName, status.hostIP,
+                            status.podIP, status.podIPs.'
+                          properties:
+                            apiVersion:
+                              description: Version of the schema the FieldPath is
+                                written in terms of, defaults to "v1".
+                              type: string
+                            fieldPath:
+                              description: Path of the field to select in the specified
+                                API version.
+                              type: string
+                          required:
+                          - fieldPath
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        resourceFieldRef:
+                          description: 'Selects a resource of the container: only
+                            resources limits and requests (limits.cpu, limits.memory,
+                            limits.ephemeral-storage, requests.cpu, requests.memory
+                            and requests.ephemeral-storage) are currently supported.'
+                          properties:
+                            containerName:
+                              description: 'Container name: required for volumes,
+                                optional for env vars'
+                              type: string
+                            divisor:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: Specifies the output format of the exposed
+                                resources, defaults to "1"
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            resource:
+                              description: 'Required: resource to select'
+                              type: string
+                          required:
+                          - resource
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        secretKeyRef:
+                          description: Selects a key of a secret in the pod's namespace
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                TODO: Add other useful fields. apiVersion, kind, uid?'
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                  required:
+                  - name
+                  type: object
+                type: array
               fluentdCfgSelector:
                 description: FluentdCfgSelector defines the selectors to select the
                   fluentd config CRs.
@@ -22331,6 +22653,205 @@ spec:
                       server, e.g: /something'
                     type: string
                 type: object
+              influxDB:
+                description: InfluxDB defines InfluxDB Output configuration.
+                properties:
+                  autoTags:
+                    description: Automatically tag keys where value is string.
+                    type: boolean
+                  bucket:
+                    description: InfluxDB bucket name where records will be inserted
+                      - if specified, database is ignored and v2 of API is used
+                    type: string
+                  database:
+                    description: InfluxDB database name where records will be inserted.
+                    type: string
+                  host:
+                    description: IP address or hostname of the target InfluxDB service.
+                    format: ipv6
+                    type: string
+                  httpPassword:
+                    description: Password for user defined in HTTP_User
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpToken:
+                    description: Authentication token used with InfluxDB v2 - if specified,
+                      both HTTPUser and HTTPPasswd are ignored
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  httpUser:
+                    description: Optional username for HTTP Basic Authentication
+                    properties:
+                      valueFrom:
+                        description: ValueSource defines how to find a value's key.
+                        properties:
+                          secretKeyRef:
+                            description: Selects a key of a secret in the pod's namespace
+                            properties:
+                              key:
+                                description: The key of the secret to select from.  Must
+                                  be a valid secret key.
+                                type: string
+                              name:
+                                description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                  TODO: Add other useful fields. apiVersion, kind,
+                                  uid?'
+                                type: string
+                              optional:
+                                description: Specify whether the Secret or its key
+                                  must be defined
+                                type: boolean
+                            required:
+                            - key
+                            type: object
+                            x-kubernetes-map-type: atomic
+                        type: object
+                    type: object
+                  org:
+                    description: InfluxDB organization name where the bucket is (v2
+                      only)
+                    type: string
+                  port:
+                    description: TCP port of the target InfluxDB service.
+                    format: int32
+                    maximum: 65536
+                    minimum: 0
+                    type: integer
+                  sequenceTag:
+                    description: The name of the tag whose value is incremented for
+                      the consecutive simultaneous events.
+                    type: string
+                  tagKeys:
+                    description: List of keys that needs to be tagged
+                    items:
+                      type: string
+                    type: array
+                  tagListKey:
+                    description: Key of the string array optionally contained within
+                      each log record that contains tag keys for that record
+                    type: string
+                  tagsListEnabled:
+                    description: Dynamically tag keys which are in the string array
+                      at Tags_List_Key key.
+                    type: boolean
+                  tls:
+                    description: Fluent Bit provides integrated support for Transport
+                      Layer Security (TLS) and it predecessor Secure Sockets Layer
+                      (SSL) respectively.
+                    properties:
+                      caFile:
+                        description: Absolute path to CA certificate file
+                        type: string
+                      caPath:
+                        description: Absolute path to scan for certificate files
+                        type: string
+                      crtFile:
+                        description: Absolute path to Certificate file
+                        type: string
+                      debug:
+                        description: 'Set TLS debug verbosity level. It accept the
+                          following values: 0 (No debug), 1 (Error), 2 (State change),
+                          3 (Informational) and 4 Verbose'
+                        enum:
+                        - 0
+                        - 1
+                        - 2
+                        - 3
+                        - 4
+                        format: int32
+                        type: integer
+                      keyFile:
+                        description: Absolute path to private Key file
+                        type: string
+                      keyPassword:
+                        description: Optional password for tls.key_file file
+                        properties:
+                          valueFrom:
+                            description: ValueSource defines how to find a value's
+                              key.
+                            properties:
+                              secretKeyRef:
+                                description: Selects a key of a secret in the pod's
+                                  namespace
+                                properties:
+                                  key:
+                                    description: The key of the secret to select from.  Must
+                                      be a valid secret key.
+                                    type: string
+                                  name:
+                                    description: 'Name of the referent. More info:
+                                      https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                      TODO: Add other useful fields. apiVersion, kind,
+                                      uid?'
+                                    type: string
+                                  optional:
+                                    description: Specify whether the Secret or its
+                                      key must be defined
+                                    type: boolean
+                                required:
+                                - key
+                                type: object
+                                x-kubernetes-map-type: atomic
+                            type: object
+                        type: object
+                      verify:
+                        description: Force certificate validation
+                        type: boolean
+                      vhost:
+                        description: Hostname to be used for TLS SNI extension
+                        type: string
+                    type: object
+                required:
+                - host
+                type: object
               kafka:
                 description: Kafka defines Kafka Output configuration.
                 properties:
@@ -22955,6 +23476,14 @@ spec:
                   logResponsePayload:
                     description: Log the response payload within the Fluent Bit log.
                     type: boolean
+                  logsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for logs, e.g: /v1/logs'
+                    type: string
+                  metricsUri:
+                    description: 'Specify an optional HTTP URI for the target web
+                      server listening for metrics, e.g: /v1/metrics'
+                    type: string
                   port:
                     description: TCP port of the target OpenSearch instance, default
                       `80`
@@ -23036,9 +23565,9 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
-                  uri:
+                  tracesUri:
                     description: 'Specify an optional HTTP URI for the target web
-                      server, e.g: /something'
+                      server listening for traces, e.g: /v1/traces'
                     type: string
                 type: object
               prometheusRemoteWrite:

From 2a0979ca20f4ce847d81fcf3c201a9aa488ed796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Mj=C3=B8nes=20Loe?= <jens_loe@hotmail.com>
Date: Sat, 29 Apr 2023 16:20:31 +0200
Subject: [PATCH 12/78] run "make generate"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jens Mjønes Loe <jens_loe@hotmail.com>
---
 apis/fluentbit/v1alpha2/zz_generated.deepcopy.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
index c1648cc46..e037d0469 100644
--- a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
+++ b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
@@ -1283,6 +1283,11 @@ func (in *OutputSpec) DeepCopyInto(out *OutputSpec) {
 		*out = new(output.Syslog)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.InfluxDB != nil {
+		in, out := &in.InfluxDB, &out.InfluxDB
+		*out = new(output.InfluxDB)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.DataDog != nil {
 		in, out := &in.DataDog, &out.DataDog
 		*out = new(output.DataDog)

From 75ce9ab8abba4cb5d88b077a3f139b9a00af1d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Mj=C3=B8nes=20Loe?= <jens_loe@hotmail.com>
Date: Sat, 29 Apr 2023 16:20:57 +0200
Subject: [PATCH 13/78] generate API-doc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jens Mjønes Loe <jens_loe@hotmail.com>
---
 docs/fluentbit.md                             |  4 ++++
 .../fluentbit/filter/recordmodifier.md        |  4 +++-
 docs/plugins/fluentbit/output/influxdb.md     | 21 +++++++++++++++++++
 .../fluentbit/output/open_telemetry.md        |  6 ++++--
 docs/plugins/fluentbit/secret.md              |  8 +++++++
 5 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 docs/plugins/fluentbit/output/influxdb.md

diff --git a/docs/fluentbit.md b/docs/fluentbit.md
index b8a2da2f0..5e5643f85 100644
--- a/docs/fluentbit.md
+++ b/docs/fluentbit.md
@@ -279,6 +279,7 @@ FilterSpec defines the desired state of ClusterFilter
 | ----- | ----------- | ------ |
 | match | A pattern to match against the tags of incoming records. It's case-sensitive and support the star (*) character as a wildcard. | string |
 | matchRegex | A regular expression to match against the tags of incoming records. Use this option if you want to use the full regex syntax. | string |
+| logLevel |  | string |
 | filters | A set of filter plugins in order. | []FilterItem |
 
 [Back to TOC](#table-of-contents)
@@ -404,6 +405,7 @@ InputSpec defines the desired state of ClusterInput
 | Field | Description | Scheme |
 | ----- | ----------- | ------ |
 | alias | A user friendly alias name for this input plugin. Used in metrics for distinction of each configured input. | string |
+| logLevel |  | string |
 | dummy | Dummy defines Dummy Input configuration. | *[input.Dummy](plugins/input/dummy.md) |
 | tail | Tail defines Tail Input configuration. | *[input.Tail](plugins/input/tail.md) |
 | systemd | Systemd defines Systemd Input configuration. | *[input.Systemd](plugins/input/systemd.md) |
@@ -458,6 +460,7 @@ OutputSpec defines the desired state of ClusterOutput
 | match | A pattern to match against the tags of incoming records. It's case sensitive and support the star (*) character as a wildcard. | string |
 | matchRegex | A regular expression to match against the tags of incoming records. Use this option if you want to use the full regex syntax. | string |
 | alias | A user friendly alias name for this output plugin. Used in metrics for distinction of each configured output. | string |
+| logLevel | Set the plugin's logging verbosity level. Allowed values are: off, error, warn, info, debug and trace, Defaults to the SERVICE section's Log_Level | string |
 | azureBlob | AzureBlob defines AzureBlob Output Configuration | *[output.AzureBlob](plugins/output/azureblob.md) |
 | azureLogAnalytics | AzureLogAnalytics defines AzureLogAnalytics Output Configuration | *[output.AzureLogAnalytics](plugins/output/azureloganalytics.md) |
 | cloudWatch | CloudWatch defines CloudWatch Output Configuration | *[output.CloudWatch](plugins/output/cloudwatch.md) |
@@ -472,6 +475,7 @@ OutputSpec defines the desired state of ClusterOutput
 | tcp | TCP defines TCP Output configuration. | *[output.TCP](plugins/output/tcp.md) |
 | loki | Loki defines Loki Output configuration. | *[output.Loki](plugins/output/loki.md) |
 | syslog | Syslog defines Syslog Output configuration. | *[output.Syslog](plugins/output/syslog.md) |
+| influxDB | InfluxDB defines InfluxDB Output configuration. | *[output.InfluxDB](plugins/output/influxdb.md) |
 | datadog | DataDog defines DataDog Output configuration. | *[output.DataDog](plugins/output/datadog.md) |
 | firehose | Firehose defines Firehose Output configuration. | *[output.Firehose](plugins/output/firehose.md) |
 | stackdriver | Stackdriver defines Stackdriver Output Configuration | *[output.Stackdriver](plugins/output/stackdriver.md) |
diff --git a/docs/plugins/fluentbit/filter/recordmodifier.md b/docs/plugins/fluentbit/filter/recordmodifier.md
index 8cb40e068..474ece92c 100644
--- a/docs/plugins/fluentbit/filter/recordmodifier.md
+++ b/docs/plugins/fluentbit/filter/recordmodifier.md
@@ -7,4 +7,6 @@ The Record Modifier Filter plugin allows to append fields or to exclude specific
 | ----- | ----------- | ------ |
 | records | Append fields. This parameter needs key and value pair. | []string |
 | removeKeys | If the key is matched, that field is removed. | []string |
-| whitelistKeys | If the key is not matched, that field is removed. | []string |
+| allowlistKeys | If the key is not matched, that field is removed. | []string |
+| whitelistKeys | An alias of allowlistKeys for backwards compatibility. | []string |
+| uuidKeys | If set, the plugin appends uuid to each record. The value assigned becomes the key in the map. | []string |
diff --git a/docs/plugins/fluentbit/output/influxdb.md b/docs/plugins/fluentbit/output/influxdb.md
new file mode 100644
index 000000000..37099ade3
--- /dev/null
+++ b/docs/plugins/fluentbit/output/influxdb.md
@@ -0,0 +1,21 @@
+# InfluxDB
+
+The influxdb output plugin, allows to flush your records into a InfluxDB time series database. <br /> **For full documentation, refer to https://docs.fluentbit.io/manual/pipeline/outputs/influxdb**
+
+
+| Field | Description | Scheme |
+| ----- | ----------- | ------ |
+| host | IP address or hostname of the target InfluxDB service. | string |
+| port | TCP port of the target InfluxDB service. | *int32 |
+| database | InfluxDB database name where records will be inserted. | string |
+| bucket | InfluxDB bucket name where records will be inserted - if specified, database is ignored and v2 of API is used | string |
+| org | InfluxDB organization name where the bucket is (v2 only) | string |
+| sequenceTag | The name of the tag whose value is incremented for the consecutive simultaneous events. | string |
+| httpUser | Optional username for HTTP Basic Authentication | *[plugins.Secret](../secret.md) |
+| httpPassword | Password for user defined in HTTP_User | *[plugins.Secret](../secret.md) |
+| httpToken | Authentication token used with InfluxDB v2 - if specified, both HTTPUser and HTTPPasswd are ignored | *[plugins.Secret](../secret.md) |
+| tagKeys | List of keys that needs to be tagged | []string |
+| autoTags | Automatically tag keys where value is string. | *bool |
+| tagsListEnabled | Dynamically tag keys which are in the string array at Tags_List_Key key. | *bool |
+| tagListKey | Key of the string array optionally contained within each log record that contains tag keys for that record | string |
+| tls |  | *[plugins.TLS](../tls.md) |
diff --git a/docs/plugins/fluentbit/output/open_telemetry.md b/docs/plugins/fluentbit/output/open_telemetry.md
index 1dc42cf32..e0f4208f0 100644
--- a/docs/plugins/fluentbit/output/open_telemetry.md
+++ b/docs/plugins/fluentbit/output/open_telemetry.md
@@ -1,6 +1,6 @@
 # OpenTelemetry
 
-OpenTelemetry is An output plugin to submit Metrics to an OpenTelemetry endpoint, <br /> allows taking metrics from Fluent Bit and submit them to an OpenTelemetry HTTP endpoint. <br /> **For full documentation, refer to https://docs.fluentbit.io/manual/pipeline/outputs/opentelemetry**
+The OpenTelemetry plugin allows you to take logs, metrics, and traces from Fluent Bit and submit them to an OpenTelemetry HTTP endpoint. <br /> **For full documentation, refer to https://docs.fluentbit.io/manual/pipeline/outputs/opentelemetry**
 
 
 | Field | Description | Scheme |
@@ -10,7 +10,9 @@ OpenTelemetry is An output plugin to submit Metrics to an OpenTelemetry endpoint
 | httpUser | Optional username credential for access | *[plugins.Secret](../secret.md) |
 | httpPassword | Password for user defined in HTTP_User | *[plugins.Secret](../secret.md) |
 | proxy | Specify an HTTP Proxy. The expected format of this value is http://HOST:PORT. Note that HTTPS is not currently supported. It is recommended not to set this and to configure the HTTP proxy environment variables instead as they support both HTTP and HTTPS. | string |
-| uri | Specify an optional HTTP URI for the target web server, e.g: /something | string |
+| metricsUri | Specify an optional HTTP URI for the target web server listening for metrics, e.g: /v1/metrics | string |
+| logsUri | Specify an optional HTTP URI for the target web server listening for logs, e.g: /v1/logs | string |
+| tracesUri | Specify an optional HTTP URI for the target web server listening for traces, e.g: /v1/traces | string |
 | header | Add a HTTP header key/value pair. Multiple headers can be set. | map[string]string |
 | logResponsePayload | Log the response payload within the Fluent Bit log. | *bool |
 | addLabel | This allows you to add custom labels to all metrics exposed through the OpenTelemetry exporter. You may have multiple of these fields. | map[string]string |
diff --git a/docs/plugins/fluentbit/secret.md b/docs/plugins/fluentbit/secret.md
index 682ee2e4d..541ecdcb2 100644
--- a/docs/plugins/fluentbit/secret.md
+++ b/docs/plugins/fluentbit/secret.md
@@ -14,3 +14,11 @@ ValueSource defines how to find a value's key.
 | Field | Description | Scheme |
 | ----- | ----------- | ------ |
 | secretKeyRef | Selects a key of a secret in the pod's namespace | [corev1.SecretKeySelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#secretkeyselector-v1-core) |
+# SecretLoader
+
+
+
+
+| Field | Description | Scheme |
+| ----- | ----------- | ------ |
+| Client |  | client.Client |

From 8cda6504cd31e4a8bc485710f0d7e63d934627d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 May 2023 15:26:54 +0800
Subject: [PATCH 14/78] build(deps): Bump helm/chart-testing-action from 2.1.0
 to 2.4.0 (#710)

Bumps [helm/chart-testing-action](https://github.com/helm/chart-testing-action) from 2.1.0 to 2.4.0.
- [Release notes](https://github.com/helm/chart-testing-action/releases)
- [Commits](https://github.com/helm/chart-testing-action/compare/v2.1.0...v2.4.0)

---
updated-dependencies:
- dependency-name: helm/chart-testing-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/lint-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 03ec7095a..9665ac9d5 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -24,7 +24,7 @@ jobs:
           python-version: 3.7
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.1.0
+        uses: helm/chart-testing-action@v2.4.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed

From fac16e5afd219ca958ee614662148ddfab85fbd7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 May 2023 15:27:44 +0800
Subject: [PATCH 15/78] build(deps): Bump k8s.io/klog/v2 from 2.90.1 to 2.100.1
 (#712)

Bumps [k8s.io/klog/v2](https://github.com/kubernetes/klog) from 2.90.1 to 2.100.1.
- [Release notes](https://github.com/kubernetes/klog/releases)
- [Changelog](https://github.com/kubernetes/klog/blob/main/RELEASE.md)
- [Commits](https://github.com/kubernetes/klog/compare/v2.90.1...v2.100.1)

---
updated-dependencies:
- dependency-name: k8s.io/klog/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod |  6 +-----
 go.sum | 15 ++-------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/go.mod b/go.mod
index 95e53d6bb..dd2f8ffdd 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
 	k8s.io/api v0.26.3
 	k8s.io/apimachinery v0.27.1
 	k8s.io/client-go v0.26.3
-	k8s.io/klog/v2 v2.90.1
+	k8s.io/klog/v2 v2.100.1
 	sigs.k8s.io/controller-runtime v0.14.6
 	sigs.k8s.io/yaml v1.3.0
 )
@@ -58,14 +58,12 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
 	golang.org/x/sys v0.6.0 // indirect
 	golang.org/x/term v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
@@ -74,9 +72,7 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
-	k8s.io/code-generator v0.26.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
-	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
 	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
diff --git a/go.sum b/go.sum
index cf28da8f1..297d484a9 100644
--- a/go.sum
+++ b/go.sum
@@ -89,7 +89,6 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
-github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -350,8 +349,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 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.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
-golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -506,7 +503,6 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -517,7 +513,6 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
-golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -645,15 +640,10 @@ k8s.io/apimachinery v0.27.1 h1:EGuZiLI95UQQcClhanryclaQE6xjg1Bts6/L3cD7zyc=
 k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
 k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
 k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
-k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo=
-k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I=
 k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
 k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
-k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
-k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
-k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
+k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
 k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
 k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
@@ -667,6 +657,5 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

From a51ca4004944c2126671a5ba2e1205e2d7291f7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 May 2023 15:32:23 +0800
Subject: [PATCH 16/78] build(deps): Bump golang in
 /cmd/fluent-watcher/fluentbit (#714)

Bumps golang from 1.20.3-alpine3.16 to 1.20.4-alpine3.16.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 cmd/fluent-watcher/fluentbit/Dockerfile       | 2 +-
 cmd/fluent-watcher/fluentbit/Dockerfile.debug | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile b/cmd/fluent-watcher/fluentbit/Dockerfile
index 44b50a73d..7d4a2efb4 100644
--- a/cmd/fluent-watcher/fluentbit/Dockerfile
+++ b/cmd/fluent-watcher/fluentbit/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.3-alpine3.16 as buildergo
+FROM golang:1.20.4-alpine3.16 as buildergo
 RUN mkdir -p /fluent-bit
 RUN mkdir -p /code
 COPY . /code/
diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile.debug b/cmd/fluent-watcher/fluentbit/Dockerfile.debug
index 3e38b9f5a..0ec227ac7 100644
--- a/cmd/fluent-watcher/fluentbit/Dockerfile.debug
+++ b/cmd/fluent-watcher/fluentbit/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.20.3-alpine3.16 as buildergo
+FROM golang:1.20.4-alpine3.16 as buildergo
 RUN mkdir -p /fluent-bit
 RUN mkdir -p /code
 COPY . /code/

From 9f17db320261194c4a0a04968bd81165a747b71f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 May 2023 15:41:41 +0800
Subject: [PATCH 17/78] build(deps): Bump golang in /cmd/fluent-manager (#713)

Bumps golang from 1.20.3-alpine3.17 to 1.20.4-alpine3.17.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 cmd/fluent-manager/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/fluent-manager/Dockerfile b/cmd/fluent-manager/Dockerfile
index 0c4df90dd..6a8ff6561 100644
--- a/cmd/fluent-manager/Dockerfile
+++ b/cmd/fluent-manager/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.20.3-alpine3.17 as builder
+FROM --platform=$BUILDPLATFORM golang:1.20.4-alpine3.17 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

From c45061a3d2ecb1d18f97aa2a577ad15ca4481198 Mon Sep 17 00:00:00 2001
From: Benjamin Huo <benjamin@kubesphere.io>
Date: Thu, 4 May 2023 15:42:38 +0800
Subject: [PATCH 18/78] Adjust fluentd watcher dependabot (#716)

Signed-off-by: Benjamin Huo <benjamin@kubesphere.io>
---
 .github/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index f28b0a6a3..a38c06192 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -13,7 +13,7 @@ updates:
     schedule:
       interval: "daily"
   - package-ecosystem: "docker"
-    directory: "/cmd/fluent-watcher/fluentd/base"
+    directory: "/cmd/fluent-watcher/fluentd"
     schedule:
       interval: "daily"
   - package-ecosystem: "docker"

From 8b69310d140c8eb358197afc81a83cf84acac430 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 May 2023 15:52:46 +0800
Subject: [PATCH 19/78] build(deps): Bump alpine in /cmd/fluent-watcher/fluentd
 (#719)

Bumps alpine from 3.16 to 3.17.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 cmd/fluent-watcher/fluentd/Dockerfile.amd64 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.amd64 b/cmd/fluent-watcher/fluentd/Dockerfile.amd64
index 2d87efce5..b82fa6812 100644
--- a/cmd/fluent-watcher/fluentd/Dockerfile.amd64
+++ b/cmd/fluent-watcher/fluentd/Dockerfile.amd64
@@ -8,7 +8,7 @@ RUN echo $(ls -al /code)
 RUN CGO_ENABLED=0 go build -i -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go
 
 # Fluentd main image
-FROM alpine:3.16
+FROM alpine:3.17
 LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.15.3"
 
 # Do not split this into multiple RUN!

From f4e408b049f87d544302cf1edff7332de5e1683a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 May 2023 15:56:13 +0800
Subject: [PATCH 20/78] build(deps): Bump golang in /cmd/fluent-watcher/fluentd
 (#717)

Bumps golang from 1.19.2-alpine3.16 to 1.20.4-alpine3.16.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 cmd/fluent-watcher/fluentd/Dockerfile.amd64       | 2 +-
 cmd/fluent-watcher/fluentd/Dockerfile.arm64       | 2 +-
 cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.amd64 b/cmd/fluent-watcher/fluentd/Dockerfile.amd64
index b82fa6812..07b31da72 100644
--- a/cmd/fluent-watcher/fluentd/Dockerfile.amd64
+++ b/cmd/fluent-watcher/fluentd/Dockerfile.amd64
@@ -1,5 +1,5 @@
 # Fluentd watcher agent
-FROM golang:1.19.2-alpine3.16 as buildergo
+FROM golang:1.20.4-alpine3.16 as buildergo
 RUN mkdir -p /fluentd
 RUN mkdir -p /code
 COPY . /code/
diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.arm64 b/cmd/fluent-watcher/fluentd/Dockerfile.arm64
index c2d33e3fa..213c27520 100644
--- a/cmd/fluent-watcher/fluentd/Dockerfile.arm64
+++ b/cmd/fluent-watcher/fluentd/Dockerfile.arm64
@@ -1,5 +1,5 @@
 # Fluentd watcher agent
-FROM golang:1.19.2-alpine3.16 as buildergo
+FROM golang:1.20.4-alpine3.16 as buildergo
 RUN mkdir -p /fluentd
 RUN mkdir -p /code
 COPY . /code/
diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick
index d42cf53dc..6fb85a118 100644
--- a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick
+++ b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick
@@ -1,5 +1,5 @@
 # Fluentd watcher agent
-FROM golang:1.19.2-alpine3.16 as buildergo
+FROM golang:1.20.4-alpine3.16 as buildergo
 RUN mkdir -p /fluentd
 RUN mkdir -p /code
 COPY . /code/

From 78a79f91cfa780e7cd994981afd7b5c622952ff2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 May 2023 15:58:38 +0800
Subject: [PATCH 21/78] build(deps): Bump golang in
 /docs/best-practice/forwarding-logs-via-http (#715)

Bumps golang from 1.20.2 to 1.20.4.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docs/best-practice/forwarding-logs-via-http/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/best-practice/forwarding-logs-via-http/Dockerfile b/docs/best-practice/forwarding-logs-via-http/Dockerfile
index 9ba65b989..e038d57a1 100644
--- a/docs/best-practice/forwarding-logs-via-http/Dockerfile
+++ b/docs/best-practice/forwarding-logs-via-http/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.20.2 as builder
+FROM golang:1.20.4 as builder
 
 WORKDIR /
 COPY main.go /go/src/main.go

From 0d80a1c89b1f281281dfb2dba43f0bc69637ed79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 May 2023 16:07:52 +0800
Subject: [PATCH 22/78] build(deps): Bump arm64v8/ruby in
 /cmd/fluent-watcher/fluentd (#718)

Bumps arm64v8/ruby from 3.1-slim-bullseye to 3.2-slim-bullseye.

---
updated-dependencies:
- dependency-name: arm64v8/ruby
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 cmd/fluent-watcher/fluentd/Dockerfile.arm64      | 2 +-
 cmd/fluent-watcher/fluentd/Dockerfile.arm64.base | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.arm64 b/cmd/fluent-watcher/fluentd/Dockerfile.arm64
index 213c27520..101381750 100644
--- a/cmd/fluent-watcher/fluentd/Dockerfile.arm64
+++ b/cmd/fluent-watcher/fluentd/Dockerfile.arm64
@@ -15,7 +15,7 @@ RUN apk add curl --no-cache
 RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .
 
 # Fluentd main image
-FROM arm64v8/ruby:3.1-slim-bullseye
+FROM arm64v8/ruby:3.2-slim-bullseye
 COPY --from=builderqemu /go/qemu-aarch64-static /usr/bin/
 LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.15.3"
 ENV TINI_VERSION=0.18.0
diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base
index 76940e408..53c801992 100644
--- a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base
+++ b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base
@@ -6,7 +6,7 @@ RUN apk add curl --no-cache
 RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .
 
 # Fluentd main image
-FROM arm64v8/ruby:3.1-slim-bullseye
+FROM arm64v8/ruby:3.2-slim-bullseye
 COPY --from=builderqemu /go/qemu-aarch64-static /usr/bin/
 LABEL Description="Fluentd docker image" Vendor="Fluent Organization" Version="1.15.3"
 ENV TINI_VERSION=0.18.0

From 216f1a45f1d10484e4ef200ea4dffc8e85b7733d Mon Sep 17 00:00:00 2001
From: Benjamin Huo <benjamin@kubesphere.io>
Date: Thu, 4 May 2023 16:58:50 +0800
Subject: [PATCH 23/78] remove the deprecated -i flag in go build (#720)

Signed-off-by: Benjamin Huo <benjamin@kubesphere.io>
---
 cmd/fluent-watcher/fluentd/Dockerfile.amd64       | 2 +-
 cmd/fluent-watcher/fluentd/Dockerfile.arm64       | 2 +-
 cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.amd64 b/cmd/fluent-watcher/fluentd/Dockerfile.amd64
index 07b31da72..8fa3aa5bd 100644
--- a/cmd/fluent-watcher/fluentd/Dockerfile.amd64
+++ b/cmd/fluent-watcher/fluentd/Dockerfile.amd64
@@ -5,7 +5,7 @@ RUN mkdir -p /code
 COPY . /code/
 WORKDIR /code
 RUN echo $(ls -al /code)
-RUN CGO_ENABLED=0 go build -i -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go
+RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go
 
 # Fluentd main image
 FROM alpine:3.17
diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.arm64 b/cmd/fluent-watcher/fluentd/Dockerfile.arm64
index 101381750..9cf6e7624 100644
--- a/cmd/fluent-watcher/fluentd/Dockerfile.arm64
+++ b/cmd/fluent-watcher/fluentd/Dockerfile.arm64
@@ -5,7 +5,7 @@ RUN mkdir -p /code
 COPY . /code/
 WORKDIR /code
 RUN echo $(ls -al /code)
-RUN CGO_ENABLED=0 go build -i -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go
+RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go
 
 # To set multiarch build for Docker hub automated build.
 FROM golang:alpine AS builderqemu
diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick
index 6fb85a118..97946813d 100644
--- a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick
+++ b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.quick
@@ -5,7 +5,7 @@ RUN mkdir -p /code
 COPY . /code/
 WORKDIR /code
 RUN echo $(ls -al /code)
-RUN CGO_ENABLED=0 go build -i -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go
+RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluentd/fluentd-watcher /code/cmd/fluent-watcher/fluentd/main.go
 
 # Fluentd main image
 FROM kubesphere/fluentd:v1.15.3-arm64-base

From a93283e732c567dbc6f19650e7368a7d9c5f902b Mon Sep 17 00:00:00 2001
From: Benjamin Huo <benjamin@kubesphere.io>
Date: Thu, 4 May 2023 17:50:49 +0800
Subject: [PATCH 24/78] Adjust fluentd arm64 image build timeout (#721)

Signed-off-by: Benjamin Huo <benjamin@kubesphere.io>
---
 .github/workflows/build-fd-image.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-fd-image.yaml b/.github/workflows/build-fd-image.yaml
index 3151a165e..d53f06f40 100644
--- a/.github/workflows/build-fd-image.yaml
+++ b/.github/workflows/build-fd-image.yaml
@@ -51,7 +51,7 @@ jobs:
 
   build-arm64:
     runs-on: ubuntu-latest
-    timeout-minutes: 45
+    timeout-minutes: 90 
     name: Build arm64 Image for Fluentd
     steps:
       - name: Install Go
@@ -79,7 +79,7 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Build and Push arm64 Image for Fluentd
+      - name: Build and Push arm64 base Image for Fluentd
         run: |
           make build-fd-arm64-base -e FD_IMG_BASE=${{ env.FD_IMG_BASE }}
 

From 0ecb23a135151b8aa466389f4b866dcff1d89bc4 Mon Sep 17 00:00:00 2001
From: dehaocheng <dehaocheng@kubesphere.io>
Date: Sat, 6 May 2023 14:27:34 +0800
Subject: [PATCH 25/78] Fluent-bit upgrade to v2.1.2

Signed-off-by: dehaocheng <dehaocheng@kubesphere.io>
---
 .github/workflows/build-fb-image.yaml            | 4 ++--
 Makefile                                         | 4 ++--
 charts/fluent-operator/values.yaml               | 2 +-
 cmd/fluent-watcher/fluentbit/Dockerfile          | 2 +-
 cmd/fluent-watcher/fluentbit/Dockerfile.debug    | 2 +-
 manifests/kubeedge/fluentbit-fluentbit-edge.yaml | 2 +-
 manifests/logging-stack/fluentbit-fluentBit.yaml | 2 +-
 manifests/quick-start/fluentbit.yaml             | 2 +-
 manifests/regex-parser/fluentbit-fluentBit.yaml  | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index bf6fb3f7e..d1bf7821f 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -13,8 +13,8 @@ on:
       - "pkg/filenotify/**"
 
 env:
-  FB_IMG: 'kubesphere/fluent-bit:v2.0.11'
-  FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.0.11-debug'
+  FB_IMG: 'kubesphere/fluent-bit:v2.1.2'
+  FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.1.2-debug'
 
 jobs:
   build:
diff --git a/Makefile b/Makefile
index 2ecf8999e..d9f72d155 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION?=$(shell cat VERSION | tr -d " \t\n\r")
 # Image URL to use all building/pushing image targets
-FB_IMG ?= kubesphere/fluent-bit:v2.0.11
-FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.0.11-debug
+FB_IMG ?= kubesphere/fluent-bit:v2.1.2
+FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.1.2-debug
 FD_IMG ?= kubesphere/fluentd:v1.15.3
 FO_IMG ?= kubesphere/fluent-operator:$(VERSION)
 FD_IMG_BASE ?= kubesphere/fluentd:v1.15.3-arm64-base
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index e85202de0..00424d7f7 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -61,7 +61,7 @@ fluentbit:
   enable: true
   image:
     repository: "kubesphere/fluent-bit"
-    tag: "v2.0.11"
+    tag: "v2.1.2"
   # fluentbit resources. If you do want to specify resources, adjust them as necessary
   # You can adjust it based on the log volume.
   resources:
diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile b/cmd/fluent-watcher/fluentbit/Dockerfile
index 7d4a2efb4..3d98cab13 100644
--- a/cmd/fluent-watcher/fluentbit/Dockerfile
+++ b/cmd/fluent-watcher/fluentbit/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /code
 RUN echo $(ls -al /code)
 RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
 
-FROM fluent/fluent-bit:2.0.11
+FROM fluent/fluent-bit:2.1.2
 LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0"
 
 COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/
diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile.debug b/cmd/fluent-watcher/fluentbit/Dockerfile.debug
index 0ec227ac7..b8eb4e911 100644
--- a/cmd/fluent-watcher/fluentbit/Dockerfile.debug
+++ b/cmd/fluent-watcher/fluentbit/Dockerfile.debug
@@ -6,7 +6,7 @@ WORKDIR /code
 RUN echo $(ls -al /code)
 RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
 
-FROM fluent/fluent-bit:2.0.11-debug
+FROM fluent/fluent-bit:2.1.2-debug
 LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0"
 
 COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/
diff --git a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml
index 5258945f1..2ad58169f 100644
--- a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml
+++ b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.0.11
+  image: kubesphere/fluent-bit:v2.1.2
   positionDB:
     hostPath:
       path: /var/lib/fluent-bit/
diff --git a/manifests/logging-stack/fluentbit-fluentBit.yaml b/manifests/logging-stack/fluentbit-fluentBit.yaml
index 45e378573..aa13497cb 100644
--- a/manifests/logging-stack/fluentbit-fluentBit.yaml
+++ b/manifests/logging-stack/fluentbit-fluentBit.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.0.11
+  image: kubesphere/fluent-bit:v2.1.2
   positionDB:
     hostPath:
       path: /var/lib/fluent-bit/
diff --git a/manifests/quick-start/fluentbit.yaml b/manifests/quick-start/fluentbit.yaml
index 20dd731a7..2ebca63fb 100644
--- a/manifests/quick-start/fluentbit.yaml
+++ b/manifests/quick-start/fluentbit.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.0.11
+  image: kubesphere/fluent-bit:v2.1.2
   fluentBitConfigName: fluent-bit-config
 
 ---
diff --git a/manifests/regex-parser/fluentbit-fluentBit.yaml b/manifests/regex-parser/fluentbit-fluentBit.yaml
index 6945437cc..ff9ca44c1 100644
--- a/manifests/regex-parser/fluentbit-fluentBit.yaml
+++ b/manifests/regex-parser/fluentbit-fluentBit.yaml
@@ -6,5 +6,5 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.0.11
+  image: kubesphere/fluent-bit:v2.1.2
   fluentBitConfigName: fluent-bit-config

From 49a32016e3e3acbcaacb8f020617a41c5b238327 Mon Sep 17 00:00:00 2001
From: Lewis <24735903+lewis262626@users.noreply.github.com>
Date: Sat, 6 May 2023 20:50:05 +0100
Subject: [PATCH 26/78] Fix(docs): Update cluster outputs docs link

The link to the GitHub path containing all outputs plugins has changed from `clusteroutput` to `output.

Update link in Helm values file to correct link.

Signed-off-by: Lewis <24735903+lewis262626@users.noreply.github.com>
---
 charts/fluent-operator/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 00424d7f7..d441805cf 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -150,7 +150,7 @@ fluentbit:
   # Configure the output plugin parameter in FluentBit.
   # You can set enable to true to output logs to the specified location.
   output:
-    #  You can find more supported output plugins here: https://github.com/fluent/fluent-operator/tree/master/docs/plugins/fluentbit/clusteroutput
+    #  You can find more supported output plugins here: https://github.com/fluent/fluent-operator/tree/master/docs/plugins/fluentbit/output
     es:
       enable: false
       host: "<Elasticsearch url like elasticsearch-logging-data.kubesphere-logging-system.svc>"
@@ -253,4 +253,4 @@ fluentd:
 
 nameOverride: ""
 fullnameOverride: ""
-namespaceOverride: ""
\ No newline at end of file
+namespaceOverride: ""

From 1e907c611b6c5b9b2cfc24f73e2ea24d5b74e84e Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@gmail.com>
Date: Thu, 4 May 2023 14:54:17 +0300
Subject: [PATCH 27/78] Add fluentbit.affinity configuration

Signed-off-by: Oleg Pykhalov <go.wigust@gmail.com>
---
 charts/fluent-operator/Chart.yaml                        | 2 +-
 .../fluent-operator/templates/fluentbit-fluentBit.yaml   | 9 +++------
 charts/fluent-operator/values.yaml                       | 8 ++++++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/charts/fluent-operator/Chart.yaml b/charts/fluent-operator/Chart.yaml
index 7067f4bb4..05c02ce7b 100644
--- a/charts/fluent-operator/Chart.yaml
+++ b/charts/fluent-operator/Chart.yaml
@@ -15,7 +15,7 @@ description: A Helm chart for Kubernetes
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.2.0
+version: 2.2.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
index 1038ef609..aa6807c65 100644
--- a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
+++ b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
@@ -33,13 +33,10 @@ spec:
 {{- if .Values.fluentbit.priorityClassName }}
   priorityClassName: {{ .Values.fluentbit.priorityClassName | quote }}
 {{- end }}
+  {{- with .Values.fluentbit.affinity }}
   affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - matchExpressions:
-              - key: node-role.kubernetes.io/edge
-                operator: DoesNotExist
+{{ toYaml . | indent 4 }}
+  {{- end }}
   {{- if .Values.fluentbit.secrets }}
   secrets:
 {{ toYaml .Values.fluentbit.secrets | indent 4 }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index d441805cf..6b325d4f7 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -91,6 +91,14 @@ fluentbit:
   additionalVolumes: []
   # Pod volumes to mount into the container's filesystem.
   additionalVolumesMounts: []
+  # affinity configuration for Fluent Bit pods. Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: node-role.kubernetes.io/edge
+                operator: DoesNotExist
   # nodeSelector configuration for Fluent Bit pods. Ref: https://kubernetes.io/docs/user-guide/node-selection/
   nodeSelector: {}
   # Node tolerations applied to Fluent Bit pods. Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/

From 455f0884b2951a2de3c8146d5593953e952107f3 Mon Sep 17 00:00:00 2001
From: Benjamin Huo <benjamin@kubesphere.io>
Date: Tue, 16 May 2023 13:54:00 +0800
Subject: [PATCH 28/78] Adjust edge metrics collection config (#736)

Signed-off-by: Benjamin Huo <benjamin@kubesphere.io>
---
 .../templates/fluentbit-input-node-exporter-metrics-edge.yaml | 4 ++--
 .../fluentbit-input-prometheus-scrape-metrics-edge.yaml       | 4 ++--
 .../fluentbit-output-prometheus-remote-write-edge.yaml        | 2 +-
 manifests/kubeedge/input-node-exporter-metrics-edge.yaml      | 4 ++--
 manifests/kubeedge/input-prometheus-scrape-metrics-edge.yaml  | 4 ++--
 manifests/kubeedge/output-prometheus-remote-write-edge.yaml   | 2 +-
 manifests/kubeedge/output-stdout-edge.yaml                    | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/charts/fluent-operator/templates/fluentbit-input-node-exporter-metrics-edge.yaml b/charts/fluent-operator/templates/fluentbit-input-node-exporter-metrics-edge.yaml
index ee006aadd..78ea5f1d1 100644
--- a/charts/fluent-operator/templates/fluentbit-input-node-exporter-metrics-edge.yaml
+++ b/charts/fluent-operator/templates/fluentbit-input-node-exporter-metrics-edge.yaml
@@ -8,8 +8,8 @@ metadata:
     node-role.kubernetes.io/edge: "true"
 spec:
   nodeExporterMetrics:
-    tag: kubeedge.*
-    scrapeInterval: 30s
+    tag: kubeedge.metrics.*
+    scrapeInterval: 1m
     path :
         procfs: /host/proc
         sysfs : /host/sys
diff --git a/charts/fluent-operator/templates/fluentbit-input-prometheus-scrape-metrics-edge.yaml b/charts/fluent-operator/templates/fluentbit-input-prometheus-scrape-metrics-edge.yaml
index f5c63502b..78f902e37 100644
--- a/charts/fluent-operator/templates/fluentbit-input-prometheus-scrape-metrics-edge.yaml
+++ b/charts/fluent-operator/templates/fluentbit-input-prometheus-scrape-metrics-edge.yaml
@@ -8,9 +8,9 @@ metadata:
     node-role.kubernetes.io/edge: "true"
 spec:
   prometheusScrapeMetrics:
-    tag: kubeedge.*
+    tag: kubeedge.metrics.*
     host: 127.0.0.1
     port: 10350
-    scrapeInterval: 30s
+    scrapeInterval: 1m
     metricsPath : /metrics/cadvisor 
 {{- end }}
\ No newline at end of file
diff --git a/charts/fluent-operator/templates/fluentbit-output-prometheus-remote-write-edge.yaml b/charts/fluent-operator/templates/fluentbit-output-prometheus-remote-write-edge.yaml
index a1a218f5a..9c98a1a99 100644
--- a/charts/fluent-operator/templates/fluentbit-output-prometheus-remote-write-edge.yaml
+++ b/charts/fluent-operator/templates/fluentbit-output-prometheus-remote-write-edge.yaml
@@ -7,7 +7,7 @@ metadata:
     fluentbit.fluent.io/enabled: "true"
     node-role.kubernetes.io/edge: "true"
 spec:
-  matchRegex: (?:kubeedge|service)\.(.*)
+  match: kubeedge.metrics.*
   prometheusRemoteWrite:
     host: {{ .Values.fluentbit.edge.prometheusRemoteWrite.host }}
     port: {{ .Values.fluentbit.edge.prometheusRemoteWrite.port }}
diff --git a/manifests/kubeedge/input-node-exporter-metrics-edge.yaml b/manifests/kubeedge/input-node-exporter-metrics-edge.yaml
index 9e53d10b5..e6750a20f 100644
--- a/manifests/kubeedge/input-node-exporter-metrics-edge.yaml
+++ b/manifests/kubeedge/input-node-exporter-metrics-edge.yaml
@@ -7,8 +7,8 @@ metadata:
     node-role.kubernetes.io/edge: "true"
 spec:
   nodeExporterMetrics:
-    tag: kubeedge.*
-    scrapeInterval: 30s
+    tag: kubeedge.metrics.*
+    scrapeInterval: 1m
     path :
         procfs: /host/proc
         sysfs : /host/sys
diff --git a/manifests/kubeedge/input-prometheus-scrape-metrics-edge.yaml b/manifests/kubeedge/input-prometheus-scrape-metrics-edge.yaml
index b4d67abc3..f3bb6890e 100644
--- a/manifests/kubeedge/input-prometheus-scrape-metrics-edge.yaml
+++ b/manifests/kubeedge/input-prometheus-scrape-metrics-edge.yaml
@@ -7,8 +7,8 @@ metadata:
     node-role.kubernetes.io/edge: "true"
 spec:
   prometheusScrapeMetrics:
-    tag: kubeedge.*
+    tag: kubeedge.metrics.*
     host: 127.0.0.1
     port: 10350
-    scrapeInterval: 30s
+    scrapeInterval: 1m
     metricsPath : /metrics/cadvisor 
diff --git a/manifests/kubeedge/output-prometheus-remote-write-edge.yaml b/manifests/kubeedge/output-prometheus-remote-write-edge.yaml
index 08e3d46e2..dc88f45e8 100644
--- a/manifests/kubeedge/output-prometheus-remote-write-edge.yaml
+++ b/manifests/kubeedge/output-prometheus-remote-write-edge.yaml
@@ -6,7 +6,7 @@ metadata:
     fluentbit.fluent.io/enabled: "true"
     node-role.kubernetes.io/edge: "true"
 spec:
-  matchRegex: (?:kubeedge|service)\.(.*)
+  match: kubeedge.metrics.*
   prometheusRemoteWrite:
     host: <cloud-prometheus-service-host>
     port: <cloud-prometheus-service-port>
diff --git a/manifests/kubeedge/output-stdout-edge.yaml b/manifests/kubeedge/output-stdout-edge.yaml
index 1fbaeacb3..cd7847036 100644
--- a/manifests/kubeedge/output-stdout-edge.yaml
+++ b/manifests/kubeedge/output-stdout-edge.yaml
@@ -6,6 +6,6 @@ metadata:
     fluentbit.fluent.io/enabled: "true"
     node-role.kubernetes.io/edge: "true"
 spec:
-  matchRegex: (?:kubeedge|service)\.(.*)
+  match: kubeedge.metrics.*
   stdout:
       format: msgpack

From 0dcbab97f0841ceb311cb32ec8aed9394d9bd02a Mon Sep 17 00:00:00 2001
From: dehaocheng <dehaocheng@kubesphere.io>
Date: Sun, 21 May 2023 13:25:31 +0800
Subject: [PATCH 29/78] Fluent-bit upgrade to v2.1.2

Signed-off-by: dehaocheng <dehaocheng@kubesphere.io>
---
 .github/workflows/build-fb-image.yaml            | 4 ++--
 Makefile                                         | 4 ++--
 charts/fluent-operator/values.yaml               | 2 +-
 cmd/fluent-watcher/fluentbit/Dockerfile          | 2 +-
 cmd/fluent-watcher/fluentbit/Dockerfile.debug    | 2 +-
 manifests/kubeedge/fluentbit-fluentbit-edge.yaml | 2 +-
 manifests/logging-stack/fluentbit-fluentBit.yaml | 2 +-
 manifests/quick-start/fluentbit.yaml             | 2 +-
 manifests/regex-parser/fluentbit-fluentBit.yaml  | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index d1bf7821f..84a2aeb81 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -13,8 +13,8 @@ on:
       - "pkg/filenotify/**"
 
 env:
-  FB_IMG: 'kubesphere/fluent-bit:v2.1.2'
-  FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.1.2-debug'
+  FB_IMG: 'kubesphere/fluent-bit:v2.1.3'
+  FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.1.3-debug'
 
 jobs:
   build:
diff --git a/Makefile b/Makefile
index d9f72d155..bbf952afd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION?=$(shell cat VERSION | tr -d " \t\n\r")
 # Image URL to use all building/pushing image targets
-FB_IMG ?= kubesphere/fluent-bit:v2.1.2
-FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.1.2-debug
+FB_IMG ?= kubesphere/fluent-bit:v2.1.3
+FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.1.3-debug
 FD_IMG ?= kubesphere/fluentd:v1.15.3
 FO_IMG ?= kubesphere/fluent-operator:$(VERSION)
 FD_IMG_BASE ?= kubesphere/fluentd:v1.15.3-arm64-base
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 6b325d4f7..3524a6c1c 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -61,7 +61,7 @@ fluentbit:
   enable: true
   image:
     repository: "kubesphere/fluent-bit"
-    tag: "v2.1.2"
+    tag: "v2.1.3"
   # fluentbit resources. If you do want to specify resources, adjust them as necessary
   # You can adjust it based on the log volume.
   resources:
diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile b/cmd/fluent-watcher/fluentbit/Dockerfile
index 3d98cab13..fb65abff8 100644
--- a/cmd/fluent-watcher/fluentbit/Dockerfile
+++ b/cmd/fluent-watcher/fluentbit/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /code
 RUN echo $(ls -al /code)
 RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
 
-FROM fluent/fluent-bit:2.1.2
+FROM fluent/fluent-bit:2.1.3
 LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0"
 
 COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/
diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile.debug b/cmd/fluent-watcher/fluentbit/Dockerfile.debug
index b8eb4e911..acbe5ad66 100644
--- a/cmd/fluent-watcher/fluentbit/Dockerfile.debug
+++ b/cmd/fluent-watcher/fluentbit/Dockerfile.debug
@@ -6,7 +6,7 @@ WORKDIR /code
 RUN echo $(ls -al /code)
 RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
 
-FROM fluent/fluent-bit:2.1.2-debug
+FROM fluent/fluent-bit:2.1.3-debug
 LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0"
 
 COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/
diff --git a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml
index 2ad58169f..90e0804b1 100644
--- a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml
+++ b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.1.2
+  image: kubesphere/fluent-bit:v2.1.3
   positionDB:
     hostPath:
       path: /var/lib/fluent-bit/
diff --git a/manifests/logging-stack/fluentbit-fluentBit.yaml b/manifests/logging-stack/fluentbit-fluentBit.yaml
index aa13497cb..606871053 100644
--- a/manifests/logging-stack/fluentbit-fluentBit.yaml
+++ b/manifests/logging-stack/fluentbit-fluentBit.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.1.2
+  image: kubesphere/fluent-bit:v2.1.3
   positionDB:
     hostPath:
       path: /var/lib/fluent-bit/
diff --git a/manifests/quick-start/fluentbit.yaml b/manifests/quick-start/fluentbit.yaml
index 2ebca63fb..8afa784da 100644
--- a/manifests/quick-start/fluentbit.yaml
+++ b/manifests/quick-start/fluentbit.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.1.2
+  image: kubesphere/fluent-bit:v2.1.3
   fluentBitConfigName: fluent-bit-config
 
 ---
diff --git a/manifests/regex-parser/fluentbit-fluentBit.yaml b/manifests/regex-parser/fluentbit-fluentBit.yaml
index ff9ca44c1..af204b93f 100644
--- a/manifests/regex-parser/fluentbit-fluentBit.yaml
+++ b/manifests/regex-parser/fluentbit-fluentBit.yaml
@@ -6,5 +6,5 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.1.2
+  image: kubesphere/fluent-bit:v2.1.3
   fluentBitConfigName: fluent-bit-config

From f906bcaa2853cab52b6953b6ebef9d61e50d045d Mon Sep 17 00:00:00 2001
From: adiforluls <aditya.b.bharadwaj@oracle.com>
Date: Sun, 21 May 2023 13:49:54 +0530
Subject: [PATCH 30/78] add some fluentbit helm opts

Signed-off-by: adiforluls <aditya.b.bharadwaj@oracle.com>
---
 .../templates/fluentbit-clusterinput-tail.yaml                | 1 +
 charts/fluent-operator/templates/fluentbit-fluentBit.yaml     | 4 ++++
 charts/fluent-operator/values.yaml                            | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml b/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml
index 2b1490cc1..d2c36e323 100644
--- a/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml
+++ b/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml
@@ -12,6 +12,7 @@ spec:
   tail:
     tag: kube.*
     path: {{ .Values.fluentbit.input.tail.path }}
+    readFromHead: {{ .Values.fluentbit.input.tail.readFromHead }}
     {{- if eq .Values.containerRuntime "docker" }}
     parser: docker
     {{- else if eq .Values.containerRuntime "containerd" }}
diff --git a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
index aa6807c65..b538a90a0 100644
--- a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
+++ b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
@@ -18,6 +18,10 @@ spec:
   resources:
 {{- toYaml .Values.fluentbit.resources | nindent 4  }}
   fluentBitConfigName: fluent-bit-config
+  {{- if .Values.fluentbit.namespaceFluentBitCfgSelector }}
+  namespaceFluentBitCfgSelector:
+{{ toYaml .Values.fluentbit.namespaceFluentBitCfgSelector | indent 4  }}
+  {{- end }}
 {{- if .Values.fluentbit.envVars }}
   envVars:
 {{ toYaml .Values.fluentbit.envVars | indent 4 }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 6b325d4f7..aec7a2ad0 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -129,6 +129,8 @@ fluentbit:
   #     name: hostProc
   #     readOnly: true
 
+  namespaceFluentBitCfgSelector: {}
+
   # Set a limit of memory that Tail plugin can use when appending data to the Engine.
   # You can find more details here: https://docs.fluentbit.io/manual/pipeline/inputs/tail#config
   # If the limit is reach, it will be paused; when the data is flushed it resumes.
@@ -142,6 +144,7 @@ fluentbit:
       memBufLimit: 5MB
       path: "/var/log/containers/*.log"
       skipLongLines: true
+      readFromHead: false
     systemd:
       enable: true
       path: "/var/log/journal"

From 769f05e9198cdb1ab7d02b929ba99147038c4660 Mon Sep 17 00:00:00 2001
From: Jedrzej Kotkowski <jedrzejk143@gmail.com>
Date: Sun, 21 May 2023 22:25:37 +0200
Subject: [PATCH 31/78] dereference pointers in parser filter plugin for
 fluentd

Signed-off-by: Jedrzej Kotkowski <jedrzejk143@gmail.com>
---
 apis/fluentd/v1alpha1/plugins/filter/types.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/apis/fluentd/v1alpha1/plugins/filter/types.go b/apis/fluentd/v1alpha1/plugins/filter/types.go
index 853c3d5ce..662cda31f 100644
--- a/apis/fluentd/v1alpha1/plugins/filter/types.go
+++ b/apis/fluentd/v1alpha1/plugins/filter/types.go
@@ -192,28 +192,28 @@ func (f *Filter) parserPlugin(parent *params.PluginStore, loader plugins.SecretL
 	}
 
 	if f.Parser.KeyName != nil {
-		parent.InsertPairs("key_name", fmt.Sprint(f.Parser.KeyName))
+		parent.InsertPairs("key_name", fmt.Sprint(*f.Parser.KeyName))
 	}
 	if f.Parser.ReserveTime != nil {
-		parent.InsertPairs("reserve_time", fmt.Sprint(f.Parser.ReserveTime))
+		parent.InsertPairs("reserve_time", fmt.Sprint(*f.Parser.ReserveTime))
 	}
 	if f.Parser.ReserveData != nil {
-		parent.InsertPairs("reserve_data", fmt.Sprint(f.Parser.ReserveData))
+		parent.InsertPairs("reserve_data", fmt.Sprint(*f.Parser.ReserveData))
 	}
 	if f.Parser.RemoveKeyNameField != nil {
-		parent.InsertPairs("remove_key_name_field", fmt.Sprint(f.Parser.RemoveKeyNameField))
+		parent.InsertPairs("remove_key_name_field", fmt.Sprint(*f.Parser.RemoveKeyNameField))
 	}
 	if f.Parser.ReplaceInvalidSequence != nil {
-		parent.InsertPairs("replace_invalid_sequence", fmt.Sprint(f.Parser.ReplaceInvalidSequence))
+		parent.InsertPairs("replace_invalid_sequence", fmt.Sprint(*f.Parser.ReplaceInvalidSequence))
 	}
 	if f.Parser.InjectKeyPrefix != nil {
-		parent.InsertPairs("inject_key_prefix", fmt.Sprint(f.Parser.InjectKeyPrefix))
+		parent.InsertPairs("inject_key_prefix", fmt.Sprint(*f.Parser.InjectKeyPrefix))
 	}
 	if f.Parser.HashValueField != nil {
-		parent.InsertPairs("hash_value_field", fmt.Sprint(f.Parser.HashValueField))
+		parent.InsertPairs("hash_value_field", fmt.Sprint(*f.Parser.HashValueField))
 	}
 	if f.Parser.EmitInvalidRecordToError != nil {
-		parent.InsertPairs("emit_invalid_record_to_error", fmt.Sprint(f.Parser.EmitInvalidRecordToError))
+		parent.InsertPairs("emit_invalid_record_to_error", fmt.Sprint(*f.Parser.EmitInvalidRecordToError))
 	}
 
 	if child != nil {

From 25105d361a645e74becb84c062b8a6608d734b35 Mon Sep 17 00:00:00 2001
From: adiforluls <aditya.b.bharadwaj@oracle.com>
Date: Mon, 22 May 2023 12:35:41 +0530
Subject: [PATCH 32/78] fluentbit namespace-logging: only generate rewrite tag
 config once for a namespace

Signed-off-by: adiforluls <aditya.b.bharadwaj@oracle.com>
---
 controllers/fluentbitconfig_controller.go | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/controllers/fluentbitconfig_controller.go b/controllers/fluentbitconfig_controller.go
index f47121e7d..7ae78cb04 100644
--- a/controllers/fluentbitconfig_controller.go
+++ b/controllers/fluentbitconfig_controller.go
@@ -48,6 +48,8 @@ type FluentBitConfigReconciler struct {
 	Scheme *runtime.Scheme
 }
 
+var storeNamespaces map[string]bool
+
 // +kubebuilder:rbac:groups=fluentbit.fluent.io,resources=clusterfluentbitconfigs,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=fluentbit.fluent.io,resources=fluentbitconfigs,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=fluentbit.fluent.io,resources=clusterinputs;clusterfilters;clusteroutputs;clusterparsers,verbs=list
@@ -66,6 +68,10 @@ type FluentBitConfigReconciler struct {
 func (r *FluentBitConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	_ = r.Log.WithValues("fluentbitconfig", req.NamespacedName)
 
+	// Re-initialize during each reconcile loop to clear namespace names
+	// we will repopulate namespaces that have a FluentBitConfig CR
+	storeNamespaces = make(map[string]bool)
+
 	var fbs fluentbitv1alpha2.FluentBitList
 	if err := r.List(ctx, &fbs); err != nil {
 		if errors.IsNotFound(err) {
@@ -222,9 +228,12 @@ func (r *FluentBitConfigReconciler) processNamespacedFluentBitCfgs(ctx context.C
 		parsers = append(parsers, parserList)
 		clusterParsers = append(clusterParsers, clusterParserList)
 
-		rewriteTagConfig := r.generateRewriteTagConfig(cfg, inputs)
-		if rewriteTagConfig != "" {
-			rewriteTagConfigs = append(rewriteTagConfigs, rewriteTagConfig)
+		if _, ok := storeNamespaces[cfg.Namespace]; !ok {
+			rewriteTagConfig := r.generateRewriteTagConfig(cfg, inputs)
+			if rewriteTagConfig != "" {
+				rewriteTagConfigs = append(rewriteTagConfigs, rewriteTagConfig)
+				storeNamespaces[cfg.Namespace] = true
+			}
 		}
 	}
 

From 2a36469b6fb306e1520a18770f19f9579b0d51e2 Mon Sep 17 00:00:00 2001
From: Jedrzej Kotkowski <jedrzejk143@gmail.com>
Date: Mon, 22 May 2023 22:27:27 +0200
Subject: [PATCH 33/78] add fluentd in_tail plugin

Signed-off-by: Jedrzej Kotkowski <jedrzejk143@gmail.com>
---
 apis/fluentd/v1alpha1/helper.go               |   8 +-
 apis/fluentd/v1alpha1/plugins/filter/types.go |   2 +-
 apis/fluentd/v1alpha1/plugins/input/tail.go   | 138 +++++++++
 apis/fluentd/v1alpha1/plugins/input/types.go  | 123 ++++++++
 apis/fluentd/v1alpha1/plugins/output/types.go |   2 +-
 apis/fluentd/v1alpha1/plugins/params/const.go |   1 +
 apis/fluentd/v1alpha1/plugins/params/model.go |   3 +-
 .../fluentd-global-cfg-input-tail.cfg         |  51 ++++
 apis/fluentd/v1alpha1/tests/helper_test.go    |  23 ++
 apis/fluentd/v1alpha1/tests/tools.go          |  68 +++++
 .../fluentd.fluent.io_clusterfilters.yaml     |   3 +
 .../fluentd.fluent.io_clusteroutputs.yaml     |   3 +
 .../crds/fluentd.fluent.io_filters.yaml       |   3 +
 .../crds/fluentd.fluent.io_fluentds.yaml      | 260 +++++++++++++++++
 .../crds/fluentd.fluent.io_outputs.yaml       |   3 +
 .../fluentd.fluent.io_clusterfilters.yaml     |   3 +
 .../fluentd.fluent.io_clusteroutputs.yaml     |   3 +
 .../crd/bases/fluentd.fluent.io_filters.yaml  |   3 +
 .../crd/bases/fluentd.fluent.io_fluentds.yaml | 260 +++++++++++++++++
 .../crd/bases/fluentd.fluent.io_outputs.yaml  |   3 +
 docs/plugins/fluentd/filter/types.md          |   1 +
 docs/plugins/fluentd/input/tail.md            |  52 ++++
 docs/plugins/fluentd/input/types.md           |   1 +
 docs/plugins/fluentd/output/types.md          |   1 +
 go.mod                                        |   4 +
 go.sum                                        |  11 +
 manifests/setup/fluent-operator-crd.yaml      | 272 ++++++++++++++++++
 manifests/setup/setup.yaml                    | 272 ++++++++++++++++++
 28 files changed, 1572 insertions(+), 5 deletions(-)
 create mode 100644 apis/fluentd/v1alpha1/plugins/input/tail.go
 create mode 100644 apis/fluentd/v1alpha1/tests/expected/fluentd-global-cfg-input-tail.cfg
 create mode 100644 docs/plugins/fluentd/input/tail.md

diff --git a/apis/fluentd/v1alpha1/helper.go b/apis/fluentd/v1alpha1/helper.go
index d44af7f2a..4a5ad0e29 100644
--- a/apis/fluentd/v1alpha1/helper.go
+++ b/apis/fluentd/v1alpha1/helper.go
@@ -168,7 +168,9 @@ func (r *CfgResources) filterForFilters(cfgId, namespace, name, crdtype string,
 	for n, filter := range filters {
 		filterId := fmt.Sprintf("%s::%s::%s::%s-%d", cfgId, namespace, crdtype, name, n)
 		filter.FilterCommon.Id = &filterId
-		filter.FilterCommon.Tag = &params.DefaultTag
+		if filter.FilterCommon.Tag == nil {
+			filter.FilterCommon.Tag = &params.DefaultTag
+		}
 
 		ps, err := filter.Params(sl)
 		if err != nil {
@@ -192,7 +194,9 @@ func (r *CfgResources) filterForOutputs(cfgId, namespace, name, crdtype string,
 	for n, output := range outputs {
 		outputId := fmt.Sprintf("%s::%s::%s::%s-%d", cfgId, namespace, crdtype, name, n)
 		output.OutputCommon.Id = &outputId
-		output.OutputCommon.Tag = &params.DefaultTag
+		if output.OutputCommon.Tag == nil {
+			output.OutputCommon.Tag = &params.DefaultTag
+		}
 
 		ps, err := output.Params(sl)
 		if err != nil {
diff --git a/apis/fluentd/v1alpha1/plugins/filter/types.go b/apis/fluentd/v1alpha1/plugins/filter/types.go
index 662cda31f..60547ff89 100644
--- a/apis/fluentd/v1alpha1/plugins/filter/types.go
+++ b/apis/fluentd/v1alpha1/plugins/filter/types.go
@@ -16,7 +16,7 @@ type FilterCommon struct {
 	// The @log_level parameter specifies the plugin-specific logging level
 	LogLevel *string `json:"logLevel,omitempty"`
 	// Which tag to be matched.
-	Tag *string `json:"-"`
+	Tag *string `json:"tag,omitempty"`
 }
 
 // Filter defines all available filter plugins and their parameters.
diff --git a/apis/fluentd/v1alpha1/plugins/input/tail.go b/apis/fluentd/v1alpha1/plugins/input/tail.go
new file mode 100644
index 000000000..d3e4bd31b
--- /dev/null
+++ b/apis/fluentd/v1alpha1/plugins/input/tail.go
@@ -0,0 +1,138 @@
+package input
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins"
+	"github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/common"
+	"github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params"
+)
+// The in_tail Input plugin allows Fluentd to read events from the tail of text files. Its behavior is similar to the tail -F command.
+type Tail struct {
+	// +kubebuilder:validation:Required
+	// The tag of the event.
+	Tag string `json:"tag"`
+	// +kubebuilder:validation:Required
+	// The path(s) to read. Multiple paths can be specified, separated by comma ','.
+	Path string `json:"path"`
+	// This parameter is for strftime formatted path like /path/to/%Y/%m/%d/.
+	PathTimezone string `json:"pathTimezone,omitempty"`
+	// The paths excluded from the watcher list.
+	ExcludePath []string `json:"excludePath,omitempty"`
+	// Avoid to read rotated files duplicately. You should set true when you use * or strftime format in path.
+	FollowInodes *bool `json:"followInodes,omitempty"`
+	// The interval to refresh the list of watch files. This is used when the path includes *.
+	RefreshInterval *uint32 `json:"refreshInterval,omitempty"`
+	// Limits the watching files that the modification time is within the specified time range when using * in path.
+	LimitRecentlyModified *uint32 `json:"limitRecentlyModified,omitempty"`
+	// Skips the refresh of the watch list on startup. This reduces the startup time when * is used in path.
+	SkipRefreshOnStartup *bool `json:"skipRefreshOnStartup,omitempty"`
+	// Starts to read the logs from the head of the file or the last read position recorded in pos_file, not tail.
+	ReadFromHead *bool `json:"readFromHead,omitempty"`
+	// Specifies the encoding of reading lines. By default, in_tail emits string value as ASCII-8BIT encoding.
+	// If encoding is specified, in_tail changes string to encoding.
+	// If encoding and fromEncoding both are specified, in_tail tries to encode string from fromEncoding to encoding.
+	Encoding string `json:"encoding,omitempty"`
+	// Specifies the encoding of reading lines. By default, in_tail emits string value as ASCII-8BIT encoding.
+	// If encoding is specified, in_tail changes string to encoding.
+	// If encoding and fromEncoding both are specified, in_tail tries to encode string from fromEncoding to encoding.
+	FromEncoding string `json:"fromEncoding,omitempty"`
+	// The number of lines to read with each I/O operation.
+	ReadLinesLimit *int32 `json:"readLinesLimit,omitempty"`
+	// The number of reading bytes per second to read with I/O operation. This value should be equal or greater than 8192.
+	ReadBytesLimitPerSecond *int32 `json:"readBytesLimitPerSecond,omitempty"`
+	// The maximum length of a line. Longer lines than it will be just skipped.
+	MaxLineSize *int32 `json:"maxLineSize,omitempty"`
+	// The interval of flushing the buffer for multiline format.
+	MultilineFlushInterval *uint32 `json:"multilineFlushInterval,omitempty"`
+	// (recommended) Fluentd will record the position it last read from this file.
+	// pos_file handles multiple positions in one file so no need to have multiple pos_file parameters per source.
+	// Don't share pos_file between in_tail configurations. It causes unexpected behavior e.g. corrupt pos_file content.
+	PosFile string `json:"posFile,omitempty"`
+	// The interval of doing compaction of pos file.
+	PosFileCompactionInterval *uint32 `json:"posFileCompactionInterval,omitempty"`
+	// +kubebuilder:validation:Required
+	Parse *common.Parse `json:"parse"`
+	// Adds the watching file path to the path_key field.
+	PathKey string `json:"pathKey,omitempty"`
+	// in_tail actually does a bit more than tail -F itself. When rotating a file, some data may still need to be written to the old file as opposed to the new one.
+	// in_tail takes care of this by keeping a reference to the old file (even after it has been rotated) for some time before transitioning completely to the new file.
+	// This helps prevent data designated for the old file from getting lost. By default, this time interval is 5 seconds.
+	// The rotate_wait parameter accepts a single integer representing the number of seconds you want this time interval to be.
+	RotateWait *uint32 `json:"rotateWait,omitempty"`
+	// Enables the additional watch timer. Setting this parameter to false will significantly reduce CPU and I/O consumption when tailing a large number of files on systems with inotify support.
+	// The default is true which results in an additional 1 second timer being used.
+	EnableWatchTimer *bool `json:"enableWatchTimer,omitempty"`
+	// Enables the additional inotify-based watcher. Setting this parameter to false will disable the inotify events and use only timer watcher for file tailing.
+	// This option is mainly for avoiding the stuck issue with inotify.
+	EnableStatWatcher *bool `json:"enableStatWatcher,omitempty"`
+	// Opens and closes the file on every update instead of leaving it open until it gets rotated.
+	OpenOnEveryUpdate *bool `json:"openOnEveryUpdate,omitempty"`
+	// Emits unmatched lines when <parse> format is not matched for incoming logs.
+	EmitUnmatchedLines *bool `json:"emitUnmatchedLines,omitempty"`
+	// If you have to exclude the non-permission files from the watch list, set this parameter to true. It suppresses the repeated permission error logs.
+	IgnoreRepatedPermissionError *bool `json:"ignoreRepeatedPermissionError,omitempty"`
+	// The in_tail plugin can assign each log file to a group, based on user defined rules.
+	// The limit parameter controls the total number of lines collected for a group within a rate_period time interval.
+	Group *Group `json:"group,omitempty"`
+}
+
+type Group struct {
+	// Specifies the regular expression for extracting metadata (namespace, podname) from log file path.
+	// Default value of the pattern regexp extracts information about namespace, podname, docker_id, container of the log (K8s specific).
+	Pattern string `json:"pattern,omitempty"`
+	// Time period in which the group line limit is applied. in_tail resets the counter after every rate_period interval.
+	RatePeriod *int32 `json:"ratePeriod,omitempty"`
+	// Grouping rules for log files.
+	// +kubebuilder:validation:Required
+	Rule *Rule `json:"rule"`
+}
+
+type Rule struct {
+	// match parameter is used to check if a file belongs to a particular group based on hash keys (named captures from pattern) and hash values (regexp in string)
+	Match map[string]string `json:"match,omitempty"`
+	// Maximum number of lines allowed from a group in rate_period time interval. The default value of -1 doesn't throttle log files of that group.
+	Limit *int32 `json:"limit,omitempty"`
+}
+
+func (g *Group) Name() string {
+	return "group"
+}
+
+func (g *Group) Params(loader plugins.SecretLoader) (*params.PluginStore, error) {
+	ps := params.NewPluginStore(g.Name())
+
+	if g.Pattern != "" {
+		ps.InsertPairs("pattern", fmt.Sprint(g.Pattern))
+	}
+
+	if g.RatePeriod != nil {
+		ps.InsertPairs("rate_period", fmt.Sprint(*g.RatePeriod))
+	}
+
+	if g.Rule != nil {
+		subchild, _ := g.Rule.Params(loader)
+		ps.InsertChilds(subchild)
+	}
+	return ps, nil
+}
+
+func (r *Rule) Name() string {
+	return "rule"
+}
+
+func (r *Rule) Params(_ plugins.SecretLoader) (*params.PluginStore, error) {
+	ps := params.NewPluginStore(r.Name())
+
+	if len(r.Match) > 0 {
+		matches, _ := json.Marshal(r.Match)
+		ps.InsertPairs("match", fmt.Sprint(string(matches)))
+	}
+
+	if r.Limit != nil {
+		ps.InsertPairs("limit", fmt.Sprint(*r.Limit))
+	}
+
+	return ps, nil
+}
diff --git a/apis/fluentd/v1alpha1/plugins/input/types.go b/apis/fluentd/v1alpha1/plugins/input/types.go
index 826a24a8d..f250b1cb2 100644
--- a/apis/fluentd/v1alpha1/plugins/input/types.go
+++ b/apis/fluentd/v1alpha1/plugins/input/types.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"strings"
 
 	"github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins"
 	"github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params"
@@ -26,6 +27,8 @@ type Input struct {
 	Forward *Forward `json:"forward,omitempty"`
 	// in_http plugin
 	Http *Http `json:"http,omitempty"`
+	// in_tail plugin
+	Tail *Tail `json:"tail,omitempty"`
 }
 
 // DeepCopyInto implements the DeepCopyInto interface.
@@ -70,9 +73,129 @@ func (i *Input) Params(loader plugins.SecretLoader) (*params.PluginStore, error)
 		return i.httpPlugin(ps, loader), nil
 	}
 
+	if i.Tail != nil {
+		ps.InsertType(string(params.TailInputType))
+		return i.tailPlugin(ps, loader), nil
+	}
+
 	return nil, errors.New("you must define an input plugin")
 }
 
+func (i *Input) tailPlugin(parent *params.PluginStore, loader plugins.SecretLoader) *params.PluginStore {
+	tailModel := i.Tail
+	childs := make([]*params.PluginStore, 0)
+
+	if tailModel.Parse != nil {
+		child, _ := tailModel.Parse.Params(loader)
+		childs = append(childs, child)
+	}
+
+	if tailModel.Group != nil {
+		child, _ := tailModel.Group.Params(loader)
+		childs = append(childs, child)
+	}
+	// TODO: add group section!
+	parent.InsertChilds(childs...)
+
+	if tailModel.Tag != "" {
+		parent.InsertPairs("tag", fmt.Sprint(tailModel.Tag))
+	}
+
+	if tailModel.Path != "" {
+		parent.InsertPairs("path", fmt.Sprint(tailModel.Path))
+	}
+
+	if tailModel.PathTimezone != "" {
+		parent.InsertPairs("path_timezone", fmt.Sprint(tailModel.PathTimezone))
+	}
+
+	if tailModel.ExcludePath != nil {
+		parent.InsertPairs("exclude_path", strings.ReplaceAll(fmt.Sprintf("%+q", tailModel.ExcludePath), "\" \"", "\", \""))
+	}
+
+	if tailModel.FollowInodes != nil {
+		parent.InsertPairs("follow_inodes", fmt.Sprint(*tailModel.FollowInodes))
+	}
+
+	if tailModel.RefreshInterval != nil {
+		parent.InsertPairs("refresh_interval", fmt.Sprint(*tailModel.RefreshInterval))
+	}
+
+	if tailModel.LimitRecentlyModified != nil {
+		parent.InsertPairs("limit_recently_modified", fmt.Sprint(*tailModel.LimitRecentlyModified))
+	}
+
+	if tailModel.SkipRefreshOnStartup != nil {
+		parent.InsertPairs("skip_refresh_on_startup", fmt.Sprint(*tailModel.SkipRefreshOnStartup))
+	}
+
+	if tailModel.ReadFromHead != nil {
+		parent.InsertPairs("read_from_head", fmt.Sprint(*tailModel.ReadFromHead))
+	}
+
+	if tailModel.Encoding != "" {
+		parent.InsertPairs("encoding", fmt.Sprint(tailModel.Encoding))
+	}
+
+	if tailModel.FromEncoding != "" {
+		parent.InsertPairs("from_encoding", fmt.Sprint(tailModel.FromEncoding))
+	}
+
+	if tailModel.ReadLinesLimit != nil {
+		parent.InsertPairs("read_lines_limit", fmt.Sprint(*tailModel.ReadLinesLimit))
+	}
+
+	if tailModel.ReadBytesLimitPerSecond != nil {
+		parent.InsertPairs("read_bytes_limit_per_second", fmt.Sprint(*tailModel.ReadBytesLimitPerSecond))
+	}
+
+	if tailModel.MaxLineSize != nil {
+		parent.InsertPairs("max_line_size", fmt.Sprint(*tailModel.MaxLineSize))
+	}
+
+	if tailModel.MultilineFlushInterval != nil {
+		parent.InsertPairs("multiline_flush_interval", fmt.Sprint(*tailModel.MultilineFlushInterval))
+	}
+
+	if tailModel.PosFile != "" {
+		parent.InsertPairs("pos_file", fmt.Sprint(tailModel.PosFile))
+	}
+
+	if tailModel.PosFileCompactionInterval != nil {
+		parent.InsertPairs("pos_file_compaction_interval", fmt.Sprint(*tailModel.PosFileCompactionInterval))
+	}
+
+	if tailModel.PathKey != "" {
+		parent.InsertPairs("path_key", fmt.Sprint(tailModel.PathKey))
+	}
+
+	if tailModel.RotateWait != nil {
+		parent.InsertPairs("rotate_wait", fmt.Sprint(*tailModel.RotateWait))
+	}
+
+	if tailModel.EnableWatchTimer != nil {
+		parent.InsertPairs("enable_watch_timer", fmt.Sprint(*tailModel.EnableWatchTimer))
+	}
+
+	if tailModel.EnableStatWatcher != nil {
+		parent.InsertPairs("enable_stat_watcher", fmt.Sprint(*tailModel.EnableStatWatcher))
+	}
+
+	if tailModel.OpenOnEveryUpdate != nil {
+		parent.InsertPairs("open_on_every_update", fmt.Sprint(*tailModel.OpenOnEveryUpdate))
+	}
+
+	if tailModel.EmitUnmatchedLines != nil {
+		parent.InsertPairs("emit_unmatched_lines", fmt.Sprint(*tailModel.EmitUnmatchedLines))
+	}
+
+	if tailModel.IgnoreRepatedPermissionError != nil {
+		parent.InsertPairs("ignore_repeated_permission_error", fmt.Sprint(*tailModel.IgnoreRepatedPermissionError))
+	}
+
+	return parent
+}
+
 func (i *Input) forwardPlugin(parent *params.PluginStore, loader plugins.SecretLoader) *params.PluginStore {
 	forwardModel := i.Forward
 	childs := make([]*params.PluginStore, 0)
diff --git a/apis/fluentd/v1alpha1/plugins/output/types.go b/apis/fluentd/v1alpha1/plugins/output/types.go
index 486661ef4..a74239b41 100644
--- a/apis/fluentd/v1alpha1/plugins/output/types.go
+++ b/apis/fluentd/v1alpha1/plugins/output/types.go
@@ -21,7 +21,7 @@ type OutputCommon struct {
 	// The @label parameter is to route the events to <label> sections
 	Label *string `json:"-"`
 	// Which tag to be matched.
-	Tag *string `json:"-"`
+	Tag *string `json:"tag,omitempty"`
 }
 
 // Output defines all available output plugins and their parameters
diff --git a/apis/fluentd/v1alpha1/plugins/params/const.go b/apis/fluentd/v1alpha1/plugins/params/const.go
index b4c695d60..d2d7e6bf3 100644
--- a/apis/fluentd/v1alpha1/plugins/params/const.go
+++ b/apis/fluentd/v1alpha1/plugins/params/const.go
@@ -48,6 +48,7 @@ const (
 	// Enums the supported input types
 	HttpInputType    InputType = "http"
 	ForwardInputType InputType = "forward"
+	TailInputType    InputType = "tail"
 
 	// Enums the supported filter types
 	RecordTransformerFilterType FilterType = "record_transformer"
diff --git a/apis/fluentd/v1alpha1/plugins/params/model.go b/apis/fluentd/v1alpha1/plugins/params/model.go
index e54412463..2805aa1bd 100644
--- a/apis/fluentd/v1alpha1/plugins/params/model.go
+++ b/apis/fluentd/v1alpha1/plugins/params/model.go
@@ -155,7 +155,8 @@ func (ps *PluginStore) processBody(buf *bytes.Buffer) {
 
 	keys := make([]string, 0, len(ps.Store))
 	for k := range ps.Store {
-		if k == "tag" {
+		// Don't add tag unless it is an input plugin
+		if k == "tag" && ps.Name != "source" {
 			continue
 		}
 		if ps.Name == string(BufferPlugin) && ps.IgnorePath {
diff --git a/apis/fluentd/v1alpha1/tests/expected/fluentd-global-cfg-input-tail.cfg b/apis/fluentd/v1alpha1/tests/expected/fluentd-global-cfg-input-tail.cfg
new file mode 100644
index 000000000..d4469a525
--- /dev/null
+++ b/apis/fluentd/v1alpha1/tests/expected/fluentd-global-cfg-input-tail.cfg
@@ -0,0 +1,51 @@
+<source>
+  @type  tail
+  emit_unmatched_lines  true
+  enable_stat_watcher  true
+  enable_watch_timer  true
+  exclude_path  ["/var/log/foo.log", "/var/log/bar"]
+  follow_inodes  false
+  ignore_repeated_permission_error  false
+  limit_recently_modified  3
+  max_line_size  10000
+  multiline_flush_interval  4
+  open_on_every_update  false
+  path  /var/log/test.log
+  path_key  tailed_path
+  pos_file  /fluentd/pos.db
+  pos_file_compaction_interval  5
+  read_bytes_limit_per_second  8192
+  read_from_head  false
+  read_lines_limit  15
+  refresh_interval  2
+  rotate_wait  30
+  skip_refresh_on_startup  false
+  tag  foo.bar
+  <group>
+    pattern  /^\/home\/logs\/(?<file>.+)\.log$/
+    rate_period  30
+    <rule>
+      limit  2
+      match  {"key1":"val1","key2":"val2"}
+    </rule>
+  </group>
+  <parse>
+    @type  json
+  </parse>
+</source>
+<match **>
+  @id  main
+  @type  label_router
+  <route>
+    @label  @2d9e59757d3bfc66d93c3bc44b408922
+    <match>
+      namespaces  fluent
+    </match>
+  </route>
+</match>
+<label @2d9e59757d3bfc66d93c3bc44b408922>
+  <match foo.*>
+    @id  FluentdConfig-fluent-fluentd-config::cluster::clusteroutput::fluentd-output-stdout-0
+    @type  stdout
+  </match>
+</label>
\ No newline at end of file
diff --git a/apis/fluentd/v1alpha1/tests/helper_test.go b/apis/fluentd/v1alpha1/tests/helper_test.go
index 8d7efeeda..502f675e5 100644
--- a/apis/fluentd/v1alpha1/tests/helper_test.go
+++ b/apis/fluentd/v1alpha1/tests/helper_test.go
@@ -42,6 +42,29 @@ func Test_Cfg2ES(t *testing.T) {
 	}
 }
 
+func Test_ClusterCfgInputTail(t *testing.T) {
+	g := NewGomegaWithT(t)
+	sl := plugins.NewSecretLoader(nil, Fluentd.Namespace, logr.Logger{})
+
+	psr := fluentdv1alpha1.NewGlobalPluginResources("main")
+	psr.CombineGlobalInputsPlugins(sl, FluentdInputTail.Spec.GlobalInputs)
+
+	clustercfgRouter, err := psr.BuildCfgRouter(&FluentdConfig1)
+	g.Expect(err).NotTo(HaveOccurred())
+	clusterOutputs := []fluentdv1alpha1.ClusterOutput{FluentdClusterOutputTag}
+	clustercfgResources, _ := psr.PatchAndFilterClusterLevelResources(sl, FluentdConfig1.GetCfgId(), []fluentdv1alpha1.ClusterFilter{}, clusterOutputs)
+	err = psr.WithCfgResources(*clustercfgRouter.Label, clustercfgResources)
+	g.Expect(err).NotTo(HaveOccurred())
+
+	for i := 0; i < maxRuntimes; i++ {
+		config, errs := psr.RenderMainConfig(false)
+		// fmt.Println(config)
+		g.Expect(errs).NotTo(HaveOccurred())
+		g.Expect(string(getExpectedCfg("./expected/fluentd-global-cfg-input-tail.cfg"))).To(Equal(config))
+	}
+
+}
+
 func Test_ClusterCfgOutput2ES(t *testing.T) {
 	g := NewGomegaWithT(t)
 	sl := plugins.NewSecretLoader(nil, Fluentd.Namespace, logr.Logger{})
diff --git a/apis/fluentd/v1alpha1/tests/tools.go b/apis/fluentd/v1alpha1/tests/tools.go
index 122c5f8e2..817a97a26 100644
--- a/apis/fluentd/v1alpha1/tests/tools.go
+++ b/apis/fluentd/v1alpha1/tests/tools.go
@@ -35,6 +35,58 @@ spec:
       config.fluentd.fluent.io/enabled: "true"
 `
 
+	FluentdInputTail    fluentdv1alpha1.Fluentd
+	FluentdInputTailRaw = `
+apiVersion: fluentd.fluent.io/v1alpha1
+kind: Fluentd
+metadata:
+  name: fluentd
+  namespace: fluent
+  labels:
+    app.kubernetes.io/name: fluentd
+spec:
+  globalInputs:
+  - tail: 
+      tag: "foo.bar"
+      path: /var/log/test.log
+      emitUnmatchedLines: true
+      enableStatWatcher: true
+      enableWatchTimer: true
+      followInodes: false
+      group:
+        pattern: '/^\/home\/logs\/(?<file>.+)\.log$/'
+        ratePeriod: 30
+        rule:
+          limit: 2
+          match:
+            key1: val1
+            key2: val2
+      ignoreRepeatedPermissionError: false
+      limitRecentlyModified: 3
+      maxLineSize: 10000
+      multilineFlushInterval: 4
+      openOnEveryUpdate: false
+      parse:
+        type: json
+      pathKey: tailed_path
+      posFile: /fluentd/pos.db
+      posFileCompactionInterval: 5
+      readBytesLimitPerSecond: 8192
+      readFromHead: false
+      readLinesLimit: 15
+      refreshInterval: 2
+      rotateWait: 30
+      skipRefreshOnStartup: false
+      excludePath:
+      - /var/log/foo.log
+      - /var/log/bar
+  replicas: 1
+  image: kubesphere/fluentd:v1.15.3
+  fluentdCfgSelector: 
+    matchLabels:
+      config.fluentd.fluent.io/enabled: "true"
+`
+
 	FluentdClusterFluentdConfig1    fluentdv1alpha1.ClusterFluentdConfig
 	FluentdClusterFluentdConfig1Raw = `
 apiVersion: fluentd.fluent.io/v1alpha1
@@ -148,6 +200,20 @@ spec:
       path: /buffers/es.log
   `
 
+	FluentdClusterOutputTag    fluentdv1alpha1.ClusterOutput
+	FluentdClusterOutputTagRaw = `
+apiVersion: fluentd.fluent.io/v1alpha1
+kind: ClusterOutput
+metadata:
+  name: fluentd-output-stdout
+  labels:
+    output.fluentd.fluent.io/enabled: "true"
+spec: 
+  outputs: 
+  - stdout: {}
+    tag: foo.*
+`
+
 	FluentdclusterOutput2ES    fluentdv1alpha1.ClusterOutput
 	FluentdclusterOutput2ESRaw = `
 apiVersion: fluentd.fluent.io/v1alpha1
@@ -449,6 +515,8 @@ func init() {
 	once.Do(
 		func() {
 			ParseIntoObject(FluentdRaw, &Fluentd)
+			ParseIntoObject(FluentdInputTailRaw, &FluentdInputTail)
+			ParseIntoObject(FluentdClusterOutputTagRaw, &FluentdClusterOutputTag)
 			ParseIntoObject(FluentdClusterFluentdConfig1Raw, &FluentdClusterFluentdConfig1)
 			ParseIntoObject(FluentdClusterFluentdConfig2Raw, &FluentdClusterFluentdConfig2)
 			ParseIntoObject(FluentdConfigUser1Raw, &FluentdConfigUser1)
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusterfilters.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusterfilters.yaml
index 539c0e2ee..5b99a857c 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusterfilters.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusterfilters.yaml
@@ -427,6 +427,9 @@ spec:
                               type: string
                           type: object
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml
index c449f6cb5..933e37e3a 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml
@@ -1618,6 +1618,9 @@ spec:
                     stdout:
                       description: out_stdout plugin
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_filters.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_filters.yaml
index 84ecbe898..02345496d 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_filters.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_filters.yaml
@@ -427,6 +427,9 @@ spec:
                               type: string
                           type: object
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
index eced921de..5716cdaf8 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
@@ -1859,6 +1859,266 @@ spec:
                       description: The @log_level parameter specifies the plugin-specific
                         logging level
                       type: string
+                    tail:
+                      description: in_tail plugin
+                      properties:
+                        emitUnmatchedLines:
+                          description: Emits unmatched lines when <parse> format is
+                            not matched for incoming logs.
+                          type: boolean
+                        enableStatWatcher:
+                          description: Enables the additional inotify-based watcher.
+                            Setting this parameter to false will disable the inotify
+                            events and use only timer watcher for file tailing. This
+                            option is mainly for avoiding the stuck issue with inotify.
+                          type: boolean
+                        enableWatchTimer:
+                          description: Enables the additional watch timer. Setting
+                            this parameter to false will significantly reduce CPU
+                            and I/O consumption when tailing a large number of files
+                            on systems with inotify support. The default is true which
+                            results in an additional 1 second timer being used.
+                          type: boolean
+                        encoding:
+                          description: Specifies the encoding of reading lines. By
+                            default, in_tail emits string value as ASCII-8BIT encoding.
+                            If encoding is specified, in_tail changes string to encoding.
+                            If encoding and fromEncoding both are specified, in_tail
+                            tries to encode string from fromEncoding to encoding.
+                          type: string
+                        excludePath:
+                          description: The paths excluded from the watcher list.
+                          items:
+                            type: string
+                          type: array
+                        followInodes:
+                          description: Avoid to read rotated files duplicately. You
+                            should set true when you use * or strftime format in path.
+                          type: boolean
+                        fromEncoding:
+                          description: Specifies the encoding of reading lines. By
+                            default, in_tail emits string value as ASCII-8BIT encoding.
+                            If encoding is specified, in_tail changes string to encoding.
+                            If encoding and fromEncoding both are specified, in_tail
+                            tries to encode string from fromEncoding to encoding.
+                          type: string
+                        group:
+                          description: The in_tail plugin can assign each log file
+                            to a group, based on user defined rules. The limit parameter
+                            controls the total number of lines collected for a group
+                            within a rate_period time interval.
+                          properties:
+                            pattern:
+                              description: Specifies the regular expression for extracting
+                                metadata (namespace, podname) from log file path.
+                                Default value of the pattern regexp extracts information
+                                about namespace, podname, docker_id, container of
+                                the log (K8s specific).
+                              type: string
+                            ratePeriod:
+                              description: Time period in which the group line limit
+                                is applied. in_tail resets the counter after every
+                                rate_period interval.
+                              format: int32
+                              type: integer
+                            rule:
+                              description: Grouping rules for log files.
+                              properties:
+                                limit:
+                                  description: Maximum number of lines allowed from
+                                    a group in rate_period time interval. The default
+                                    value of -1 doesn't throttle log files of that
+                                    group.
+                                  format: int32
+                                  type: integer
+                                match:
+                                  additionalProperties:
+                                    type: string
+                                  description: match parameter is used to check if
+                                    a file belongs to a particular group based on
+                                    hash keys (named captures from pattern) and hash
+                                    values (regexp in string)
+                                  type: object
+                              type: object
+                          required:
+                          - rule
+                          type: object
+                        ignoreRepeatedPermissionError:
+                          description: If you have to exclude the non-permission files
+                            from the watch list, set this parameter to true. It suppresses
+                            the repeated permission error logs.
+                          type: boolean
+                        limitRecentlyModified:
+                          description: Limits the watching files that the modification
+                            time is within the specified time range when using * in
+                            path.
+                          format: int32
+                          type: integer
+                        maxLineSize:
+                          description: The maximum length of a line. Longer lines
+                            than it will be just skipped.
+                          format: int32
+                          type: integer
+                        multilineFlushInterval:
+                          description: The interval of flushing the buffer for multiline
+                            format.
+                          format: int32
+                          type: integer
+                        openOnEveryUpdate:
+                          description: Opens and closes the file on every update instead
+                            of leaving it open until it gets rotated.
+                          type: boolean
+                        parse:
+                          description: Parse defines various parameters for the parse
+                            plugin
+                          properties:
+                            estimateCurrentEvent:
+                              description: If true, use Fluent::Eventnow(current time)
+                                as a timestamp when time_key is specified.
+                              type: boolean
+                            expression:
+                              description: Specifies the regular expression for matching
+                                logs. Regular expression also supports i and m suffix.
+                              type: string
+                            id:
+                              description: The @id parameter specifies a unique name
+                                for the configuration.
+                              type: string
+                            keepTimeKey:
+                              description: If true, keep time field in th record.
+                              type: boolean
+                            localtime:
+                              description: If true, uses local time.
+                              type: boolean
+                            logLevel:
+                              description: The @log_level parameter specifies the
+                                plugin-specific logging level
+                              type: string
+                            timeFormat:
+                              description: Process value according to the specified
+                                format. This is available only when time_type is *string
+                              type: string
+                            timeFormatFallbacks:
+                              description: Uses the specified time format as a fallback
+                                in the specified order. You can parse undetermined
+                                time format by using time_format_fallbacks. This options
+                                is enabled when time_type is mixed.
+                              type: string
+                            timeKey:
+                              description: Specify time field for event time. If the
+                                event doesn't have this field, current time is used.
+                              type: string
+                            timeType:
+                              description: parses/formats value according to this
+                                type, default is *string
+                              enum:
+                              - float
+                              - unixtime
+                              - '*string'
+                              - mixed
+                              type: string
+                            timeout:
+                              description: Specify timeout for parse processing.
+                              pattern: ^\d+(\.[0-9]{0,2})?(s|m|h|d)?$
+                              type: string
+                            timezone:
+                              description: Uses the specified timezone.
+                              type: string
+                            type:
+                              description: The @type parameter specifies the type
+                                of the plugin.
+                              enum:
+                              - regexp
+                              - apache2
+                              - apache_error
+                              - nginx
+                              - syslog
+                              - csv
+                              - tsv
+                              - ltsv
+                              - json
+                              - multiline
+                              - none
+                              type: string
+                            types:
+                              description: 'Specify types for converting field into
+                                another, i.e: types user_id:integer,paid:bool,paid_usd_amount:float'
+                              type: string
+                            utc:
+                              description: If true, uses UTC.
+                              type: boolean
+                          required:
+                          - type
+                          type: object
+                        path:
+                          description: The path(s) to read. Multiple paths can be
+                            specified, separated by comma ','.
+                          type: string
+                        pathKey:
+                          description: Adds the watching file path to the path_key
+                            field.
+                          type: string
+                        pathTimezone:
+                          description: This parameter is for strftime formatted path
+                            like /path/to/%Y/%m/%d/.
+                          type: string
+                        posFile:
+                          description: (recommended) Fluentd will record the position
+                            it last read from this file. pos_file handles multiple
+                            positions in one file so no need to have multiple pos_file
+                            parameters per source. Don't share pos_file between in_tail
+                            configurations. It causes unexpected behavior e.g. corrupt
+                            pos_file content.
+                          type: string
+                        posFileCompactionInterval:
+                          description: The interval of doing compaction of pos file.
+                          format: int32
+                          type: integer
+                        readBytesLimitPerSecond:
+                          description: The number of reading bytes per second to read
+                            with I/O operation. This value should be equal or greater
+                            than 8192.
+                          format: int32
+                          type: integer
+                        readFromHead:
+                          description: Starts to read the logs from the head of the
+                            file or the last read position recorded in pos_file, not
+                            tail.
+                          type: boolean
+                        readLinesLimit:
+                          description: The number of lines to read with each I/O operation.
+                          format: int32
+                          type: integer
+                        refreshInterval:
+                          description: The interval to refresh the list of watch files.
+                            This is used when the path includes *.
+                          format: int32
+                          type: integer
+                        rotateWait:
+                          description: in_tail actually does a bit more than tail
+                            -F itself. When rotating a file, some data may still need
+                            to be written to the old file as opposed to the new one.
+                            in_tail takes care of this by keeping a reference to the
+                            old file (even after it has been rotated) for some time
+                            before transitioning completely to the new file. This
+                            helps prevent data designated for the old file from getting
+                            lost. By default, this time interval is 5 seconds. The
+                            rotate_wait parameter accepts a single integer representing
+                            the number of seconds you want this time interval to be.
+                          format: int32
+                          type: integer
+                        skipRefreshOnStartup:
+                          description: Skips the refresh of the watch list on startup.
+                            This reduces the startup time when * is used in path.
+                          type: boolean
+                        tag:
+                          description: The tag of the event.
+                          type: string
+                      required:
+                      - parse
+                      - path
+                      - tag
+                      type: object
                   type: object
                 type: array
               image:
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml
index 5a5a402b2..43350b539 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml
@@ -1618,6 +1618,9 @@ spec:
                     stdout:
                       description: out_stdout plugin
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
diff --git a/config/crd/bases/fluentd.fluent.io_clusterfilters.yaml b/config/crd/bases/fluentd.fluent.io_clusterfilters.yaml
index 539c0e2ee..5b99a857c 100644
--- a/config/crd/bases/fluentd.fluent.io_clusterfilters.yaml
+++ b/config/crd/bases/fluentd.fluent.io_clusterfilters.yaml
@@ -427,6 +427,9 @@ spec:
                               type: string
                           type: object
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
diff --git a/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml
index c449f6cb5..933e37e3a 100644
--- a/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml
+++ b/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml
@@ -1618,6 +1618,9 @@ spec:
                     stdout:
                       description: out_stdout plugin
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
diff --git a/config/crd/bases/fluentd.fluent.io_filters.yaml b/config/crd/bases/fluentd.fluent.io_filters.yaml
index 84ecbe898..02345496d 100644
--- a/config/crd/bases/fluentd.fluent.io_filters.yaml
+++ b/config/crd/bases/fluentd.fluent.io_filters.yaml
@@ -427,6 +427,9 @@ spec:
                               type: string
                           type: object
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
index eced921de..5716cdaf8 100644
--- a/config/crd/bases/fluentd.fluent.io_fluentds.yaml
+++ b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
@@ -1859,6 +1859,266 @@ spec:
                       description: The @log_level parameter specifies the plugin-specific
                         logging level
                       type: string
+                    tail:
+                      description: in_tail plugin
+                      properties:
+                        emitUnmatchedLines:
+                          description: Emits unmatched lines when <parse> format is
+                            not matched for incoming logs.
+                          type: boolean
+                        enableStatWatcher:
+                          description: Enables the additional inotify-based watcher.
+                            Setting this parameter to false will disable the inotify
+                            events and use only timer watcher for file tailing. This
+                            option is mainly for avoiding the stuck issue with inotify.
+                          type: boolean
+                        enableWatchTimer:
+                          description: Enables the additional watch timer. Setting
+                            this parameter to false will significantly reduce CPU
+                            and I/O consumption when tailing a large number of files
+                            on systems with inotify support. The default is true which
+                            results in an additional 1 second timer being used.
+                          type: boolean
+                        encoding:
+                          description: Specifies the encoding of reading lines. By
+                            default, in_tail emits string value as ASCII-8BIT encoding.
+                            If encoding is specified, in_tail changes string to encoding.
+                            If encoding and fromEncoding both are specified, in_tail
+                            tries to encode string from fromEncoding to encoding.
+                          type: string
+                        excludePath:
+                          description: The paths excluded from the watcher list.
+                          items:
+                            type: string
+                          type: array
+                        followInodes:
+                          description: Avoid to read rotated files duplicately. You
+                            should set true when you use * or strftime format in path.
+                          type: boolean
+                        fromEncoding:
+                          description: Specifies the encoding of reading lines. By
+                            default, in_tail emits string value as ASCII-8BIT encoding.
+                            If encoding is specified, in_tail changes string to encoding.
+                            If encoding and fromEncoding both are specified, in_tail
+                            tries to encode string from fromEncoding to encoding.
+                          type: string
+                        group:
+                          description: The in_tail plugin can assign each log file
+                            to a group, based on user defined rules. The limit parameter
+                            controls the total number of lines collected for a group
+                            within a rate_period time interval.
+                          properties:
+                            pattern:
+                              description: Specifies the regular expression for extracting
+                                metadata (namespace, podname) from log file path.
+                                Default value of the pattern regexp extracts information
+                                about namespace, podname, docker_id, container of
+                                the log (K8s specific).
+                              type: string
+                            ratePeriod:
+                              description: Time period in which the group line limit
+                                is applied. in_tail resets the counter after every
+                                rate_period interval.
+                              format: int32
+                              type: integer
+                            rule:
+                              description: Grouping rules for log files.
+                              properties:
+                                limit:
+                                  description: Maximum number of lines allowed from
+                                    a group in rate_period time interval. The default
+                                    value of -1 doesn't throttle log files of that
+                                    group.
+                                  format: int32
+                                  type: integer
+                                match:
+                                  additionalProperties:
+                                    type: string
+                                  description: match parameter is used to check if
+                                    a file belongs to a particular group based on
+                                    hash keys (named captures from pattern) and hash
+                                    values (regexp in string)
+                                  type: object
+                              type: object
+                          required:
+                          - rule
+                          type: object
+                        ignoreRepeatedPermissionError:
+                          description: If you have to exclude the non-permission files
+                            from the watch list, set this parameter to true. It suppresses
+                            the repeated permission error logs.
+                          type: boolean
+                        limitRecentlyModified:
+                          description: Limits the watching files that the modification
+                            time is within the specified time range when using * in
+                            path.
+                          format: int32
+                          type: integer
+                        maxLineSize:
+                          description: The maximum length of a line. Longer lines
+                            than it will be just skipped.
+                          format: int32
+                          type: integer
+                        multilineFlushInterval:
+                          description: The interval of flushing the buffer for multiline
+                            format.
+                          format: int32
+                          type: integer
+                        openOnEveryUpdate:
+                          description: Opens and closes the file on every update instead
+                            of leaving it open until it gets rotated.
+                          type: boolean
+                        parse:
+                          description: Parse defines various parameters for the parse
+                            plugin
+                          properties:
+                            estimateCurrentEvent:
+                              description: If true, use Fluent::Eventnow(current time)
+                                as a timestamp when time_key is specified.
+                              type: boolean
+                            expression:
+                              description: Specifies the regular expression for matching
+                                logs. Regular expression also supports i and m suffix.
+                              type: string
+                            id:
+                              description: The @id parameter specifies a unique name
+                                for the configuration.
+                              type: string
+                            keepTimeKey:
+                              description: If true, keep time field in th record.
+                              type: boolean
+                            localtime:
+                              description: If true, uses local time.
+                              type: boolean
+                            logLevel:
+                              description: The @log_level parameter specifies the
+                                plugin-specific logging level
+                              type: string
+                            timeFormat:
+                              description: Process value according to the specified
+                                format. This is available only when time_type is *string
+                              type: string
+                            timeFormatFallbacks:
+                              description: Uses the specified time format as a fallback
+                                in the specified order. You can parse undetermined
+                                time format by using time_format_fallbacks. This options
+                                is enabled when time_type is mixed.
+                              type: string
+                            timeKey:
+                              description: Specify time field for event time. If the
+                                event doesn't have this field, current time is used.
+                              type: string
+                            timeType:
+                              description: parses/formats value according to this
+                                type, default is *string
+                              enum:
+                              - float
+                              - unixtime
+                              - '*string'
+                              - mixed
+                              type: string
+                            timeout:
+                              description: Specify timeout for parse processing.
+                              pattern: ^\d+(\.[0-9]{0,2})?(s|m|h|d)?$
+                              type: string
+                            timezone:
+                              description: Uses the specified timezone.
+                              type: string
+                            type:
+                              description: The @type parameter specifies the type
+                                of the plugin.
+                              enum:
+                              - regexp
+                              - apache2
+                              - apache_error
+                              - nginx
+                              - syslog
+                              - csv
+                              - tsv
+                              - ltsv
+                              - json
+                              - multiline
+                              - none
+                              type: string
+                            types:
+                              description: 'Specify types for converting field into
+                                another, i.e: types user_id:integer,paid:bool,paid_usd_amount:float'
+                              type: string
+                            utc:
+                              description: If true, uses UTC.
+                              type: boolean
+                          required:
+                          - type
+                          type: object
+                        path:
+                          description: The path(s) to read. Multiple paths can be
+                            specified, separated by comma ','.
+                          type: string
+                        pathKey:
+                          description: Adds the watching file path to the path_key
+                            field.
+                          type: string
+                        pathTimezone:
+                          description: This parameter is for strftime formatted path
+                            like /path/to/%Y/%m/%d/.
+                          type: string
+                        posFile:
+                          description: (recommended) Fluentd will record the position
+                            it last read from this file. pos_file handles multiple
+                            positions in one file so no need to have multiple pos_file
+                            parameters per source. Don't share pos_file between in_tail
+                            configurations. It causes unexpected behavior e.g. corrupt
+                            pos_file content.
+                          type: string
+                        posFileCompactionInterval:
+                          description: The interval of doing compaction of pos file.
+                          format: int32
+                          type: integer
+                        readBytesLimitPerSecond:
+                          description: The number of reading bytes per second to read
+                            with I/O operation. This value should be equal or greater
+                            than 8192.
+                          format: int32
+                          type: integer
+                        readFromHead:
+                          description: Starts to read the logs from the head of the
+                            file or the last read position recorded in pos_file, not
+                            tail.
+                          type: boolean
+                        readLinesLimit:
+                          description: The number of lines to read with each I/O operation.
+                          format: int32
+                          type: integer
+                        refreshInterval:
+                          description: The interval to refresh the list of watch files.
+                            This is used when the path includes *.
+                          format: int32
+                          type: integer
+                        rotateWait:
+                          description: in_tail actually does a bit more than tail
+                            -F itself. When rotating a file, some data may still need
+                            to be written to the old file as opposed to the new one.
+                            in_tail takes care of this by keeping a reference to the
+                            old file (even after it has been rotated) for some time
+                            before transitioning completely to the new file. This
+                            helps prevent data designated for the old file from getting
+                            lost. By default, this time interval is 5 seconds. The
+                            rotate_wait parameter accepts a single integer representing
+                            the number of seconds you want this time interval to be.
+                          format: int32
+                          type: integer
+                        skipRefreshOnStartup:
+                          description: Skips the refresh of the watch list on startup.
+                            This reduces the startup time when * is used in path.
+                          type: boolean
+                        tag:
+                          description: The tag of the event.
+                          type: string
+                      required:
+                      - parse
+                      - path
+                      - tag
+                      type: object
                   type: object
                 type: array
               image:
diff --git a/config/crd/bases/fluentd.fluent.io_outputs.yaml b/config/crd/bases/fluentd.fluent.io_outputs.yaml
index 5a5a402b2..43350b539 100644
--- a/config/crd/bases/fluentd.fluent.io_outputs.yaml
+++ b/config/crd/bases/fluentd.fluent.io_outputs.yaml
@@ -1618,6 +1618,9 @@ spec:
                     stdout:
                       description: out_stdout plugin
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
diff --git a/docs/plugins/fluentd/filter/types.md b/docs/plugins/fluentd/filter/types.md
index d96fa81cd..6654b27cd 100644
--- a/docs/plugins/fluentd/filter/types.md
+++ b/docs/plugins/fluentd/filter/types.md
@@ -6,6 +6,7 @@ FilterCommon defines the common parameters for the filter plugin.
 | Field | Description | Scheme |
 | ----- | ----------- | ------ |
 | logLevel | The @log_level parameter specifies the plugin-specific logging level | *string |
+| tag | Which tag to be matched. | *string |
 # Filter
 
 Filter defines all available filter plugins and their parameters.
diff --git a/docs/plugins/fluentd/input/tail.md b/docs/plugins/fluentd/input/tail.md
new file mode 100644
index 000000000..cfa82cfbe
--- /dev/null
+++ b/docs/plugins/fluentd/input/tail.md
@@ -0,0 +1,52 @@
+# Tail
+
+The in_tail Input plugin allows Fluentd to read events from the tail of text files. Its behavior is similar to the tail -F command.
+
+
+| Field | Description | Scheme |
+| ----- | ----------- | ------ |
+| tag | The tag of the event. | string |
+| path | The path(s) to read. Multiple paths can be specified, separated by comma ','. | string |
+| pathTimezone | This parameter is for strftime formatted path like /path/to/%Y/%m/%d/. | string |
+| excludePath | The paths excluded from the watcher list. | []string |
+| followInodes | Avoid to read rotated files duplicately. You should set true when you use * or strftime format in path. | *bool |
+| refreshInterval | The interval to refresh the list of watch files. This is used when the path includes *. | *uint32 |
+| limitRecentlyModified | Limits the watching files that the modification time is within the specified time range when using * in path. | *uint32 |
+| skipRefreshOnStartup | Skips the refresh of the watch list on startup. This reduces the startup time when * is used in path. | *bool |
+| readFromHead | Starts to read the logs from the head of the file or the last read position recorded in pos_file, not tail. | *bool |
+| encoding | Specifies the encoding of reading lines. By default, in_tail emits string value as ASCII-8BIT encoding. If encoding is specified, in_tail changes string to encoding. If encoding and fromEncoding both are specified, in_tail tries to encode string from fromEncoding to encoding. | string |
+| fromEncoding | Specifies the encoding of reading lines. By default, in_tail emits string value as ASCII-8BIT encoding. If encoding is specified, in_tail changes string to encoding. If encoding and fromEncoding both are specified, in_tail tries to encode string from fromEncoding to encoding. | string |
+| readLinesLimit | The number of lines to read with each I/O operation. | *int32 |
+| readBytesLimitPerSecond | The number of reading bytes per second to read with I/O operation. This value should be equal or greater than 8192. | *int32 |
+| maxLineSize | The maximum length of a line. Longer lines than it will be just skipped. | *int32 |
+| multilineFlushInterval | The interval of flushing the buffer for multiline format. | *uint32 |
+| posFile | (recommended) Fluentd will record the position it last read from this file. pos_file handles multiple positions in one file so no need to have multiple pos_file parameters per source. Don't share pos_file between in_tail configurations. It causes unexpected behavior e.g. corrupt pos_file content. | string |
+| posFileCompactionInterval | The interval of doing compaction of pos file. | *uint32 |
+| parse |  | *common.Parse |
+| pathKey | Adds the watching file path to the path_key field. | string |
+| rotateWait | in_tail actually does a bit more than tail -F itself. When rotating a file, some data may still need to be written to the old file as opposed to the new one. in_tail takes care of this by keeping a reference to the old file (even after it has been rotated) for some time before transitioning completely to the new file. This helps prevent data designated for the old file from getting lost. By default, this time interval is 5 seconds. The rotate_wait parameter accepts a single integer representing the number of seconds you want this time interval to be. | *uint32 |
+| enableWatchTimer | Enables the additional watch timer. Setting this parameter to false will significantly reduce CPU and I/O consumption when tailing a large number of files on systems with inotify support. The default is true which results in an additional 1 second timer being used. | *bool |
+| enableStatWatcher | Enables the additional inotify-based watcher. Setting this parameter to false will disable the inotify events and use only timer watcher for file tailing. This option is mainly for avoiding the stuck issue with inotify. | *bool |
+| openOnEveryUpdate | Opens and closes the file on every update instead of leaving it open until it gets rotated. | *bool |
+| emitUnmatchedLines | Emits unmatched lines when <parse> format is not matched for incoming logs. | *bool |
+| ignoreRepeatedPermissionError | If you have to exclude the non-permission files from the watch list, set this parameter to true. It suppresses the repeated permission error logs. | *bool |
+| group | The in_tail plugin can assign each log file to a group, based on user defined rules. The limit parameter controls the total number of lines collected for a group within a rate_period time interval. | *Group |
+# Group
+
+
+
+
+| Field | Description | Scheme |
+| ----- | ----------- | ------ |
+| pattern | Specifies the regular expression for extracting metadata (namespace, podname) from log file path. Default value of the pattern regexp extracts information about namespace, podname, docker_id, container of the log (K8s specific). | string |
+| ratePeriod | Time period in which the group line limit is applied. in_tail resets the counter after every rate_period interval. | *int32 |
+| rule | Grouping rules for log files. | *Rule |
+# Rule
+
+
+
+
+| Field | Description | Scheme |
+| ----- | ----------- | ------ |
+| match | match parameter is used to check if a file belongs to a particular group based on hash keys (named captures from pattern) and hash values (regexp in string) | map[string]string |
+| limit | Maximum number of lines allowed from a group in rate_period time interval. The default value of -1 doesn't throttle log files of that group. | *int32 |
diff --git a/docs/plugins/fluentd/input/types.md b/docs/plugins/fluentd/input/types.md
index c74307000..7f569b8af 100644
--- a/docs/plugins/fluentd/input/types.md
+++ b/docs/plugins/fluentd/input/types.md
@@ -17,3 +17,4 @@ Input defines all available input plugins and their parameters
 | ----- | ----------- | ------ |
 | forward | in_forward plugin | *Forward |
 | http | in_http plugin | *Http |
+| tail | in_tail plugin | *Tail |
diff --git a/docs/plugins/fluentd/output/types.md b/docs/plugins/fluentd/output/types.md
index ddcf05ddd..72c4aebcd 100644
--- a/docs/plugins/fluentd/output/types.md
+++ b/docs/plugins/fluentd/output/types.md
@@ -6,6 +6,7 @@ OutputCommon defines the common parameters for output plugin
 | Field | Description | Scheme |
 | ----- | ----------- | ------ |
 | logLevel | The @log_level parameter specifies the plugin-specific logging level | *string |
+| tag | Which tag to be matched. | *string |
 # Output
 
 Output defines all available output plugins and their parameters
diff --git a/go.mod b/go.mod
index dd2f8ffdd..122e33c01 100644
--- a/go.mod
+++ b/go.mod
@@ -58,12 +58,14 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
 	golang.org/x/sys v0.6.0 // indirect
 	golang.org/x/term v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.7.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
@@ -72,7 +74,9 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
+	k8s.io/code-generator v0.26.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
+	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
 	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
diff --git a/go.sum b/go.sum
index 297d484a9..609959a66 100644
--- a/go.sum
+++ b/go.sum
@@ -89,6 +89,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -349,6 +350,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 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.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
+golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -503,6 +506,7 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -513,6 +517,7 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -640,8 +645,13 @@ k8s.io/apimachinery v0.27.1 h1:EGuZiLI95UQQcClhanryclaQE6xjg1Bts6/L3cD7zyc=
 k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
 k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
 k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
+k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo=
+k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I=
 k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
 k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
+k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
 k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
@@ -657,5 +667,6 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index 977385a17..be55b6fe6 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -1150,6 +1150,9 @@ spec:
                               type: string
                           type: object
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
@@ -6388,6 +6391,9 @@ spec:
                     stdout:
                       description: out_stdout plugin
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
@@ -10914,6 +10920,9 @@ spec:
                               type: string
                           type: object
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
@@ -19433,6 +19442,266 @@ spec:
                       description: The @log_level parameter specifies the plugin-specific
                         logging level
                       type: string
+                    tail:
+                      description: in_tail plugin
+                      properties:
+                        emitUnmatchedLines:
+                          description: Emits unmatched lines when <parse> format is
+                            not matched for incoming logs.
+                          type: boolean
+                        enableStatWatcher:
+                          description: Enables the additional inotify-based watcher.
+                            Setting this parameter to false will disable the inotify
+                            events and use only timer watcher for file tailing. This
+                            option is mainly for avoiding the stuck issue with inotify.
+                          type: boolean
+                        enableWatchTimer:
+                          description: Enables the additional watch timer. Setting
+                            this parameter to false will significantly reduce CPU
+                            and I/O consumption when tailing a large number of files
+                            on systems with inotify support. The default is true which
+                            results in an additional 1 second timer being used.
+                          type: boolean
+                        encoding:
+                          description: Specifies the encoding of reading lines. By
+                            default, in_tail emits string value as ASCII-8BIT encoding.
+                            If encoding is specified, in_tail changes string to encoding.
+                            If encoding and fromEncoding both are specified, in_tail
+                            tries to encode string from fromEncoding to encoding.
+                          type: string
+                        excludePath:
+                          description: The paths excluded from the watcher list.
+                          items:
+                            type: string
+                          type: array
+                        followInodes:
+                          description: Avoid to read rotated files duplicately. You
+                            should set true when you use * or strftime format in path.
+                          type: boolean
+                        fromEncoding:
+                          description: Specifies the encoding of reading lines. By
+                            default, in_tail emits string value as ASCII-8BIT encoding.
+                            If encoding is specified, in_tail changes string to encoding.
+                            If encoding and fromEncoding both are specified, in_tail
+                            tries to encode string from fromEncoding to encoding.
+                          type: string
+                        group:
+                          description: The in_tail plugin can assign each log file
+                            to a group, based on user defined rules. The limit parameter
+                            controls the total number of lines collected for a group
+                            within a rate_period time interval.
+                          properties:
+                            pattern:
+                              description: Specifies the regular expression for extracting
+                                metadata (namespace, podname) from log file path.
+                                Default value of the pattern regexp extracts information
+                                about namespace, podname, docker_id, container of
+                                the log (K8s specific).
+                              type: string
+                            ratePeriod:
+                              description: Time period in which the group line limit
+                                is applied. in_tail resets the counter after every
+                                rate_period interval.
+                              format: int32
+                              type: integer
+                            rule:
+                              description: Grouping rules for log files.
+                              properties:
+                                limit:
+                                  description: Maximum number of lines allowed from
+                                    a group in rate_period time interval. The default
+                                    value of -1 doesn't throttle log files of that
+                                    group.
+                                  format: int32
+                                  type: integer
+                                match:
+                                  additionalProperties:
+                                    type: string
+                                  description: match parameter is used to check if
+                                    a file belongs to a particular group based on
+                                    hash keys (named captures from pattern) and hash
+                                    values (regexp in string)
+                                  type: object
+                              type: object
+                          required:
+                          - rule
+                          type: object
+                        ignoreRepeatedPermissionError:
+                          description: If you have to exclude the non-permission files
+                            from the watch list, set this parameter to true. It suppresses
+                            the repeated permission error logs.
+                          type: boolean
+                        limitRecentlyModified:
+                          description: Limits the watching files that the modification
+                            time is within the specified time range when using * in
+                            path.
+                          format: int32
+                          type: integer
+                        maxLineSize:
+                          description: The maximum length of a line. Longer lines
+                            than it will be just skipped.
+                          format: int32
+                          type: integer
+                        multilineFlushInterval:
+                          description: The interval of flushing the buffer for multiline
+                            format.
+                          format: int32
+                          type: integer
+                        openOnEveryUpdate:
+                          description: Opens and closes the file on every update instead
+                            of leaving it open until it gets rotated.
+                          type: boolean
+                        parse:
+                          description: Parse defines various parameters for the parse
+                            plugin
+                          properties:
+                            estimateCurrentEvent:
+                              description: If true, use Fluent::Eventnow(current time)
+                                as a timestamp when time_key is specified.
+                              type: boolean
+                            expression:
+                              description: Specifies the regular expression for matching
+                                logs. Regular expression also supports i and m suffix.
+                              type: string
+                            id:
+                              description: The @id parameter specifies a unique name
+                                for the configuration.
+                              type: string
+                            keepTimeKey:
+                              description: If true, keep time field in th record.
+                              type: boolean
+                            localtime:
+                              description: If true, uses local time.
+                              type: boolean
+                            logLevel:
+                              description: The @log_level parameter specifies the
+                                plugin-specific logging level
+                              type: string
+                            timeFormat:
+                              description: Process value according to the specified
+                                format. This is available only when time_type is *string
+                              type: string
+                            timeFormatFallbacks:
+                              description: Uses the specified time format as a fallback
+                                in the specified order. You can parse undetermined
+                                time format by using time_format_fallbacks. This options
+                                is enabled when time_type is mixed.
+                              type: string
+                            timeKey:
+                              description: Specify time field for event time. If the
+                                event doesn't have this field, current time is used.
+                              type: string
+                            timeType:
+                              description: parses/formats value according to this
+                                type, default is *string
+                              enum:
+                              - float
+                              - unixtime
+                              - '*string'
+                              - mixed
+                              type: string
+                            timeout:
+                              description: Specify timeout for parse processing.
+                              pattern: ^\d+(\.[0-9]{0,2})?(s|m|h|d)?$
+                              type: string
+                            timezone:
+                              description: Uses the specified timezone.
+                              type: string
+                            type:
+                              description: The @type parameter specifies the type
+                                of the plugin.
+                              enum:
+                              - regexp
+                              - apache2
+                              - apache_error
+                              - nginx
+                              - syslog
+                              - csv
+                              - tsv
+                              - ltsv
+                              - json
+                              - multiline
+                              - none
+                              type: string
+                            types:
+                              description: 'Specify types for converting field into
+                                another, i.e: types user_id:integer,paid:bool,paid_usd_amount:float'
+                              type: string
+                            utc:
+                              description: If true, uses UTC.
+                              type: boolean
+                          required:
+                          - type
+                          type: object
+                        path:
+                          description: The path(s) to read. Multiple paths can be
+                            specified, separated by comma ','.
+                          type: string
+                        pathKey:
+                          description: Adds the watching file path to the path_key
+                            field.
+                          type: string
+                        pathTimezone:
+                          description: This parameter is for strftime formatted path
+                            like /path/to/%Y/%m/%d/.
+                          type: string
+                        posFile:
+                          description: (recommended) Fluentd will record the position
+                            it last read from this file. pos_file handles multiple
+                            positions in one file so no need to have multiple pos_file
+                            parameters per source. Don't share pos_file between in_tail
+                            configurations. It causes unexpected behavior e.g. corrupt
+                            pos_file content.
+                          type: string
+                        posFileCompactionInterval:
+                          description: The interval of doing compaction of pos file.
+                          format: int32
+                          type: integer
+                        readBytesLimitPerSecond:
+                          description: The number of reading bytes per second to read
+                            with I/O operation. This value should be equal or greater
+                            than 8192.
+                          format: int32
+                          type: integer
+                        readFromHead:
+                          description: Starts to read the logs from the head of the
+                            file or the last read position recorded in pos_file, not
+                            tail.
+                          type: boolean
+                        readLinesLimit:
+                          description: The number of lines to read with each I/O operation.
+                          format: int32
+                          type: integer
+                        refreshInterval:
+                          description: The interval to refresh the list of watch files.
+                            This is used when the path includes *.
+                          format: int32
+                          type: integer
+                        rotateWait:
+                          description: in_tail actually does a bit more than tail
+                            -F itself. When rotating a file, some data may still need
+                            to be written to the old file as opposed to the new one.
+                            in_tail takes care of this by keeping a reference to the
+                            old file (even after it has been rotated) for some time
+                            before transitioning completely to the new file. This
+                            helps prevent data designated for the old file from getting
+                            lost. By default, this time interval is 5 seconds. The
+                            rotate_wait parameter accepts a single integer representing
+                            the number of seconds you want this time interval to be.
+                          format: int32
+                          type: integer
+                        skipRefreshOnStartup:
+                          description: Skips the refresh of the watch list on startup.
+                            This reduces the startup time when * is used in path.
+                          type: boolean
+                        tag:
+                          description: The tag of the event.
+                          type: string
+                      required:
+                      - parse
+                      - path
+                      - tag
+                      type: object
                   type: object
                 type: array
               image:
@@ -25992,6 +26261,9 @@ spec:
                     stdout:
                       description: out_stdout plugin
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index 7e5349e7f..0af306be5 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -1150,6 +1150,9 @@ spec:
                               type: string
                           type: object
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
@@ -6388,6 +6391,9 @@ spec:
                     stdout:
                       description: out_stdout plugin
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
@@ -10914,6 +10920,9 @@ spec:
                               type: string
                           type: object
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object
@@ -19433,6 +19442,266 @@ spec:
                       description: The @log_level parameter specifies the plugin-specific
                         logging level
                       type: string
+                    tail:
+                      description: in_tail plugin
+                      properties:
+                        emitUnmatchedLines:
+                          description: Emits unmatched lines when <parse> format is
+                            not matched for incoming logs.
+                          type: boolean
+                        enableStatWatcher:
+                          description: Enables the additional inotify-based watcher.
+                            Setting this parameter to false will disable the inotify
+                            events and use only timer watcher for file tailing. This
+                            option is mainly for avoiding the stuck issue with inotify.
+                          type: boolean
+                        enableWatchTimer:
+                          description: Enables the additional watch timer. Setting
+                            this parameter to false will significantly reduce CPU
+                            and I/O consumption when tailing a large number of files
+                            on systems with inotify support. The default is true which
+                            results in an additional 1 second timer being used.
+                          type: boolean
+                        encoding:
+                          description: Specifies the encoding of reading lines. By
+                            default, in_tail emits string value as ASCII-8BIT encoding.
+                            If encoding is specified, in_tail changes string to encoding.
+                            If encoding and fromEncoding both are specified, in_tail
+                            tries to encode string from fromEncoding to encoding.
+                          type: string
+                        excludePath:
+                          description: The paths excluded from the watcher list.
+                          items:
+                            type: string
+                          type: array
+                        followInodes:
+                          description: Avoid to read rotated files duplicately. You
+                            should set true when you use * or strftime format in path.
+                          type: boolean
+                        fromEncoding:
+                          description: Specifies the encoding of reading lines. By
+                            default, in_tail emits string value as ASCII-8BIT encoding.
+                            If encoding is specified, in_tail changes string to encoding.
+                            If encoding and fromEncoding both are specified, in_tail
+                            tries to encode string from fromEncoding to encoding.
+                          type: string
+                        group:
+                          description: The in_tail plugin can assign each log file
+                            to a group, based on user defined rules. The limit parameter
+                            controls the total number of lines collected for a group
+                            within a rate_period time interval.
+                          properties:
+                            pattern:
+                              description: Specifies the regular expression for extracting
+                                metadata (namespace, podname) from log file path.
+                                Default value of the pattern regexp extracts information
+                                about namespace, podname, docker_id, container of
+                                the log (K8s specific).
+                              type: string
+                            ratePeriod:
+                              description: Time period in which the group line limit
+                                is applied. in_tail resets the counter after every
+                                rate_period interval.
+                              format: int32
+                              type: integer
+                            rule:
+                              description: Grouping rules for log files.
+                              properties:
+                                limit:
+                                  description: Maximum number of lines allowed from
+                                    a group in rate_period time interval. The default
+                                    value of -1 doesn't throttle log files of that
+                                    group.
+                                  format: int32
+                                  type: integer
+                                match:
+                                  additionalProperties:
+                                    type: string
+                                  description: match parameter is used to check if
+                                    a file belongs to a particular group based on
+                                    hash keys (named captures from pattern) and hash
+                                    values (regexp in string)
+                                  type: object
+                              type: object
+                          required:
+                          - rule
+                          type: object
+                        ignoreRepeatedPermissionError:
+                          description: If you have to exclude the non-permission files
+                            from the watch list, set this parameter to true. It suppresses
+                            the repeated permission error logs.
+                          type: boolean
+                        limitRecentlyModified:
+                          description: Limits the watching files that the modification
+                            time is within the specified time range when using * in
+                            path.
+                          format: int32
+                          type: integer
+                        maxLineSize:
+                          description: The maximum length of a line. Longer lines
+                            than it will be just skipped.
+                          format: int32
+                          type: integer
+                        multilineFlushInterval:
+                          description: The interval of flushing the buffer for multiline
+                            format.
+                          format: int32
+                          type: integer
+                        openOnEveryUpdate:
+                          description: Opens and closes the file on every update instead
+                            of leaving it open until it gets rotated.
+                          type: boolean
+                        parse:
+                          description: Parse defines various parameters for the parse
+                            plugin
+                          properties:
+                            estimateCurrentEvent:
+                              description: If true, use Fluent::Eventnow(current time)
+                                as a timestamp when time_key is specified.
+                              type: boolean
+                            expression:
+                              description: Specifies the regular expression for matching
+                                logs. Regular expression also supports i and m suffix.
+                              type: string
+                            id:
+                              description: The @id parameter specifies a unique name
+                                for the configuration.
+                              type: string
+                            keepTimeKey:
+                              description: If true, keep time field in th record.
+                              type: boolean
+                            localtime:
+                              description: If true, uses local time.
+                              type: boolean
+                            logLevel:
+                              description: The @log_level parameter specifies the
+                                plugin-specific logging level
+                              type: string
+                            timeFormat:
+                              description: Process value according to the specified
+                                format. This is available only when time_type is *string
+                              type: string
+                            timeFormatFallbacks:
+                              description: Uses the specified time format as a fallback
+                                in the specified order. You can parse undetermined
+                                time format by using time_format_fallbacks. This options
+                                is enabled when time_type is mixed.
+                              type: string
+                            timeKey:
+                              description: Specify time field for event time. If the
+                                event doesn't have this field, current time is used.
+                              type: string
+                            timeType:
+                              description: parses/formats value according to this
+                                type, default is *string
+                              enum:
+                              - float
+                              - unixtime
+                              - '*string'
+                              - mixed
+                              type: string
+                            timeout:
+                              description: Specify timeout for parse processing.
+                              pattern: ^\d+(\.[0-9]{0,2})?(s|m|h|d)?$
+                              type: string
+                            timezone:
+                              description: Uses the specified timezone.
+                              type: string
+                            type:
+                              description: The @type parameter specifies the type
+                                of the plugin.
+                              enum:
+                              - regexp
+                              - apache2
+                              - apache_error
+                              - nginx
+                              - syslog
+                              - csv
+                              - tsv
+                              - ltsv
+                              - json
+                              - multiline
+                              - none
+                              type: string
+                            types:
+                              description: 'Specify types for converting field into
+                                another, i.e: types user_id:integer,paid:bool,paid_usd_amount:float'
+                              type: string
+                            utc:
+                              description: If true, uses UTC.
+                              type: boolean
+                          required:
+                          - type
+                          type: object
+                        path:
+                          description: The path(s) to read. Multiple paths can be
+                            specified, separated by comma ','.
+                          type: string
+                        pathKey:
+                          description: Adds the watching file path to the path_key
+                            field.
+                          type: string
+                        pathTimezone:
+                          description: This parameter is for strftime formatted path
+                            like /path/to/%Y/%m/%d/.
+                          type: string
+                        posFile:
+                          description: (recommended) Fluentd will record the position
+                            it last read from this file. pos_file handles multiple
+                            positions in one file so no need to have multiple pos_file
+                            parameters per source. Don't share pos_file between in_tail
+                            configurations. It causes unexpected behavior e.g. corrupt
+                            pos_file content.
+                          type: string
+                        posFileCompactionInterval:
+                          description: The interval of doing compaction of pos file.
+                          format: int32
+                          type: integer
+                        readBytesLimitPerSecond:
+                          description: The number of reading bytes per second to read
+                            with I/O operation. This value should be equal or greater
+                            than 8192.
+                          format: int32
+                          type: integer
+                        readFromHead:
+                          description: Starts to read the logs from the head of the
+                            file or the last read position recorded in pos_file, not
+                            tail.
+                          type: boolean
+                        readLinesLimit:
+                          description: The number of lines to read with each I/O operation.
+                          format: int32
+                          type: integer
+                        refreshInterval:
+                          description: The interval to refresh the list of watch files.
+                            This is used when the path includes *.
+                          format: int32
+                          type: integer
+                        rotateWait:
+                          description: in_tail actually does a bit more than tail
+                            -F itself. When rotating a file, some data may still need
+                            to be written to the old file as opposed to the new one.
+                            in_tail takes care of this by keeping a reference to the
+                            old file (even after it has been rotated) for some time
+                            before transitioning completely to the new file. This
+                            helps prevent data designated for the old file from getting
+                            lost. By default, this time interval is 5 seconds. The
+                            rotate_wait parameter accepts a single integer representing
+                            the number of seconds you want this time interval to be.
+                          format: int32
+                          type: integer
+                        skipRefreshOnStartup:
+                          description: Skips the refresh of the watch list on startup.
+                            This reduces the startup time when * is used in path.
+                          type: boolean
+                        tag:
+                          description: The tag of the event.
+                          type: string
+                      required:
+                      - parse
+                      - path
+                      - tag
+                      type: object
                   type: object
                 type: array
               image:
@@ -25992,6 +26261,9 @@ spec:
                     stdout:
                       description: out_stdout plugin
                       type: object
+                    tag:
+                      description: Which tag to be matched.
+                      type: string
                   type: object
                 type: array
             type: object

From b124028cc3330f6c544a8a9964bdcb8b2a9ee3ed Mon Sep 17 00:00:00 2001
From: flxman <felix.farjsjo@gmail.com>
Date: Wed, 24 May 2023 15:51:49 +0200
Subject: [PATCH 34/78] Align CRDs and Operator with the fluentbit loki output 
 (#756)

* Align CRDs and Operator with fluentbit Loki output plugin

Signed-off-by: flxman <felix.farjsjo@gmail.com>

* Run make manifest/generate

Signed-off-by: flxman <felix.farjsjo@gmail.com>

---------

Signed-off-by: flxman <felix.farjsjo@gmail.com>
---
 .../v1alpha2/plugins/output/loki_types.go     | 22 +++++++++
 .../plugins/output/zz_generated.deepcopy.go   |  5 ++
 .../clientset/versioned/fake/register.go      | 14 +++---
 .../clientset/versioned/scheme/register.go    | 14 +++---
 .../fluentbit.fluent.io_clusteroutputs.yaml   | 23 ++++++++++
 .../crds/fluentbit.fluent.io_outputs.yaml     | 23 ++++++++++
 .../fluentbit.fluent.io_clusteroutputs.yaml   | 23 ++++++++++
 .../bases/fluentbit.fluent.io_outputs.yaml    | 23 ++++++++++
 go.mod                                        |  4 ++
 go.sum                                        | 11 +++++
 manifests/setup/fluent-operator-crd.yaml      | 46 +++++++++++++++++++
 manifests/setup/setup.yaml                    | 46 +++++++++++++++++++
 12 files changed, 240 insertions(+), 14 deletions(-)

diff --git a/apis/fluentbit/v1alpha2/plugins/output/loki_types.go b/apis/fluentbit/v1alpha2/plugins/output/loki_types.go
index 58f5a3b92..2c104de68 100644
--- a/apis/fluentbit/v1alpha2/plugins/output/loki_types.go
+++ b/apis/fluentbit/v1alpha2/plugins/output/loki_types.go
@@ -33,6 +33,13 @@ type Loki struct {
 	// Optional list of record keys that will be placed as stream labels.
 	// This configuration property is for records key only.
 	LabelKeys []string `json:"labelKeys,omitempty"`
+	// Specify the label map file path. The file defines how to extract labels from each record.
+	LabelMapPath string `json:"labelMapPath,omitempty"`
+	// Optional list of keys to remove.
+	RemoveKeys []string `json:"removeKeys,omitempty"`
+	// If set to true and after extracting labels only a single key remains, the log line sent to Loki will be the value of that key in line_format.
+	// +kubebuilder:validation:Enum:=on;off
+	DropSingleKey string `json:"dropSingleKey,omitempty"`
 	// Format to use when flattening the record to a log line. Valid values are json or key_value.
 	// If set to json,  the log line sent to Loki will be the Fluent Bit record dumped as JSON.
 	// If set to key_value, the log line will be each item in the record concatenated together (separated by a single space) in the format.
@@ -41,6 +48,9 @@ type Loki struct {
 	// If set to true, it will add all Kubernetes labels to the Stream labels.
 	// +kubebuilder:validation:Enum:=on;off
 	AutoKubernetesLabels string `json:"autoKubernetesLabels,omitempty"`
+	// Specify the name of the key from the original record that contains the Tenant ID. 
+	// The value of the key is set as X-Scope-OrgID of HTTP header. It is useful to set Tenant ID dynamically.
+	TenantIDKey string `json:"tenantIDKey,omitempty"`
 	*plugins.TLS         `json:"tls,omitempty"`
 }
 
@@ -85,12 +95,24 @@ func (l *Loki) Params(sl plugins.SecretLoader) (*params.KVs, error) {
 	if l.LabelKeys != nil && len(l.LabelKeys) > 0 {
 		kvs.Insert("label_keys", utils.ConcatString(l.LabelKeys, ","))
 	}
+	if l.LabelMapPath != "" {
+		kvs.Insert("label_map_path", l.LabelMapPath)
+	}
+	if l.RemoveKeys != nil && len(l.RemoveKeys) > 0 {
+		kvs.Insert("remove_keys", utils.ConcatString(l.RemoveKeys, ","))
+	}
+	if l.DropSingleKey != "" {
+		kvs.Insert("drop_single_key", l.DropSingleKey)
+	}
 	if l.LineFormat != "" {
 		kvs.Insert("line_format", l.LineFormat)
 	}
 	if l.AutoKubernetesLabels != "" {
 		kvs.Insert("auto_kubernetes_labels", l.AutoKubernetesLabels)
 	}
+	if l.TenantIDKey != "" {
+		kvs.Insert("tenant_id_key", l.TenantIDKey)
+	}
 	if l.TLS != nil {
 		tls, err := l.TLS.Params(sl)
 		if err != nil {
diff --git a/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
index d4a6544f5..195e25e95 100644
--- a/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
+++ b/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
@@ -512,6 +512,11 @@ func (in *Loki) DeepCopyInto(out *Loki) {
 		*out = make([]string, len(*in))
 		copy(*out, *in)
 	}
+	if in.RemoveKeys != nil {
+		in, out := &in.RemoveKeys, &out.RemoveKeys
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
 	if in.TLS != nil {
 		in, out := &in.TLS, &out.TLS
 		*out = new(plugins.TLS)
diff --git a/apis/generated/clientset/versioned/fake/register.go b/apis/generated/clientset/versioned/fake/register.go
index 733f848f2..bca854472 100644
--- a/apis/generated/clientset/versioned/fake/register.go
+++ b/apis/generated/clientset/versioned/fake/register.go
@@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:
 //
-//	import (
-//	  "k8s.io/client-go/kubernetes"
-//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-//	)
+//   import (
+//     "k8s.io/client-go/kubernetes"
+//     clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//     aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//   )
 //
-//	kclientset, _ := kubernetes.NewForConfig(c)
-//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   kclientset, _ := kubernetes.NewForConfig(c)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
diff --git a/apis/generated/clientset/versioned/scheme/register.go b/apis/generated/clientset/versioned/scheme/register.go
index 2c72f75c3..3ed90362c 100644
--- a/apis/generated/clientset/versioned/scheme/register.go
+++ b/apis/generated/clientset/versioned/scheme/register.go
@@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:
 //
-//	import (
-//	  "k8s.io/client-go/kubernetes"
-//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-//	)
+//   import (
+//     "k8s.io/client-go/kubernetes"
+//     clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//     aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//   )
 //
-//	kclientset, _ := kubernetes.NewForConfig(c)
-//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   kclientset, _ := kubernetes.NewForConfig(c)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
index 1a479bca8..f4c606956 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
@@ -1319,6 +1319,14 @@ spec:
                     - "on"
                     - "off"
                     type: string
+                  dropSingleKey:
+                    description: If set to true and after extracting labels only a
+                      single key remains, the log line sent to Loki will be the value
+                      of that key in line_format.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   host:
                     description: Loki hostname or IP address.
                     type: string
@@ -1386,6 +1394,10 @@ spec:
                     items:
                       type: string
                     type: array
+                  labelMapPath:
+                    description: Specify the label map file path. The file defines
+                      how to extract labels from each record.
+                    type: string
                   labels:
                     description: Stream labels for API request. It can be multiple
                       comma separated of strings specifying  key=value pairs. In addition
@@ -1411,6 +1423,11 @@ spec:
                     maximum: 65535
                     minimum: 1
                     type: integer
+                  removeKeys:
+                    description: Optional list of keys to remove.
+                    items:
+                      type: string
+                    type: array
                   tenantID:
                     description: Tenant ID used by default to push logs to Loki. If
                       omitted or empty it assumes Loki is running in single-tenant
@@ -1441,6 +1458,12 @@ spec:
                             x-kubernetes-map-type: atomic
                         type: object
                     type: object
+                  tenantIDKey:
+                    description: Specify the name of the key from the original record
+                      that contains the Tenant ID. The value of the key is set as
+                      X-Scope-OrgID of HTTP header. It is useful to set Tenant ID
+                      dynamically.
+                    type: string
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
index 2811de1f4..a1b8f7786 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
@@ -1319,6 +1319,14 @@ spec:
                     - "on"
                     - "off"
                     type: string
+                  dropSingleKey:
+                    description: If set to true and after extracting labels only a
+                      single key remains, the log line sent to Loki will be the value
+                      of that key in line_format.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   host:
                     description: Loki hostname or IP address.
                     type: string
@@ -1386,6 +1394,10 @@ spec:
                     items:
                       type: string
                     type: array
+                  labelMapPath:
+                    description: Specify the label map file path. The file defines
+                      how to extract labels from each record.
+                    type: string
                   labels:
                     description: Stream labels for API request. It can be multiple
                       comma separated of strings specifying  key=value pairs. In addition
@@ -1411,6 +1423,11 @@ spec:
                     maximum: 65535
                     minimum: 1
                     type: integer
+                  removeKeys:
+                    description: Optional list of keys to remove.
+                    items:
+                      type: string
+                    type: array
                   tenantID:
                     description: Tenant ID used by default to push logs to Loki. If
                       omitted or empty it assumes Loki is running in single-tenant
@@ -1441,6 +1458,12 @@ spec:
                             x-kubernetes-map-type: atomic
                         type: object
                     type: object
+                  tenantIDKey:
+                    description: Specify the name of the key from the original record
+                      that contains the Tenant ID. The value of the key is set as
+                      X-Scope-OrgID of HTTP header. It is useful to set Tenant ID
+                      dynamically.
+                    type: string
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer
diff --git a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
index 1a479bca8..f4c606956 100644
--- a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
@@ -1319,6 +1319,14 @@ spec:
                     - "on"
                     - "off"
                     type: string
+                  dropSingleKey:
+                    description: If set to true and after extracting labels only a
+                      single key remains, the log line sent to Loki will be the value
+                      of that key in line_format.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   host:
                     description: Loki hostname or IP address.
                     type: string
@@ -1386,6 +1394,10 @@ spec:
                     items:
                       type: string
                     type: array
+                  labelMapPath:
+                    description: Specify the label map file path. The file defines
+                      how to extract labels from each record.
+                    type: string
                   labels:
                     description: Stream labels for API request. It can be multiple
                       comma separated of strings specifying  key=value pairs. In addition
@@ -1411,6 +1423,11 @@ spec:
                     maximum: 65535
                     minimum: 1
                     type: integer
+                  removeKeys:
+                    description: Optional list of keys to remove.
+                    items:
+                      type: string
+                    type: array
                   tenantID:
                     description: Tenant ID used by default to push logs to Loki. If
                       omitted or empty it assumes Loki is running in single-tenant
@@ -1441,6 +1458,12 @@ spec:
                             x-kubernetes-map-type: atomic
                         type: object
                     type: object
+                  tenantIDKey:
+                    description: Specify the name of the key from the original record
+                      that contains the Tenant ID. The value of the key is set as
+                      X-Scope-OrgID of HTTP header. It is useful to set Tenant ID
+                      dynamically.
+                    type: string
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer
diff --git a/config/crd/bases/fluentbit.fluent.io_outputs.yaml b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
index 2811de1f4..a1b8f7786 100644
--- a/config/crd/bases/fluentbit.fluent.io_outputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
@@ -1319,6 +1319,14 @@ spec:
                     - "on"
                     - "off"
                     type: string
+                  dropSingleKey:
+                    description: If set to true and after extracting labels only a
+                      single key remains, the log line sent to Loki will be the value
+                      of that key in line_format.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   host:
                     description: Loki hostname or IP address.
                     type: string
@@ -1386,6 +1394,10 @@ spec:
                     items:
                       type: string
                     type: array
+                  labelMapPath:
+                    description: Specify the label map file path. The file defines
+                      how to extract labels from each record.
+                    type: string
                   labels:
                     description: Stream labels for API request. It can be multiple
                       comma separated of strings specifying  key=value pairs. In addition
@@ -1411,6 +1423,11 @@ spec:
                     maximum: 65535
                     minimum: 1
                     type: integer
+                  removeKeys:
+                    description: Optional list of keys to remove.
+                    items:
+                      type: string
+                    type: array
                   tenantID:
                     description: Tenant ID used by default to push logs to Loki. If
                       omitted or empty it assumes Loki is running in single-tenant
@@ -1441,6 +1458,12 @@ spec:
                             x-kubernetes-map-type: atomic
                         type: object
                     type: object
+                  tenantIDKey:
+                    description: Specify the name of the key from the original record
+                      that contains the Tenant ID. The value of the key is set as
+                      X-Scope-OrgID of HTTP header. It is useful to set Tenant ID
+                      dynamically.
+                    type: string
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer
diff --git a/go.mod b/go.mod
index dd2f8ffdd..122e33c01 100644
--- a/go.mod
+++ b/go.mod
@@ -58,12 +58,14 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
 	golang.org/x/sys v0.6.0 // indirect
 	golang.org/x/term v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.7.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
@@ -72,7 +74,9 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
+	k8s.io/code-generator v0.26.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
+	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
 	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
diff --git a/go.sum b/go.sum
index 297d484a9..609959a66 100644
--- a/go.sum
+++ b/go.sum
@@ -89,6 +89,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -349,6 +350,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 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.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
+golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -503,6 +506,7 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -513,6 +517,7 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -640,8 +645,13 @@ k8s.io/apimachinery v0.27.1 h1:EGuZiLI95UQQcClhanryclaQE6xjg1Bts6/L3cD7zyc=
 k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
 k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
 k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
+k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo=
+k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I=
 k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
 k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
+k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
 k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
@@ -657,5 +667,6 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index 977385a17..4efca5d95 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -3329,6 +3329,14 @@ spec:
                     - "on"
                     - "off"
                     type: string
+                  dropSingleKey:
+                    description: If set to true and after extracting labels only a
+                      single key remains, the log line sent to Loki will be the value
+                      of that key in line_format.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   host:
                     description: Loki hostname or IP address.
                     type: string
@@ -3396,6 +3404,10 @@ spec:
                     items:
                       type: string
                     type: array
+                  labelMapPath:
+                    description: Specify the label map file path. The file defines
+                      how to extract labels from each record.
+                    type: string
                   labels:
                     description: Stream labels for API request. It can be multiple
                       comma separated of strings specifying  key=value pairs. In addition
@@ -3421,6 +3433,11 @@ spec:
                     maximum: 65535
                     minimum: 1
                     type: integer
+                  removeKeys:
+                    description: Optional list of keys to remove.
+                    items:
+                      type: string
+                    type: array
                   tenantID:
                     description: Tenant ID used by default to push logs to Loki. If
                       omitted or empty it assumes Loki is running in single-tenant
@@ -3451,6 +3468,12 @@ spec:
                             x-kubernetes-map-type: atomic
                         type: object
                     type: object
+                  tenantIDKey:
+                    description: Specify the name of the key from the original record
+                      that contains the Tenant ID. The value of the key is set as
+                      X-Scope-OrgID of HTTP header. It is useful to set Tenant ID
+                      dynamically.
+                    type: string
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer
@@ -22933,6 +22956,14 @@ spec:
                     - "on"
                     - "off"
                     type: string
+                  dropSingleKey:
+                    description: If set to true and after extracting labels only a
+                      single key remains, the log line sent to Loki will be the value
+                      of that key in line_format.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   host:
                     description: Loki hostname or IP address.
                     type: string
@@ -23000,6 +23031,10 @@ spec:
                     items:
                       type: string
                     type: array
+                  labelMapPath:
+                    description: Specify the label map file path. The file defines
+                      how to extract labels from each record.
+                    type: string
                   labels:
                     description: Stream labels for API request. It can be multiple
                       comma separated of strings specifying  key=value pairs. In addition
@@ -23025,6 +23060,11 @@ spec:
                     maximum: 65535
                     minimum: 1
                     type: integer
+                  removeKeys:
+                    description: Optional list of keys to remove.
+                    items:
+                      type: string
+                    type: array
                   tenantID:
                     description: Tenant ID used by default to push logs to Loki. If
                       omitted or empty it assumes Loki is running in single-tenant
@@ -23055,6 +23095,12 @@ spec:
                             x-kubernetes-map-type: atomic
                         type: object
                     type: object
+                  tenantIDKey:
+                    description: Specify the name of the key from the original record
+                      that contains the Tenant ID. The value of the key is set as
+                      X-Scope-OrgID of HTTP header. It is useful to set Tenant ID
+                      dynamically.
+                    type: string
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index 7e5349e7f..c04210cdb 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -3329,6 +3329,14 @@ spec:
                     - "on"
                     - "off"
                     type: string
+                  dropSingleKey:
+                    description: If set to true and after extracting labels only a
+                      single key remains, the log line sent to Loki will be the value
+                      of that key in line_format.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   host:
                     description: Loki hostname or IP address.
                     type: string
@@ -3396,6 +3404,10 @@ spec:
                     items:
                       type: string
                     type: array
+                  labelMapPath:
+                    description: Specify the label map file path. The file defines
+                      how to extract labels from each record.
+                    type: string
                   labels:
                     description: Stream labels for API request. It can be multiple
                       comma separated of strings specifying  key=value pairs. In addition
@@ -3421,6 +3433,11 @@ spec:
                     maximum: 65535
                     minimum: 1
                     type: integer
+                  removeKeys:
+                    description: Optional list of keys to remove.
+                    items:
+                      type: string
+                    type: array
                   tenantID:
                     description: Tenant ID used by default to push logs to Loki. If
                       omitted or empty it assumes Loki is running in single-tenant
@@ -3451,6 +3468,12 @@ spec:
                             x-kubernetes-map-type: atomic
                         type: object
                     type: object
+                  tenantIDKey:
+                    description: Specify the name of the key from the original record
+                      that contains the Tenant ID. The value of the key is set as
+                      X-Scope-OrgID of HTTP header. It is useful to set Tenant ID
+                      dynamically.
+                    type: string
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer
@@ -22933,6 +22956,14 @@ spec:
                     - "on"
                     - "off"
                     type: string
+                  dropSingleKey:
+                    description: If set to true and after extracting labels only a
+                      single key remains, the log line sent to Loki will be the value
+                      of that key in line_format.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   host:
                     description: Loki hostname or IP address.
                     type: string
@@ -23000,6 +23031,10 @@ spec:
                     items:
                       type: string
                     type: array
+                  labelMapPath:
+                    description: Specify the label map file path. The file defines
+                      how to extract labels from each record.
+                    type: string
                   labels:
                     description: Stream labels for API request. It can be multiple
                       comma separated of strings specifying  key=value pairs. In addition
@@ -23025,6 +23060,11 @@ spec:
                     maximum: 65535
                     minimum: 1
                     type: integer
+                  removeKeys:
+                    description: Optional list of keys to remove.
+                    items:
+                      type: string
+                    type: array
                   tenantID:
                     description: Tenant ID used by default to push logs to Loki. If
                       omitted or empty it assumes Loki is running in single-tenant
@@ -23055,6 +23095,12 @@ spec:
                             x-kubernetes-map-type: atomic
                         type: object
                     type: object
+                  tenantIDKey:
+                    description: Specify the name of the key from the original record
+                      that contains the Tenant ID. The value of the key is set as
+                      X-Scope-OrgID of HTTP header. It is useful to set Tenant ID
+                      dynamically.
+                    type: string
                   tls:
                     description: Fluent Bit provides integrated support for Transport
                       Layer Security (TLS) and it predecessor Secure Sockets Layer

From 70078ed9365844e4a0132d3178765ef3957aa8a0 Mon Sep 17 00:00:00 2001
From: Jedrzej Kotkowski <jedrzejk143@gmail.com>
Date: Wed, 24 May 2023 19:52:28 +0200
Subject: [PATCH 35/78] add missing fluentd buffer options

Signed-off-by: Jedrzej Kotkowski <jedrzejk143@gmail.com>
---
 .../v1alpha2/plugins/custom/custom_types.go        |  2 +-
 .../v1alpha2/plugins/output/loki_types.go          |  6 +++---
 .../v1alpha1/plugins/common/buffer_types.go        |  8 ++++++++
 apis/fluentd/v1alpha1/plugins/input/tail.go        |  1 +
 .../generated/clientset/versioned/fake/register.go | 14 +++++++-------
 .../clientset/versioned/scheme/register.go         | 14 +++++++-------
 docs/plugins/fluentbit/custom/custom.md            |  2 +-
 docs/plugins/fluentbit/output/loki.md              |  4 ++++
 8 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/apis/fluentbit/v1alpha2/plugins/custom/custom_types.go b/apis/fluentbit/v1alpha2/plugins/custom/custom_types.go
index fc993933a..ab3dbb8b0 100644
--- a/apis/fluentbit/v1alpha2/plugins/custom/custom_types.go
+++ b/apis/fluentbit/v1alpha2/plugins/custom/custom_types.go
@@ -13,7 +13,7 @@ import (
 // +kubebuilder:object:generate:=true
 
 // CustomPlugin is used to support filter plugins that are not implemented yet. <br />
-// **For example usage, refer to https://github.com/jjsiv/fluent-operator/blob/master/docs/best-practice/custom-plugin.md**
+// **For example usage, refer to https://github.com/fluent/fluent-operator/blob/master/docs/best-practice/custom-plugin.md**
 type CustomPlugin struct {
 	Config string `json:"config,omitempty"`
 }
diff --git a/apis/fluentbit/v1alpha2/plugins/output/loki_types.go b/apis/fluentbit/v1alpha2/plugins/output/loki_types.go
index 2c104de68..2e95eae09 100644
--- a/apis/fluentbit/v1alpha2/plugins/output/loki_types.go
+++ b/apis/fluentbit/v1alpha2/plugins/output/loki_types.go
@@ -48,10 +48,10 @@ type Loki struct {
 	// If set to true, it will add all Kubernetes labels to the Stream labels.
 	// +kubebuilder:validation:Enum:=on;off
 	AutoKubernetesLabels string `json:"autoKubernetesLabels,omitempty"`
-	// Specify the name of the key from the original record that contains the Tenant ID. 
+	// Specify the name of the key from the original record that contains the Tenant ID.
 	// The value of the key is set as X-Scope-OrgID of HTTP header. It is useful to set Tenant ID dynamically.
-	TenantIDKey string `json:"tenantIDKey,omitempty"`
-	*plugins.TLS         `json:"tls,omitempty"`
+	TenantIDKey  string `json:"tenantIDKey,omitempty"`
+	*plugins.TLS `json:"tls,omitempty"`
 }
 
 // implement Section() method
diff --git a/apis/fluentd/v1alpha1/plugins/common/buffer_types.go b/apis/fluentd/v1alpha1/plugins/common/buffer_types.go
index 48b719113..bda6a9565 100644
--- a/apis/fluentd/v1alpha1/plugins/common/buffer_types.go
+++ b/apis/fluentd/v1alpha1/plugins/common/buffer_types.go
@@ -261,6 +261,14 @@ func (b *Buffer) Params(_ plugins.SecretLoader) (*params.PluginStore, error) {
 		ps.InsertPairs("retry_type", fmt.Sprint(*b.RetryType))
 	}
 
+	if b.RetryMaxTimes != nil {
+		ps.InsertPairs("retry_max_times", fmt.Sprint(*b.RetryMaxTimes))
+	}
+
+	if b.RetryForever != nil {
+		ps.InsertPairs("retry_forever", fmt.Sprint(*b.RetryForever))
+	}
+
 	if b.RetryWait != nil {
 		ps.InsertPairs("retry_wait", fmt.Sprint(*b.RetryWait))
 	}
diff --git a/apis/fluentd/v1alpha1/plugins/input/tail.go b/apis/fluentd/v1alpha1/plugins/input/tail.go
index d3e4bd31b..3e5388018 100644
--- a/apis/fluentd/v1alpha1/plugins/input/tail.go
+++ b/apis/fluentd/v1alpha1/plugins/input/tail.go
@@ -8,6 +8,7 @@ import (
 	"github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/common"
 	"github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params"
 )
+
 // The in_tail Input plugin allows Fluentd to read events from the tail of text files. Its behavior is similar to the tail -F command.
 type Tail struct {
 	// +kubebuilder:validation:Required
diff --git a/apis/generated/clientset/versioned/fake/register.go b/apis/generated/clientset/versioned/fake/register.go
index bca854472..733f848f2 100644
--- a/apis/generated/clientset/versioned/fake/register.go
+++ b/apis/generated/clientset/versioned/fake/register.go
@@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:
 //
-//   import (
-//     "k8s.io/client-go/kubernetes"
-//     clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-//     aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-//   )
+//	import (
+//	  "k8s.io/client-go/kubernetes"
+//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//	)
 //
-//   kclientset, _ := kubernetes.NewForConfig(c)
-//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//	kclientset, _ := kubernetes.NewForConfig(c)
+//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
diff --git a/apis/generated/clientset/versioned/scheme/register.go b/apis/generated/clientset/versioned/scheme/register.go
index 3ed90362c..2c72f75c3 100644
--- a/apis/generated/clientset/versioned/scheme/register.go
+++ b/apis/generated/clientset/versioned/scheme/register.go
@@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:
 //
-//   import (
-//     "k8s.io/client-go/kubernetes"
-//     clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-//     aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-//   )
+//	import (
+//	  "k8s.io/client-go/kubernetes"
+//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//	)
 //
-//   kclientset, _ := kubernetes.NewForConfig(c)
-//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//	kclientset, _ := kubernetes.NewForConfig(c)
+//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
diff --git a/docs/plugins/fluentbit/custom/custom.md b/docs/plugins/fluentbit/custom/custom.md
index c759a1123..8e4a2fc70 100644
--- a/docs/plugins/fluentbit/custom/custom.md
+++ b/docs/plugins/fluentbit/custom/custom.md
@@ -1,6 +1,6 @@
 # CustomPlugin
 
-CustomPlugin is used to support filter plugins that are not implemented yet. <br /> **For example usage, refer to https://github.com/jjsiv/fluent-operator/blob/master/docs/best-practice/custom-plugin.md**
+CustomPlugin is used to support filter plugins that are not implemented yet. <br /> **For example usage, refer to https://github.com/fluent/fluent-operator/blob/master/docs/best-practice/custom-plugin.md**
 
 
 | Field | Description | Scheme |
diff --git a/docs/plugins/fluentbit/output/loki.md b/docs/plugins/fluentbit/output/loki.md
index cb3c40312..bba70c603 100644
--- a/docs/plugins/fluentbit/output/loki.md
+++ b/docs/plugins/fluentbit/output/loki.md
@@ -12,6 +12,10 @@ The loki output plugin, allows to ingest your records into a Loki service. <br /
 | tenantID | Tenant ID used by default to push logs to Loki. If omitted or empty it assumes Loki is running in single-tenant mode and no X-Scope-OrgID header is sent. | *[plugins.Secret](../secret.md) |
 | labels | Stream labels for API request. It can be multiple comma separated of strings specifying  key=value pairs. In addition to fixed parameters, it also allows to add custom record keys (similar to label_keys property). | []string |
 | labelKeys | Optional list of record keys that will be placed as stream labels. This configuration property is for records key only. | []string |
+| labelMapPath | Specify the label map file path. The file defines how to extract labels from each record. | string |
+| removeKeys | Optional list of keys to remove. | []string |
+| dropSingleKey | If set to true and after extracting labels only a single key remains, the log line sent to Loki will be the value of that key in line_format. | string |
 | lineFormat | Format to use when flattening the record to a log line. Valid values are json or key_value. If set to json,  the log line sent to Loki will be the Fluent Bit record dumped as JSON. If set to key_value, the log line will be each item in the record concatenated together (separated by a single space) in the format. | string |
 | autoKubernetesLabels | If set to true, it will add all Kubernetes labels to the Stream labels. | string |
+| tenantIDKey | Specify the name of the key from the original record that contains the Tenant ID. The value of the key is set as X-Scope-OrgID of HTTP header. It is useful to set Tenant ID dynamically. | string |
 | tls |  | *[plugins.TLS](../tls.md) |

From 9896dec0eadb8cd004b365b4875704d1aef3ed14 Mon Sep 17 00:00:00 2001
From: Edmund Rhudy <erhudy@users.noreply.github.com>
Date: Sun, 21 May 2023 11:28:51 -0400
Subject: [PATCH 36/78] fix(735): allow setting PodSecurityContext

This allows setting the PodSecurityContext for the fluentd pods.
If unset, defaults to a PSC with fsGroup=101 (matching
the kubesphere fluentd images).

Signed-off-by: Edmund Rhudy <erhudy@users.noreply.github.com>
---
 apis/fluentd/v1alpha1/fluentd_types.go        |   2 +
 .../fluentd/v1alpha1/zz_generated.deepcopy.go |   5 +
 .../crds/fluentd.fluent.io_fluentds.yaml      | 169 ++++++++++++++++++
 .../crd/bases/fluentd.fluent.io_fluentds.yaml | 169 ++++++++++++++++++
 go.mod                                        |   4 +
 go.sum                                        |  11 ++
 manifests/setup/fluent-operator-crd.yaml      | 169 ++++++++++++++++++
 manifests/setup/setup.yaml                    | 169 ++++++++++++++++++
 pkg/operator/sts.go                           |  11 ++
 9 files changed, 709 insertions(+)

diff --git a/apis/fluentd/v1alpha1/fluentd_types.go b/apis/fluentd/v1alpha1/fluentd_types.go
index 70fd984a3..8eb766a66 100644
--- a/apis/fluentd/v1alpha1/fluentd_types.go
+++ b/apis/fluentd/v1alpha1/fluentd_types.go
@@ -86,6 +86,8 @@ type FluentdSpec struct {
 	VolumeClaimTemplates []corev1.PersistentVolumeClaim `json:"volumeClaimTemplates,omitempty"`
 	// Service represents configurations on the fluentd service.
 	Service FluentDService `json:"service,omitempty"`
+	// PodSecurityContext represents the security context for the fluentd pods.
+	SecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"`
 }
 
 // FluentDService the service of the FluentD
diff --git a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
index 5045ab905..abc90a530 100644
--- a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
@@ -790,6 +790,11 @@ func (in *FluentdSpec) DeepCopyInto(out *FluentdSpec) {
 		}
 	}
 	in.Service.DeepCopyInto(&out.Service)
+	if in.SecurityContext != nil {
+		in, out := &in.SecurityContext, &out.SecurityContext
+		*out = new(corev1.PodSecurityContext)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FluentdSpec.
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
index eced921de..d97f1b5eb 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
@@ -1993,6 +1993,175 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              securityContext:
+                description: PodSecurityContext represents the security context for
+                  the fluentd pods.
+                properties:
+                  fsGroup:
+                    description: "A special supplemental group that applies to all
+                      containers in a pod. Some volume types allow the Kubelet to
+                      change the ownership of that volume to be owned by the pod:
+                      \n 1. The owning GID will be the FSGroup 2. The setgid bit is
+                      set (new files created in the volume will be owned by FSGroup)
+                      3. The permission bits are OR'd with rw-rw---- \n If unset,
+                      the Kubelet will not modify the ownership and permissions of
+                      any volume. Note that this field cannot be set when spec.os.name
+                      is windows."
+                    format: int64
+                    type: integer
+                  fsGroupChangePolicy:
+                    description: 'fsGroupChangePolicy defines behavior of changing
+                      ownership and permission of the volume before being exposed
+                      inside Pod. This field will only apply to volume types which
+                      support fsGroup based ownership(and permissions). It will have
+                      no effect on ephemeral volume types such as: secret, configmaps
+                      and emptydir. Valid values are "OnRootMismatch" and "Always".
+                      If not specified, "Always" is used. Note that this field cannot
+                      be set when spec.os.name is windows.'
+                    type: string
+                  runAsGroup:
+                    description: The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset. May also be set in SecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: Indicates that the container must run as a non-root
+                      user. If true, the Kubelet will validate the image at runtime
+                      to ensure that it does not run as UID 0 (root) and fail to start
+                      the container if it does. If unset or false, no such validation
+                      will be performed. May also be set in SecurityContext.  If set
+                      in both SecurityContext and PodSecurityContext, the value specified
+                      in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in SecurityContext.  If set in both SecurityContext
+                      and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence for that container. Note that this field cannot
+                      be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    description: The SELinux context to be applied to all containers.
+                      If unspecified, the container runtime will allocate a random
+                      SELinux context for each container.  May also be set in SecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: The seccomp options to use by the containers in this
+                      pod. Note that this field cannot be set when spec.os.name is
+                      windows.
+                    properties:
+                      localhostProfile:
+                        description: localhostProfile indicates a profile defined
+                          in a file on the node should be used. The profile must be
+                          preconfigured on the node to work. Must be a descending
+                          path, relative to the kubelet's configured seccomp profile
+                          location. Must only be set if type is "Localhost".
+                        type: string
+                      type:
+                        description: "type indicates which kind of seccomp profile
+                          will be applied. Valid options are: \n Localhost - a profile
+                          defined in a file on the node should be used. RuntimeDefault
+                          - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied."
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  supplementalGroups:
+                    description: A list of groups applied to the first process run
+                      in each container, in addition to the container's primary GID,
+                      the fsGroup (if specified), and group memberships defined in
+                      the container image for the uid of the container process. If
+                      unspecified, no additional groups are added to any container.
+                      Note that group memberships defined in the container image for
+                      the uid of the container process are still effective, even if
+                      they are not included in this list. Note that this field cannot
+                      be set when spec.os.name is windows.
+                    items:
+                      format: int64
+                      type: integer
+                    type: array
+                  sysctls:
+                    description: Sysctls hold a list of namespaced sysctls used for
+                      the pod. Pods with unsupported sysctls (by the container runtime)
+                      might fail to launch. Note that this field cannot be set when
+                      spec.os.name is windows.
+                    items:
+                      description: Sysctl defines a kernel parameter to be set
+                      properties:
+                        name:
+                          description: Name of a property to set
+                          type: string
+                        value:
+                          description: Value of a property to set
+                          type: string
+                      required:
+                      - name
+                      - value
+                      type: object
+                    type: array
+                  windowsOptions:
+                    description: The Windows specific settings applied to all containers.
+                      If unspecified, the options within a container's SecurityContext
+                      will be used. If set in both SecurityContext and PodSecurityContext,
+                      the value specified in SecurityContext takes precedence. Note
+                      that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: GMSACredentialSpec is where the GMSA admission
+                          webhook (https://github.com/kubernetes-sigs/windows-gmsa)
+                          inlines the contents of the GMSA credential spec named by
+                          the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: HostProcess determines if a container should
+                          be run as a 'Host Process' container. This field is alpha-level
+                          and will only be honored by components that enable the WindowsHostProcessContainers
+                          feature flag. Setting this field without the feature flag
+                          will result in errors when validating the Pod. All of a
+                          Pod's containers must have the same effective HostProcess
+                          value (it is not allowed to have a mix of HostProcess containers
+                          and non-HostProcess containers).  In addition, if HostProcess
+                          is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: The UserName in Windows to run the entrypoint
+                          of the container process. Defaults to the user specified
+                          in image metadata if unspecified. May also be set in PodSecurityContext.
+                          If set in both SecurityContext and PodSecurityContext, the
+                          value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
               service:
                 description: Service represents configurations on the fluentd service.
                 properties:
diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
index eced921de..d97f1b5eb 100644
--- a/config/crd/bases/fluentd.fluent.io_fluentds.yaml
+++ b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
@@ -1993,6 +1993,175 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              securityContext:
+                description: PodSecurityContext represents the security context for
+                  the fluentd pods.
+                properties:
+                  fsGroup:
+                    description: "A special supplemental group that applies to all
+                      containers in a pod. Some volume types allow the Kubelet to
+                      change the ownership of that volume to be owned by the pod:
+                      \n 1. The owning GID will be the FSGroup 2. The setgid bit is
+                      set (new files created in the volume will be owned by FSGroup)
+                      3. The permission bits are OR'd with rw-rw---- \n If unset,
+                      the Kubelet will not modify the ownership and permissions of
+                      any volume. Note that this field cannot be set when spec.os.name
+                      is windows."
+                    format: int64
+                    type: integer
+                  fsGroupChangePolicy:
+                    description: 'fsGroupChangePolicy defines behavior of changing
+                      ownership and permission of the volume before being exposed
+                      inside Pod. This field will only apply to volume types which
+                      support fsGroup based ownership(and permissions). It will have
+                      no effect on ephemeral volume types such as: secret, configmaps
+                      and emptydir. Valid values are "OnRootMismatch" and "Always".
+                      If not specified, "Always" is used. Note that this field cannot
+                      be set when spec.os.name is windows.'
+                    type: string
+                  runAsGroup:
+                    description: The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset. May also be set in SecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: Indicates that the container must run as a non-root
+                      user. If true, the Kubelet will validate the image at runtime
+                      to ensure that it does not run as UID 0 (root) and fail to start
+                      the container if it does. If unset or false, no such validation
+                      will be performed. May also be set in SecurityContext.  If set
+                      in both SecurityContext and PodSecurityContext, the value specified
+                      in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in SecurityContext.  If set in both SecurityContext
+                      and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence for that container. Note that this field cannot
+                      be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    description: The SELinux context to be applied to all containers.
+                      If unspecified, the container runtime will allocate a random
+                      SELinux context for each container.  May also be set in SecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: The seccomp options to use by the containers in this
+                      pod. Note that this field cannot be set when spec.os.name is
+                      windows.
+                    properties:
+                      localhostProfile:
+                        description: localhostProfile indicates a profile defined
+                          in a file on the node should be used. The profile must be
+                          preconfigured on the node to work. Must be a descending
+                          path, relative to the kubelet's configured seccomp profile
+                          location. Must only be set if type is "Localhost".
+                        type: string
+                      type:
+                        description: "type indicates which kind of seccomp profile
+                          will be applied. Valid options are: \n Localhost - a profile
+                          defined in a file on the node should be used. RuntimeDefault
+                          - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied."
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  supplementalGroups:
+                    description: A list of groups applied to the first process run
+                      in each container, in addition to the container's primary GID,
+                      the fsGroup (if specified), and group memberships defined in
+                      the container image for the uid of the container process. If
+                      unspecified, no additional groups are added to any container.
+                      Note that group memberships defined in the container image for
+                      the uid of the container process are still effective, even if
+                      they are not included in this list. Note that this field cannot
+                      be set when spec.os.name is windows.
+                    items:
+                      format: int64
+                      type: integer
+                    type: array
+                  sysctls:
+                    description: Sysctls hold a list of namespaced sysctls used for
+                      the pod. Pods with unsupported sysctls (by the container runtime)
+                      might fail to launch. Note that this field cannot be set when
+                      spec.os.name is windows.
+                    items:
+                      description: Sysctl defines a kernel parameter to be set
+                      properties:
+                        name:
+                          description: Name of a property to set
+                          type: string
+                        value:
+                          description: Value of a property to set
+                          type: string
+                      required:
+                      - name
+                      - value
+                      type: object
+                    type: array
+                  windowsOptions:
+                    description: The Windows specific settings applied to all containers.
+                      If unspecified, the options within a container's SecurityContext
+                      will be used. If set in both SecurityContext and PodSecurityContext,
+                      the value specified in SecurityContext takes precedence. Note
+                      that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: GMSACredentialSpec is where the GMSA admission
+                          webhook (https://github.com/kubernetes-sigs/windows-gmsa)
+                          inlines the contents of the GMSA credential spec named by
+                          the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: HostProcess determines if a container should
+                          be run as a 'Host Process' container. This field is alpha-level
+                          and will only be honored by components that enable the WindowsHostProcessContainers
+                          feature flag. Setting this field without the feature flag
+                          will result in errors when validating the Pod. All of a
+                          Pod's containers must have the same effective HostProcess
+                          value (it is not allowed to have a mix of HostProcess containers
+                          and non-HostProcess containers).  In addition, if HostProcess
+                          is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: The UserName in Windows to run the entrypoint
+                          of the container process. Defaults to the user specified
+                          in image metadata if unspecified. May also be set in PodSecurityContext.
+                          If set in both SecurityContext and PodSecurityContext, the
+                          value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
               service:
                 description: Service represents configurations on the fluentd service.
                 properties:
diff --git a/go.mod b/go.mod
index dd2f8ffdd..122e33c01 100644
--- a/go.mod
+++ b/go.mod
@@ -58,12 +58,14 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
 	golang.org/x/sys v0.6.0 // indirect
 	golang.org/x/term v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.7.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
@@ -72,7 +74,9 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
+	k8s.io/code-generator v0.26.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
+	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
 	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
diff --git a/go.sum b/go.sum
index 297d484a9..609959a66 100644
--- a/go.sum
+++ b/go.sum
@@ -89,6 +89,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -349,6 +350,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 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.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
+golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -503,6 +506,7 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -513,6 +517,7 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -640,8 +645,13 @@ k8s.io/apimachinery v0.27.1 h1:EGuZiLI95UQQcClhanryclaQE6xjg1Bts6/L3cD7zyc=
 k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
 k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
 k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
+k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo=
+k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I=
 k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
 k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
+k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
 k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
@@ -657,5 +667,6 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index 977385a17..e4310de2b 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -19567,6 +19567,175 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              securityContext:
+                description: PodSecurityContext represents the security context for
+                  the fluentd pods.
+                properties:
+                  fsGroup:
+                    description: "A special supplemental group that applies to all
+                      containers in a pod. Some volume types allow the Kubelet to
+                      change the ownership of that volume to be owned by the pod:
+                      \n 1. The owning GID will be the FSGroup 2. The setgid bit is
+                      set (new files created in the volume will be owned by FSGroup)
+                      3. The permission bits are OR'd with rw-rw---- \n If unset,
+                      the Kubelet will not modify the ownership and permissions of
+                      any volume. Note that this field cannot be set when spec.os.name
+                      is windows."
+                    format: int64
+                    type: integer
+                  fsGroupChangePolicy:
+                    description: 'fsGroupChangePolicy defines behavior of changing
+                      ownership and permission of the volume before being exposed
+                      inside Pod. This field will only apply to volume types which
+                      support fsGroup based ownership(and permissions). It will have
+                      no effect on ephemeral volume types such as: secret, configmaps
+                      and emptydir. Valid values are "OnRootMismatch" and "Always".
+                      If not specified, "Always" is used. Note that this field cannot
+                      be set when spec.os.name is windows.'
+                    type: string
+                  runAsGroup:
+                    description: The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset. May also be set in SecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: Indicates that the container must run as a non-root
+                      user. If true, the Kubelet will validate the image at runtime
+                      to ensure that it does not run as UID 0 (root) and fail to start
+                      the container if it does. If unset or false, no such validation
+                      will be performed. May also be set in SecurityContext.  If set
+                      in both SecurityContext and PodSecurityContext, the value specified
+                      in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in SecurityContext.  If set in both SecurityContext
+                      and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence for that container. Note that this field cannot
+                      be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    description: The SELinux context to be applied to all containers.
+                      If unspecified, the container runtime will allocate a random
+                      SELinux context for each container.  May also be set in SecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: The seccomp options to use by the containers in this
+                      pod. Note that this field cannot be set when spec.os.name is
+                      windows.
+                    properties:
+                      localhostProfile:
+                        description: localhostProfile indicates a profile defined
+                          in a file on the node should be used. The profile must be
+                          preconfigured on the node to work. Must be a descending
+                          path, relative to the kubelet's configured seccomp profile
+                          location. Must only be set if type is "Localhost".
+                        type: string
+                      type:
+                        description: "type indicates which kind of seccomp profile
+                          will be applied. Valid options are: \n Localhost - a profile
+                          defined in a file on the node should be used. RuntimeDefault
+                          - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied."
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  supplementalGroups:
+                    description: A list of groups applied to the first process run
+                      in each container, in addition to the container's primary GID,
+                      the fsGroup (if specified), and group memberships defined in
+                      the container image for the uid of the container process. If
+                      unspecified, no additional groups are added to any container.
+                      Note that group memberships defined in the container image for
+                      the uid of the container process are still effective, even if
+                      they are not included in this list. Note that this field cannot
+                      be set when spec.os.name is windows.
+                    items:
+                      format: int64
+                      type: integer
+                    type: array
+                  sysctls:
+                    description: Sysctls hold a list of namespaced sysctls used for
+                      the pod. Pods with unsupported sysctls (by the container runtime)
+                      might fail to launch. Note that this field cannot be set when
+                      spec.os.name is windows.
+                    items:
+                      description: Sysctl defines a kernel parameter to be set
+                      properties:
+                        name:
+                          description: Name of a property to set
+                          type: string
+                        value:
+                          description: Value of a property to set
+                          type: string
+                      required:
+                      - name
+                      - value
+                      type: object
+                    type: array
+                  windowsOptions:
+                    description: The Windows specific settings applied to all containers.
+                      If unspecified, the options within a container's SecurityContext
+                      will be used. If set in both SecurityContext and PodSecurityContext,
+                      the value specified in SecurityContext takes precedence. Note
+                      that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: GMSACredentialSpec is where the GMSA admission
+                          webhook (https://github.com/kubernetes-sigs/windows-gmsa)
+                          inlines the contents of the GMSA credential spec named by
+                          the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: HostProcess determines if a container should
+                          be run as a 'Host Process' container. This field is alpha-level
+                          and will only be honored by components that enable the WindowsHostProcessContainers
+                          feature flag. Setting this field without the feature flag
+                          will result in errors when validating the Pod. All of a
+                          Pod's containers must have the same effective HostProcess
+                          value (it is not allowed to have a mix of HostProcess containers
+                          and non-HostProcess containers).  In addition, if HostProcess
+                          is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: The UserName in Windows to run the entrypoint
+                          of the container process. Defaults to the user specified
+                          in image metadata if unspecified. May also be set in PodSecurityContext.
+                          If set in both SecurityContext and PodSecurityContext, the
+                          value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
               service:
                 description: Service represents configurations on the fluentd service.
                 properties:
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index 7e5349e7f..a8b16f864 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -19567,6 +19567,175 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              securityContext:
+                description: PodSecurityContext represents the security context for
+                  the fluentd pods.
+                properties:
+                  fsGroup:
+                    description: "A special supplemental group that applies to all
+                      containers in a pod. Some volume types allow the Kubelet to
+                      change the ownership of that volume to be owned by the pod:
+                      \n 1. The owning GID will be the FSGroup 2. The setgid bit is
+                      set (new files created in the volume will be owned by FSGroup)
+                      3. The permission bits are OR'd with rw-rw---- \n If unset,
+                      the Kubelet will not modify the ownership and permissions of
+                      any volume. Note that this field cannot be set when spec.os.name
+                      is windows."
+                    format: int64
+                    type: integer
+                  fsGroupChangePolicy:
+                    description: 'fsGroupChangePolicy defines behavior of changing
+                      ownership and permission of the volume before being exposed
+                      inside Pod. This field will only apply to volume types which
+                      support fsGroup based ownership(and permissions). It will have
+                      no effect on ephemeral volume types such as: secret, configmaps
+                      and emptydir. Valid values are "OnRootMismatch" and "Always".
+                      If not specified, "Always" is used. Note that this field cannot
+                      be set when spec.os.name is windows.'
+                    type: string
+                  runAsGroup:
+                    description: The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset. May also be set in SecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: Indicates that the container must run as a non-root
+                      user. If true, the Kubelet will validate the image at runtime
+                      to ensure that it does not run as UID 0 (root) and fail to start
+                      the container if it does. If unset or false, no such validation
+                      will be performed. May also be set in SecurityContext.  If set
+                      in both SecurityContext and PodSecurityContext, the value specified
+                      in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in SecurityContext.  If set in both SecurityContext
+                      and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence for that container. Note that this field cannot
+                      be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    description: The SELinux context to be applied to all containers.
+                      If unspecified, the container runtime will allocate a random
+                      SELinux context for each container.  May also be set in SecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence for that container.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: The seccomp options to use by the containers in this
+                      pod. Note that this field cannot be set when spec.os.name is
+                      windows.
+                    properties:
+                      localhostProfile:
+                        description: localhostProfile indicates a profile defined
+                          in a file on the node should be used. The profile must be
+                          preconfigured on the node to work. Must be a descending
+                          path, relative to the kubelet's configured seccomp profile
+                          location. Must only be set if type is "Localhost".
+                        type: string
+                      type:
+                        description: "type indicates which kind of seccomp profile
+                          will be applied. Valid options are: \n Localhost - a profile
+                          defined in a file on the node should be used. RuntimeDefault
+                          - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied."
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  supplementalGroups:
+                    description: A list of groups applied to the first process run
+                      in each container, in addition to the container's primary GID,
+                      the fsGroup (if specified), and group memberships defined in
+                      the container image for the uid of the container process. If
+                      unspecified, no additional groups are added to any container.
+                      Note that group memberships defined in the container image for
+                      the uid of the container process are still effective, even if
+                      they are not included in this list. Note that this field cannot
+                      be set when spec.os.name is windows.
+                    items:
+                      format: int64
+                      type: integer
+                    type: array
+                  sysctls:
+                    description: Sysctls hold a list of namespaced sysctls used for
+                      the pod. Pods with unsupported sysctls (by the container runtime)
+                      might fail to launch. Note that this field cannot be set when
+                      spec.os.name is windows.
+                    items:
+                      description: Sysctl defines a kernel parameter to be set
+                      properties:
+                        name:
+                          description: Name of a property to set
+                          type: string
+                        value:
+                          description: Value of a property to set
+                          type: string
+                      required:
+                      - name
+                      - value
+                      type: object
+                    type: array
+                  windowsOptions:
+                    description: The Windows specific settings applied to all containers.
+                      If unspecified, the options within a container's SecurityContext
+                      will be used. If set in both SecurityContext and PodSecurityContext,
+                      the value specified in SecurityContext takes precedence. Note
+                      that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: GMSACredentialSpec is where the GMSA admission
+                          webhook (https://github.com/kubernetes-sigs/windows-gmsa)
+                          inlines the contents of the GMSA credential spec named by
+                          the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: HostProcess determines if a container should
+                          be run as a 'Host Process' container. This field is alpha-level
+                          and will only be honored by components that enable the WindowsHostProcessContainers
+                          feature flag. Setting this field without the feature flag
+                          will result in errors when validating the Pod. All of a
+                          Pod's containers must have the same effective HostProcess
+                          value (it is not allowed to have a mix of HostProcess containers
+                          and non-HostProcess containers).  In addition, if HostProcess
+                          is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: The UserName in Windows to run the entrypoint
+                          of the container process. Defaults to the user specified
+                          in image metadata if unspecified. May also be set in PodSecurityContext.
+                          If set in both SecurityContext and PodSecurityContext, the
+                          value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
               service:
                 description: Service represents configurations on the fluentd service.
                 properties:
diff --git a/pkg/operator/sts.go b/pkg/operator/sts.go
index 19cef2af6..59c7e044b 100644
--- a/pkg/operator/sts.go
+++ b/pkg/operator/sts.go
@@ -21,6 +21,8 @@ const (
 
 	DefaultForwardPort int32 = 24424
 	DefaultHttpPort    int32 = 9880
+	// 101 is the fsGroup that fluentd runs as in the kubesphere image
+	DefaultFsGroup int64 = 101
 
 	DefaultForwardName = "forward"
 	DefaultHttpName    = "http"
@@ -51,6 +53,8 @@ func MakeStatefulset(fd fluentdv1alpha1.Fluentd) *appsv1.StatefulSet {
 		}
 	}
 
+	defaultFsGroup := DefaultFsGroup
+
 	sts := appsv1.StatefulSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        fd.Name,
@@ -109,6 +113,9 @@ func MakeStatefulset(fd fluentdv1alpha1.Fluentd) *appsv1.StatefulSet {
 					NodeSelector: fd.Spec.NodeSelector,
 					Tolerations:  fd.Spec.Tolerations,
 					Affinity:     fd.Spec.Affinity,
+					SecurityContext: &corev1.PodSecurityContext{
+						FSGroup: &defaultFsGroup,
+					},
 				},
 			},
 		},
@@ -138,6 +145,10 @@ func MakeStatefulset(fd fluentdv1alpha1.Fluentd) *appsv1.StatefulSet {
 		sts.Spec.Template.Spec.Containers[0].Env = append(sts.Spec.Template.Spec.Containers[0].Env, fd.Spec.EnvVars...)
 	}
 
+	if fd.Spec.SecurityContext != nil {
+		sts.Spec.Template.Spec.SecurityContext = fd.Spec.SecurityContext
+	}
+
 	// Mount host or emptydir VolumeSource
 	if fd.Spec.BufferVolume != nil && !fd.Spec.BufferVolume.DisableBufferVolume {
 		bufferVolName := fmt.Sprintf("%s-buffer", fd.Name)

From 213c22d2f6fedd892399809643bc6f35edfb95dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 May 2023 20:43:36 +0800
Subject: [PATCH 37/78] build(deps): Bump k8s.io/apimachinery from 0.27.1 to
 0.27.2 (#751)

Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.27.1 to 0.27.2.
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.27.1...v0.27.2)

---
updated-dependencies:
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod |  8 ++------
 go.sum | 19 ++++---------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/go.mod b/go.mod
index 122e33c01..ef2aeb71d 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.27.6
 	k8s.io/api v0.26.3
-	k8s.io/apimachinery v0.27.1
+	k8s.io/apimachinery v0.27.2
 	k8s.io/client-go v0.26.3
 	k8s.io/klog/v2 v2.100.1
 	sigs.k8s.io/controller-runtime v0.14.6
@@ -58,14 +58,12 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
 	golang.org/x/sys v0.6.0 // indirect
 	golang.org/x/term v0.6.0 // indirect
 	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
@@ -74,10 +72,8 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
-	k8s.io/code-generator v0.26.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
-	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
-	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
+	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
diff --git a/go.sum b/go.sum
index 609959a66..3cc0235e8 100644
--- a/go.sum
+++ b/go.sum
@@ -89,7 +89,6 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
-github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -350,8 +349,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 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.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
-golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -506,7 +503,6 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -517,7 +513,6 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
-golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -641,21 +636,16 @@ k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU=
 k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE=
 k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI=
 k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM=
-k8s.io/apimachinery v0.27.1 h1:EGuZiLI95UQQcClhanryclaQE6xjg1Bts6/L3cD7zyc=
-k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
+k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg=
+k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
 k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
 k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
-k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo=
-k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I=
 k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
 k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
-k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
-k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
 k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg=
-k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
+k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
+k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
 k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY=
 k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
@@ -667,6 +657,5 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

From 813e48feb1ad4f32292a852c129f777ce0ffb2e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 May 2023 20:47:45 +0800
Subject: [PATCH 38/78] build(deps): Bump github.com/onsi/gomega from 1.27.6 to
 1.27.7 (#748)

Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.27.6 to 1.27.7.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.27.6...v1.27.7)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 10 +++++-----
 go.sum | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/go.mod b/go.mod
index ef2aeb71d..b6dd22429 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/joho/godotenv v1.5.1
 	github.com/oklog/run v1.1.0
 	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.27.6
+	github.com/onsi/gomega v1.27.7
 	k8s.io/api v0.26.3
 	k8s.io/apimachinery v0.27.2
 	k8s.io/client-go v0.26.3
@@ -58,11 +58,11 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/term v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/term v0.8.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
diff --git a/go.sum b/go.sum
index 3cc0235e8..dbf27a540 100644
--- a/go.sum
+++ b/go.sum
@@ -233,11 +233,11 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
+github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
-github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
+github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
+github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -383,8 +383,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -448,12 +448,12 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -461,8 +461,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -512,7 +512,7 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
+golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From be7409314d9b3cbd3fa731d5c520019e122c0c15 Mon Sep 17 00:00:00 2001
From: Jason Zhang <jason.zhang@lexisnexis.com>
Date: Thu, 1 Jun 2023 13:38:00 +0800
Subject: [PATCH 39/78] minor typo fix

Signed-off-by: Jason Zhang <ksdpmx@gmail.com>
---
 apis/fluentbit/v1alpha2/clusteroutput_types.go   | 2 +-
 apis/fluentbit/v1alpha2/zz_generated.deepcopy.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apis/fluentbit/v1alpha2/clusteroutput_types.go b/apis/fluentbit/v1alpha2/clusteroutput_types.go
index 1d2e30d81..c1d31fc2f 100644
--- a/apis/fluentbit/v1alpha2/clusteroutput_types.go
+++ b/apis/fluentbit/v1alpha2/clusteroutput_types.go
@@ -81,7 +81,7 @@ type OutputSpec struct {
 	// DataDog defines DataDog Output configuration.
 	DataDog *output.DataDog `json:"datadog,omitempty"`
 	// Firehose defines Firehose Output configuration.
-	Fireose *output.Firehose `json:"firehose,omitempty"`
+	Firehose *output.Firehose `json:"firehose,omitempty"`
 	// Stackdriver defines Stackdriver Output Configuration
 	Stackdriver *output.Stackdriver `json:"stackdriver,omitempty"`
 	// Splunk defines Splunk Output Configuration
diff --git a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
index e037d0469..697ee4380 100644
--- a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
+++ b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
@@ -1293,8 +1293,8 @@ func (in *OutputSpec) DeepCopyInto(out *OutputSpec) {
 		*out = new(output.DataDog)
 		(*in).DeepCopyInto(*out)
 	}
-	if in.Fireose != nil {
-		in, out := &in.Fireose, &out.Fireose
+	if in.Firehose != nil {
+		in, out := &in.Firehose, &out.Firehose
 		*out = new(output.Firehose)
 		(*in).DeepCopyInto(*out)
 	}

From 2f9ce89d23c5e4cd78a55244319b45cf59f0b63a Mon Sep 17 00:00:00 2001
From: Jason Zhang <ksdpmx@gmail.com>
Date: Thu, 1 Jun 2023 15:25:36 +0800
Subject: [PATCH 40/78] add AWS Kinesis Data Streams output plugin

Signed-off-by: Jason Zhang <ksdpmx@gmail.com>
---
 .../fluentbit/v1alpha2/clusteroutput_types.go |   2 +
 .../v1alpha2/plugins/output/kinesis_types.go  |  78 +++++++++++++
 .../plugins/output/kinesis_types_test.go      |  43 +++++++
 .../fluentbit.fluent.io_clusteroutputs.yaml   |  55 +++++++++
 .../crds/fluentbit.fluent.io_outputs.yaml     |  55 +++++++++
 cmd/doc-gen/main.go                           |  12 +-
 .../fluentbit.fluent.io_clusteroutputs.yaml   |  55 +++++++++
 .../bases/fluentbit.fluent.io_outputs.yaml    |  55 +++++++++
 docs/fluentd.md                               |   1 +
 docs/plugins/fluentbit/output/kinesis.md      |  17 +++
 manifests/setup/fluent-operator-crd.yaml      | 110 ++++++++++++++++++
 manifests/setup/setup.yaml                    | 110 ++++++++++++++++++
 12 files changed, 587 insertions(+), 6 deletions(-)
 create mode 100644 apis/fluentbit/v1alpha2/plugins/output/kinesis_types.go
 create mode 100644 apis/fluentbit/v1alpha2/plugins/output/kinesis_types_test.go
 create mode 100644 docs/plugins/fluentbit/output/kinesis.md

diff --git a/apis/fluentbit/v1alpha2/clusteroutput_types.go b/apis/fluentbit/v1alpha2/clusteroutput_types.go
index c1d31fc2f..efb97292b 100644
--- a/apis/fluentbit/v1alpha2/clusteroutput_types.go
+++ b/apis/fluentbit/v1alpha2/clusteroutput_types.go
@@ -82,6 +82,8 @@ type OutputSpec struct {
 	DataDog *output.DataDog `json:"datadog,omitempty"`
 	// Firehose defines Firehose Output configuration.
 	Firehose *output.Firehose `json:"firehose,omitempty"`
+	// Kinesis defines Kinesis Output configuration.
+	Kinesis *output.Kinesis `json:"kinesis,omitempty"`
 	// Stackdriver defines Stackdriver Output Configuration
 	Stackdriver *output.Stackdriver `json:"stackdriver,omitempty"`
 	// Splunk defines Splunk Output Configuration
diff --git a/apis/fluentbit/v1alpha2/plugins/output/kinesis_types.go b/apis/fluentbit/v1alpha2/plugins/output/kinesis_types.go
new file mode 100644
index 000000000..64b61c560
--- /dev/null
+++ b/apis/fluentbit/v1alpha2/plugins/output/kinesis_types.go
@@ -0,0 +1,78 @@
+package output
+
+import (
+	"fmt"
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins"
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params"
+)
+
+// +kubebuilder:object:generate:=true
+
+// The Kinesis output plugin, allows to ingest your records into AWS Kinesis. <br />
+// It uses the new high performance and highly efficient kinesis plugin is called kinesis_streams instead of the older Golang Fluent Bit plugin released in 2019.
+// https://docs.fluentbit.io/manual/pipeline/outputs/kinesis <br />
+// https://github.com/aws/amazon-kinesis-streams-for-fluent-bit <br />
+type Kinesis struct {
+	// The AWS region.
+	Region string `json:"region"`
+	// The name of the Kinesis Streams Delivery stream that you want log records sent to.
+	Stream string `json:"stream"`
+	// Add the timestamp to the record under this key. By default the timestamp from Fluent Bit will not be added to records sent to Kinesis.
+	TimeKey string `json:"timeKey,omitempty"`
+	// strftime compliant format string for the timestamp; for example, the default is '%Y-%m-%dT%H:%M:%S'. Supports millisecond precision with '%3N' and supports nanosecond precision with '%9N' and '%L'; for example, adding '%3N' to support millisecond '%Y-%m-%dT%H:%M:%S.%3N'. This option is used with time_key.
+	TimeKeyFormat string `json:"timeKeyFormat,omitempty"`
+	// By default, the whole log record will be sent to Kinesis. If you specify a key name with this option, then only the value of that key will be sent to Kinesis. For example, if you are using the Fluentd Docker log driver, you can specify log_key log and only the log message will be sent to Kinesis.
+	LogKey string `json:"logKey,omitempty"`
+	// ARN of an IAM role to assume (for cross account access).
+	RoleARN string `json:"roleARN,omitempty"`
+	// Specify a custom endpoint for the Kinesis API.
+	Endpoint string `json:"endpoint,omitempty"`
+	// Custom endpoint for the STS API.
+	STSEndpoint string `json:"stsEndpoint,omitempty"`
+	// Immediately retry failed requests to AWS services once. This option does not affect the normal Fluent Bit retry mechanism with backoff. Instead, it enables an immediate retry with no delay for networking errors, which may help improve throughput when there are transient/random networking issues. This option defaults to true.
+	AutoRetryRequests *bool `json:"autoRetryRequests,omitempty"`
+	// Specify an external ID for the STS API, can be used with the role_arn parameter if your role requires an external ID.
+	ExternalID string `json:"externalID,omitempty"`
+}
+
+// Name implement Section() method
+func (*Kinesis) Name() string {
+	return "kinesis_streams"
+}
+
+// Params implement Section() method
+func (k *Kinesis) Params(_ plugins.SecretLoader) (*params.KVs, error) {
+	kvs := params.NewKVs()
+	if k.Region != "" {
+		kvs.Insert("region", k.Region)
+	}
+	if k.Stream != "" {
+		kvs.Insert("stream", k.Stream)
+	}
+	if k.TimeKey != "" {
+		kvs.Insert("time_key", k.TimeKey)
+	}
+	if k.TimeKeyFormat != "" {
+		kvs.Insert("time_key_format", k.TimeKeyFormat)
+	}
+	if k.LogKey != "" {
+		kvs.Insert("log_key", k.LogKey)
+	}
+	if k.RoleARN != "" {
+		kvs.Insert("role_arn", k.RoleARN)
+	}
+	if k.Endpoint != "" {
+		kvs.Insert("endpoint", k.Endpoint)
+	}
+	if k.STSEndpoint != "" {
+		kvs.Insert("sts_endpoint", k.STSEndpoint)
+	}
+	if k.AutoRetryRequests != nil {
+		kvs.Insert("auto_retry_requests", fmt.Sprint(*k.AutoRetryRequests))
+	}
+	if k.ExternalID != "" {
+		kvs.Insert("external_id", k.ExternalID)
+	}
+
+	return kvs, nil
+}
diff --git a/apis/fluentbit/v1alpha2/plugins/output/kinesis_types_test.go b/apis/fluentbit/v1alpha2/plugins/output/kinesis_types_test.go
new file mode 100644
index 000000000..65db782a9
--- /dev/null
+++ b/apis/fluentbit/v1alpha2/plugins/output/kinesis_types_test.go
@@ -0,0 +1,43 @@
+package output
+
+import (
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins"
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params"
+	"github.com/onsi/gomega"
+	"testing"
+)
+
+func TestOutput_Kinesis_Params(t *testing.T) {
+	g := gomega.NewWithT(t)
+
+	sl := plugins.NewSecretLoader(nil, "test namespace")
+
+	ki := Kinesis{
+		Region:            "us-east-1",
+		Stream:            "test_stream",
+		TimeKey:           "test_time_key",
+		TimeKeyFormat:     "%Y-%m-%dT%H:%M:%S.%3N",
+		LogKey:            "test_time_key",
+		RoleARN:           "arn:aws:iam:test",
+		Endpoint:          "test_endpoint",
+		STSEndpoint:       "test_sts_endpoint",
+		AutoRetryRequests: ptrBool(true),
+		ExternalID:        "test_external_id",
+	}
+
+	expected := params.NewKVs()
+	expected.Insert("region", "us-east-1")
+	expected.Insert("stream", "test_stream")
+	expected.Insert("time_key", "test_time_key")
+	expected.Insert("time_key_format", "%Y-%m-%dT%H:%M:%S.%3N")
+	expected.Insert("log_key", "test_time_key")
+	expected.Insert("role_arn", "arn:aws:iam:test")
+	expected.Insert("endpoint", "test_endpoint")
+	expected.Insert("sts_endpoint", "test_sts_endpoint")
+	expected.Insert("auto_retry_requests", "true")
+	expected.Insert("external_id", "test_external_id")
+
+	kvs, err := ki.Params(sl)
+	g.Expect(err).NotTo(gomega.HaveOccurred())
+	g.Expect(kvs).To(gomega.Equal(expected))
+}
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
index f4c606956..addb6cd28 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
@@ -1297,6 +1297,61 @@ spec:
                       will be used.
                     type: string
                 type: object
+              kinesis:
+                description: Kinesis defines Kinesis Output configuration.
+                properties:
+                  autoRetryRequests:
+                    description: Immediately retry failed requests to AWS services
+                      once. This option does not affect the normal Fluent Bit retry
+                      mechanism with backoff. Instead, it enables an immediate retry
+                      with no delay for networking errors, which may help improve
+                      throughput when there are transient/random networking issues.
+                      This option defaults to true.
+                    type: boolean
+                  endpoint:
+                    description: Specify a custom endpoint for the Kinesis API.
+                    type: string
+                  externalID:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  logKey:
+                    description: By default, the whole log record will be sent to
+                      Kinesis. If you specify a key name with this option, then only
+                      the value of that key will be sent to Kinesis. For example,
+                      if you are using the Fluentd Docker log driver, you can specify
+                      log_key log and only the log message will be sent to Kinesis.
+                    type: string
+                  region:
+                    description: The AWS region.
+                    type: string
+                  roleARN:
+                    description: ARN of an IAM role to assume (for cross account access).
+                    type: string
+                  stream:
+                    description: The name of the Kinesis Streams Delivery stream that
+                      you want log records sent to.
+                    type: string
+                  stsEndpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  timeKey:
+                    description: Add the timestamp to the record under this key. By
+                      default the timestamp from Fluent Bit will not be added to records
+                      sent to Kinesis.
+                    type: string
+                  timeKeyFormat:
+                    description: strftime compliant format string for the timestamp;
+                      for example, the default is '%Y-%m-%dT%H:%M:%S'. Supports millisecond
+                      precision with '%3N' and supports nanosecond precision with
+                      '%9N' and '%L'; for example, adding '%3N' to support millisecond
+                      '%Y-%m-%dT%H:%M:%S.%3N'. This option is used with time_key.
+                    type: string
+                required:
+                - region
+                - stream
+                type: object
               logLevel:
                 description: 'Set the plugin''s logging verbosity level. Allowed values
                   are: off, error, warn, info, debug and trace, Defaults to the SERVICE
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
index a1b8f7786..f431dc7f4 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
@@ -1297,6 +1297,61 @@ spec:
                       will be used.
                     type: string
                 type: object
+              kinesis:
+                description: Kinesis defines Kinesis Output configuration.
+                properties:
+                  autoRetryRequests:
+                    description: Immediately retry failed requests to AWS services
+                      once. This option does not affect the normal Fluent Bit retry
+                      mechanism with backoff. Instead, it enables an immediate retry
+                      with no delay for networking errors, which may help improve
+                      throughput when there are transient/random networking issues.
+                      This option defaults to true.
+                    type: boolean
+                  endpoint:
+                    description: Specify a custom endpoint for the Kinesis API.
+                    type: string
+                  externalID:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  logKey:
+                    description: By default, the whole log record will be sent to
+                      Kinesis. If you specify a key name with this option, then only
+                      the value of that key will be sent to Kinesis. For example,
+                      if you are using the Fluentd Docker log driver, you can specify
+                      log_key log and only the log message will be sent to Kinesis.
+                    type: string
+                  region:
+                    description: The AWS region.
+                    type: string
+                  roleARN:
+                    description: ARN of an IAM role to assume (for cross account access).
+                    type: string
+                  stream:
+                    description: The name of the Kinesis Streams Delivery stream that
+                      you want log records sent to.
+                    type: string
+                  stsEndpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  timeKey:
+                    description: Add the timestamp to the record under this key. By
+                      default the timestamp from Fluent Bit will not be added to records
+                      sent to Kinesis.
+                    type: string
+                  timeKeyFormat:
+                    description: strftime compliant format string for the timestamp;
+                      for example, the default is '%Y-%m-%dT%H:%M:%S'. Supports millisecond
+                      precision with '%3N' and supports nanosecond precision with
+                      '%9N' and '%L'; for example, adding '%3N' to support millisecond
+                      '%Y-%m-%dT%H:%M:%S.%3N'. This option is used with time_key.
+                    type: string
+                required:
+                - region
+                - stream
+                type: object
               logLevel:
                 description: 'Set the plugin''s logging verbosity level. Allowed values
                   are: off, error, warn, info, debug and trace, Defaults to the SERVICE
diff --git a/cmd/doc-gen/main.go b/cmd/doc-gen/main.go
index 3153ad940..83ae08adf 100644
--- a/cmd/doc-gen/main.go
+++ b/cmd/doc-gen/main.go
@@ -55,7 +55,7 @@ type DocumentsLocation struct {
 
 // Inspired by coreos/prometheus-operator: https://github.com/coreos/prometheus-operator
 func main() {
-	var pluginsLoactions = []DocumentsLocation{
+	var pluginsLocations = []DocumentsLocation{
 		{
 			path: fluentbitPluginPath,
 			name: "fluentbit",
@@ -65,9 +65,9 @@ func main() {
 			name: "fluentd",
 		},
 	}
-	plugins(pluginsLoactions)
+	plugins(pluginsLocations)
 
-	var crdsLoactions = []DocumentsLocation{
+	var crdsLocations = []DocumentsLocation{
 		{
 			path: fluentbitCrdsPath,
 			name: "fluentbit",
@@ -77,7 +77,7 @@ func main() {
 			name: "fluentd",
 		},
 	}
-	crds(crdsLoactions)
+	crds(crdsLocations)
 }
 
 func plugins(docsLocations []DocumentsLocation) {
@@ -140,8 +140,8 @@ func plugins(docsLocations []DocumentsLocation) {
 	}
 }
 
-func crds(docsLoactions []DocumentsLocation) {
-	for _, dl := range docsLoactions {
+func crds(docsLocations []DocumentsLocation) {
+	for _, dl := range docsLocations {
 		var srcs []string
 		err := filepath.Walk(dl.path, func(path string, info os.FileInfo, err error) error {
 			if err != nil {
diff --git a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
index f4c606956..addb6cd28 100644
--- a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
@@ -1297,6 +1297,61 @@ spec:
                       will be used.
                     type: string
                 type: object
+              kinesis:
+                description: Kinesis defines Kinesis Output configuration.
+                properties:
+                  autoRetryRequests:
+                    description: Immediately retry failed requests to AWS services
+                      once. This option does not affect the normal Fluent Bit retry
+                      mechanism with backoff. Instead, it enables an immediate retry
+                      with no delay for networking errors, which may help improve
+                      throughput when there are transient/random networking issues.
+                      This option defaults to true.
+                    type: boolean
+                  endpoint:
+                    description: Specify a custom endpoint for the Kinesis API.
+                    type: string
+                  externalID:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  logKey:
+                    description: By default, the whole log record will be sent to
+                      Kinesis. If you specify a key name with this option, then only
+                      the value of that key will be sent to Kinesis. For example,
+                      if you are using the Fluentd Docker log driver, you can specify
+                      log_key log and only the log message will be sent to Kinesis.
+                    type: string
+                  region:
+                    description: The AWS region.
+                    type: string
+                  roleARN:
+                    description: ARN of an IAM role to assume (for cross account access).
+                    type: string
+                  stream:
+                    description: The name of the Kinesis Streams Delivery stream that
+                      you want log records sent to.
+                    type: string
+                  stsEndpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  timeKey:
+                    description: Add the timestamp to the record under this key. By
+                      default the timestamp from Fluent Bit will not be added to records
+                      sent to Kinesis.
+                    type: string
+                  timeKeyFormat:
+                    description: strftime compliant format string for the timestamp;
+                      for example, the default is '%Y-%m-%dT%H:%M:%S'. Supports millisecond
+                      precision with '%3N' and supports nanosecond precision with
+                      '%9N' and '%L'; for example, adding '%3N' to support millisecond
+                      '%Y-%m-%dT%H:%M:%S.%3N'. This option is used with time_key.
+                    type: string
+                required:
+                - region
+                - stream
+                type: object
               logLevel:
                 description: 'Set the plugin''s logging verbosity level. Allowed values
                   are: off, error, warn, info, debug and trace, Defaults to the SERVICE
diff --git a/config/crd/bases/fluentbit.fluent.io_outputs.yaml b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
index a1b8f7786..f431dc7f4 100644
--- a/config/crd/bases/fluentbit.fluent.io_outputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
@@ -1297,6 +1297,61 @@ spec:
                       will be used.
                     type: string
                 type: object
+              kinesis:
+                description: Kinesis defines Kinesis Output configuration.
+                properties:
+                  autoRetryRequests:
+                    description: Immediately retry failed requests to AWS services
+                      once. This option does not affect the normal Fluent Bit retry
+                      mechanism with backoff. Instead, it enables an immediate retry
+                      with no delay for networking errors, which may help improve
+                      throughput when there are transient/random networking issues.
+                      This option defaults to true.
+                    type: boolean
+                  endpoint:
+                    description: Specify a custom endpoint for the Kinesis API.
+                    type: string
+                  externalID:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  logKey:
+                    description: By default, the whole log record will be sent to
+                      Kinesis. If you specify a key name with this option, then only
+                      the value of that key will be sent to Kinesis. For example,
+                      if you are using the Fluentd Docker log driver, you can specify
+                      log_key log and only the log message will be sent to Kinesis.
+                    type: string
+                  region:
+                    description: The AWS region.
+                    type: string
+                  roleARN:
+                    description: ARN of an IAM role to assume (for cross account access).
+                    type: string
+                  stream:
+                    description: The name of the Kinesis Streams Delivery stream that
+                      you want log records sent to.
+                    type: string
+                  stsEndpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  timeKey:
+                    description: Add the timestamp to the record under this key. By
+                      default the timestamp from Fluent Bit will not be added to records
+                      sent to Kinesis.
+                    type: string
+                  timeKeyFormat:
+                    description: strftime compliant format string for the timestamp;
+                      for example, the default is '%Y-%m-%dT%H:%M:%S'. Supports millisecond
+                      precision with '%3N' and supports nanosecond precision with
+                      '%9N' and '%L'; for example, adding '%3N' to support millisecond
+                      '%Y-%m-%dT%H:%M:%S.%3N'. This option is used with time_key.
+                    type: string
+                required:
+                - region
+                - stream
+                type: object
               logLevel:
                 description: 'Set the plugin''s logging verbosity level. Allowed values
                   are: off, error, warn, info, debug and trace, Defaults to the SERVICE
diff --git a/docs/fluentd.md b/docs/fluentd.md
index 74de9b1bb..1172e3296 100644
--- a/docs/fluentd.md
+++ b/docs/fluentd.md
@@ -309,6 +309,7 @@ FluentdSpec defines the desired state of Fluentd
 | volumeMounts | Pod volumes to mount into the container's filesystem. Cannot be updated. | []corev1.VolumeMount |
 | volumeClaimTemplates | volumeClaimTemplates is a list of claims that pods are allowed to reference. The StatefulSet controller is responsible for mapping network identities to claims in a way that maintains the identity of a pod. Every claim in this list must have at least one matching (by name) volumeMount in one container in the template. | []corev1.PersistentVolumeClaim |
 | service | Service represents configurations on the fluentd service. | FluentDService |
+| securityContext | PodSecurityContext represents the security context for the fluentd pods. | *corev1.PodSecurityContext |
 
 [Back to TOC](#table-of-contents)
 # FluentdStatus
diff --git a/docs/plugins/fluentbit/output/kinesis.md b/docs/plugins/fluentbit/output/kinesis.md
new file mode 100644
index 000000000..4e7ceb7e3
--- /dev/null
+++ b/docs/plugins/fluentbit/output/kinesis.md
@@ -0,0 +1,17 @@
+# Kinesis
+
+The Kinesis output plugin, allows to ingest your records into AWS Kinesis. <br /> It uses the new high performance and highly efficient kinesis plugin is called kinesis_streams instead of the older Golang Fluent Bit plugin released in 2019. https://docs.fluentbit.io/manual/pipeline/outputs/kinesis <br /> https://github.com/aws/amazon-kinesis-streams-for-fluent-bit <br />
+
+
+| Field | Description | Scheme |
+| ----- | ----------- | ------ |
+| region | The AWS region. | string |
+| stream | The name of the Kinesis Streams Delivery stream that you want log records sent to. | string |
+| timeKey | Add the timestamp to the record under this key. By default the timestamp from Fluent Bit will not be added to records sent to Kinesis. | string |
+| timeKeyFormat | strftime compliant format string for the timestamp; for example, the default is '%Y-%m-%dT%H:%M:%S'. Supports millisecond precision with '%3N' and supports nanosecond precision with '%9N' and '%L'; for example, adding '%3N' to support millisecond '%Y-%m-%dT%H:%M:%S.%3N'. This option is used with time_key. | string |
+| logKey | By default, the whole log record will be sent to Kinesis. If you specify a key name with this option, then only the value of that key will be sent to Kinesis. For example, if you are using the Fluentd Docker log driver, you can specify log_key log and only the log message will be sent to Kinesis. | string |
+| roleARN | ARN of an IAM role to assume (for cross account access). | string |
+| endpoint | Specify a custom endpoint for the Kinesis API. | string |
+| stsEndpoint | Custom endpoint for the STS API. | string |
+| autoRetryRequests | Immediately retry failed requests to AWS services once. This option does not affect the normal Fluent Bit retry mechanism with backoff. Instead, it enables an immediate retry with no delay for networking errors, which may help improve throughput when there are transient/random networking issues. This option defaults to true. | *bool |
+| externalID | Specify an external ID for the STS API, can be used with the role_arn parameter if your role requires an external ID. | string |
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index 42c758395..61128b7a8 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -3310,6 +3310,61 @@ spec:
                       will be used.
                     type: string
                 type: object
+              kinesis:
+                description: Kinesis defines Kinesis Output configuration.
+                properties:
+                  autoRetryRequests:
+                    description: Immediately retry failed requests to AWS services
+                      once. This option does not affect the normal Fluent Bit retry
+                      mechanism with backoff. Instead, it enables an immediate retry
+                      with no delay for networking errors, which may help improve
+                      throughput when there are transient/random networking issues.
+                      This option defaults to true.
+                    type: boolean
+                  endpoint:
+                    description: Specify a custom endpoint for the Kinesis API.
+                    type: string
+                  externalID:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  logKey:
+                    description: By default, the whole log record will be sent to
+                      Kinesis. If you specify a key name with this option, then only
+                      the value of that key will be sent to Kinesis. For example,
+                      if you are using the Fluentd Docker log driver, you can specify
+                      log_key log and only the log message will be sent to Kinesis.
+                    type: string
+                  region:
+                    description: The AWS region.
+                    type: string
+                  roleARN:
+                    description: ARN of an IAM role to assume (for cross account access).
+                    type: string
+                  stream:
+                    description: The name of the Kinesis Streams Delivery stream that
+                      you want log records sent to.
+                    type: string
+                  stsEndpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  timeKey:
+                    description: Add the timestamp to the record under this key. By
+                      default the timestamp from Fluent Bit will not be added to records
+                      sent to Kinesis.
+                    type: string
+                  timeKeyFormat:
+                    description: strftime compliant format string for the timestamp;
+                      for example, the default is '%Y-%m-%dT%H:%M:%S'. Supports millisecond
+                      precision with '%3N' and supports nanosecond precision with
+                      '%9N' and '%L'; for example, adding '%3N' to support millisecond
+                      '%Y-%m-%dT%H:%M:%S.%3N'. This option is used with time_key.
+                    type: string
+                required:
+                - region
+                - stream
+                type: object
               logLevel:
                 description: 'Set the plugin''s logging verbosity level. Allowed values
                   are: off, error, warn, info, debug and trace, Defaults to the SERVICE
@@ -23372,6 +23427,61 @@ spec:
                       will be used.
                     type: string
                 type: object
+              kinesis:
+                description: Kinesis defines Kinesis Output configuration.
+                properties:
+                  autoRetryRequests:
+                    description: Immediately retry failed requests to AWS services
+                      once. This option does not affect the normal Fluent Bit retry
+                      mechanism with backoff. Instead, it enables an immediate retry
+                      with no delay for networking errors, which may help improve
+                      throughput when there are transient/random networking issues.
+                      This option defaults to true.
+                    type: boolean
+                  endpoint:
+                    description: Specify a custom endpoint for the Kinesis API.
+                    type: string
+                  externalID:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  logKey:
+                    description: By default, the whole log record will be sent to
+                      Kinesis. If you specify a key name with this option, then only
+                      the value of that key will be sent to Kinesis. For example,
+                      if you are using the Fluentd Docker log driver, you can specify
+                      log_key log and only the log message will be sent to Kinesis.
+                    type: string
+                  region:
+                    description: The AWS region.
+                    type: string
+                  roleARN:
+                    description: ARN of an IAM role to assume (for cross account access).
+                    type: string
+                  stream:
+                    description: The name of the Kinesis Streams Delivery stream that
+                      you want log records sent to.
+                    type: string
+                  stsEndpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  timeKey:
+                    description: Add the timestamp to the record under this key. By
+                      default the timestamp from Fluent Bit will not be added to records
+                      sent to Kinesis.
+                    type: string
+                  timeKeyFormat:
+                    description: strftime compliant format string for the timestamp;
+                      for example, the default is '%Y-%m-%dT%H:%M:%S'. Supports millisecond
+                      precision with '%3N' and supports nanosecond precision with
+                      '%9N' and '%L'; for example, adding '%3N' to support millisecond
+                      '%Y-%m-%dT%H:%M:%S.%3N'. This option is used with time_key.
+                    type: string
+                required:
+                - region
+                - stream
+                type: object
               logLevel:
                 description: 'Set the plugin''s logging verbosity level. Allowed values
                   are: off, error, warn, info, debug and trace, Defaults to the SERVICE
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index be4751733..dabf20c2d 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -3310,6 +3310,61 @@ spec:
                       will be used.
                     type: string
                 type: object
+              kinesis:
+                description: Kinesis defines Kinesis Output configuration.
+                properties:
+                  autoRetryRequests:
+                    description: Immediately retry failed requests to AWS services
+                      once. This option does not affect the normal Fluent Bit retry
+                      mechanism with backoff. Instead, it enables an immediate retry
+                      with no delay for networking errors, which may help improve
+                      throughput when there are transient/random networking issues.
+                      This option defaults to true.
+                    type: boolean
+                  endpoint:
+                    description: Specify a custom endpoint for the Kinesis API.
+                    type: string
+                  externalID:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  logKey:
+                    description: By default, the whole log record will be sent to
+                      Kinesis. If you specify a key name with this option, then only
+                      the value of that key will be sent to Kinesis. For example,
+                      if you are using the Fluentd Docker log driver, you can specify
+                      log_key log and only the log message will be sent to Kinesis.
+                    type: string
+                  region:
+                    description: The AWS region.
+                    type: string
+                  roleARN:
+                    description: ARN of an IAM role to assume (for cross account access).
+                    type: string
+                  stream:
+                    description: The name of the Kinesis Streams Delivery stream that
+                      you want log records sent to.
+                    type: string
+                  stsEndpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  timeKey:
+                    description: Add the timestamp to the record under this key. By
+                      default the timestamp from Fluent Bit will not be added to records
+                      sent to Kinesis.
+                    type: string
+                  timeKeyFormat:
+                    description: strftime compliant format string for the timestamp;
+                      for example, the default is '%Y-%m-%dT%H:%M:%S'. Supports millisecond
+                      precision with '%3N' and supports nanosecond precision with
+                      '%9N' and '%L'; for example, adding '%3N' to support millisecond
+                      '%Y-%m-%dT%H:%M:%S.%3N'. This option is used with time_key.
+                    type: string
+                required:
+                - region
+                - stream
+                type: object
               logLevel:
                 description: 'Set the plugin''s logging verbosity level. Allowed values
                   are: off, error, warn, info, debug and trace, Defaults to the SERVICE
@@ -23372,6 +23427,61 @@ spec:
                       will be used.
                     type: string
                 type: object
+              kinesis:
+                description: Kinesis defines Kinesis Output configuration.
+                properties:
+                  autoRetryRequests:
+                    description: Immediately retry failed requests to AWS services
+                      once. This option does not affect the normal Fluent Bit retry
+                      mechanism with backoff. Instead, it enables an immediate retry
+                      with no delay for networking errors, which may help improve
+                      throughput when there are transient/random networking issues.
+                      This option defaults to true.
+                    type: boolean
+                  endpoint:
+                    description: Specify a custom endpoint for the Kinesis API.
+                    type: string
+                  externalID:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  logKey:
+                    description: By default, the whole log record will be sent to
+                      Kinesis. If you specify a key name with this option, then only
+                      the value of that key will be sent to Kinesis. For example,
+                      if you are using the Fluentd Docker log driver, you can specify
+                      log_key log and only the log message will be sent to Kinesis.
+                    type: string
+                  region:
+                    description: The AWS region.
+                    type: string
+                  roleARN:
+                    description: ARN of an IAM role to assume (for cross account access).
+                    type: string
+                  stream:
+                    description: The name of the Kinesis Streams Delivery stream that
+                      you want log records sent to.
+                    type: string
+                  stsEndpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  timeKey:
+                    description: Add the timestamp to the record under this key. By
+                      default the timestamp from Fluent Bit will not be added to records
+                      sent to Kinesis.
+                    type: string
+                  timeKeyFormat:
+                    description: strftime compliant format string for the timestamp;
+                      for example, the default is '%Y-%m-%dT%H:%M:%S'. Supports millisecond
+                      precision with '%3N' and supports nanosecond precision with
+                      '%9N' and '%L'; for example, adding '%3N' to support millisecond
+                      '%Y-%m-%dT%H:%M:%S.%3N'. This option is used with time_key.
+                    type: string
+                required:
+                - region
+                - stream
+                type: object
               logLevel:
                 description: 'Set the plugin''s logging verbosity level. Allowed values
                   are: off, error, warn, info, debug and trace, Defaults to the SERVICE

From 4d05bc5faf80c9d5352257b24f1561eb44fec303 Mon Sep 17 00:00:00 2001
From: dehaocheng <dehaocheng@kubesphere.io>
Date: Fri, 2 Jun 2023 10:52:57 +0800
Subject: [PATCH 41/78] Fluent-bit upgrade to v2.1.4

Signed-off-by: dehaocheng <dehaocheng@kubesphere.io>
---
 .github/workflows/build-fb-image.yaml            | 4 ++--
 Makefile                                         | 4 ++--
 charts/fluent-operator/values.yaml               | 2 +-
 cmd/fluent-watcher/fluentbit/Dockerfile          | 2 +-
 cmd/fluent-watcher/fluentbit/Dockerfile.debug    | 2 +-
 manifests/kubeedge/fluentbit-fluentbit-edge.yaml | 2 +-
 manifests/logging-stack/fluentbit-fluentBit.yaml | 2 +-
 manifests/quick-start/fluentbit.yaml             | 2 +-
 manifests/regex-parser/fluentbit-fluentBit.yaml  | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index 84a2aeb81..7248a3078 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -13,8 +13,8 @@ on:
       - "pkg/filenotify/**"
 
 env:
-  FB_IMG: 'kubesphere/fluent-bit:v2.1.3'
-  FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.1.3-debug'
+  FB_IMG: 'kubesphere/fluent-bit:v2.1.4'
+  FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.1.4-debug'
 
 jobs:
   build:
diff --git a/Makefile b/Makefile
index bbf952afd..3cd740757 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION?=$(shell cat VERSION | tr -d " \t\n\r")
 # Image URL to use all building/pushing image targets
-FB_IMG ?= kubesphere/fluent-bit:v2.1.3
-FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.1.3-debug
+FB_IMG ?= kubesphere/fluent-bit:v2.1.4
+FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.1.4-debug
 FD_IMG ?= kubesphere/fluentd:v1.15.3
 FO_IMG ?= kubesphere/fluent-operator:$(VERSION)
 FD_IMG_BASE ?= kubesphere/fluentd:v1.15.3-arm64-base
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 7be8f1fa3..b15a98913 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -61,7 +61,7 @@ fluentbit:
   enable: true
   image:
     repository: "kubesphere/fluent-bit"
-    tag: "v2.1.3"
+    tag: "v2.1.4"
   # fluentbit resources. If you do want to specify resources, adjust them as necessary
   # You can adjust it based on the log volume.
   resources:
diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile b/cmd/fluent-watcher/fluentbit/Dockerfile
index fb65abff8..b87cba03d 100644
--- a/cmd/fluent-watcher/fluentbit/Dockerfile
+++ b/cmd/fluent-watcher/fluentbit/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /code
 RUN echo $(ls -al /code)
 RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
 
-FROM fluent/fluent-bit:2.1.3
+FROM fluent/fluent-bit:2.1.4
 LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0"
 
 COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/
diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile.debug b/cmd/fluent-watcher/fluentbit/Dockerfile.debug
index acbe5ad66..045f40481 100644
--- a/cmd/fluent-watcher/fluentbit/Dockerfile.debug
+++ b/cmd/fluent-watcher/fluentbit/Dockerfile.debug
@@ -6,7 +6,7 @@ WORKDIR /code
 RUN echo $(ls -al /code)
 RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
 
-FROM fluent/fluent-bit:2.1.3-debug
+FROM fluent/fluent-bit:2.1.4-debug
 LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0"
 
 COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/
diff --git a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml
index 90e0804b1..6cd76ee5a 100644
--- a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml
+++ b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.1.3
+  image: kubesphere/fluent-bit:v2.1.4
   positionDB:
     hostPath:
       path: /var/lib/fluent-bit/
diff --git a/manifests/logging-stack/fluentbit-fluentBit.yaml b/manifests/logging-stack/fluentbit-fluentBit.yaml
index 606871053..19eca277e 100644
--- a/manifests/logging-stack/fluentbit-fluentBit.yaml
+++ b/manifests/logging-stack/fluentbit-fluentBit.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.1.3
+  image: kubesphere/fluent-bit:v2.1.4
   positionDB:
     hostPath:
       path: /var/lib/fluent-bit/
diff --git a/manifests/quick-start/fluentbit.yaml b/manifests/quick-start/fluentbit.yaml
index 8afa784da..0167c4c08 100644
--- a/manifests/quick-start/fluentbit.yaml
+++ b/manifests/quick-start/fluentbit.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.1.3
+  image: kubesphere/fluent-bit:v2.1.4
   fluentBitConfigName: fluent-bit-config
 
 ---
diff --git a/manifests/regex-parser/fluentbit-fluentBit.yaml b/manifests/regex-parser/fluentbit-fluentBit.yaml
index af204b93f..0a79930ad 100644
--- a/manifests/regex-parser/fluentbit-fluentBit.yaml
+++ b/manifests/regex-parser/fluentbit-fluentBit.yaml
@@ -6,5 +6,5 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.1.3
+  image: kubesphere/fluent-bit:v2.1.4
   fluentBitConfigName: fluent-bit-config

From c9af5f85ab2bfbc0776060aaa1aea86d6c044b7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jun 2023 13:41:31 +0800
Subject: [PATCH 42/78] build(deps): Bump helm/kind-action from 1.5.0 to 1.7.0
 (#765)

Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.5.0 to 1.7.0.
- [Release notes](https://github.com/helm/kind-action/releases)
- [Commits](https://github.com/helm/kind-action/compare/v1.5.0...v1.7.0)

---
updated-dependencies:
- dependency-name: helm/kind-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/lint-test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 9665ac9d5..aaff307d6 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -38,7 +38,7 @@ jobs:
         run: ct lint --chart-dirs charts/fluent-operator --config charts/ct.yaml
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.5.0
+        uses: helm/kind-action@v1.7.0
         if: steps.list-changed.outputs.changed == 'true'
 
       - name: Run chart-testing (install)

From 76ada94774912d94fe8404581913c0dd2882a02f Mon Sep 17 00:00:00 2001
From: Jason Zhang <ksdpmx@gmail.com>
Date: Fri, 2 Jun 2023 14:28:00 +0800
Subject: [PATCH 43/78] fix typo for estimate_current_event in fluentd

Signed-off-by: Jason Zhang <ksdpmx@gmail.com>
---
 .../plugins/output/zz_generated.deepcopy.go   | 20 +++++++++++++++++++
 .../v1alpha2/zz_generated.deepcopy.go         |  5 +++++
 .../v1alpha1/plugins/common/parse_types.go    |  6 +++---
 docs/fluentbit.md                             |  1 +
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
index 195e25e95..784e4bca0 100644
--- a/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
+++ b/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
@@ -479,6 +479,26 @@ func (in *Kafka) DeepCopy() *Kafka {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Kinesis) DeepCopyInto(out *Kinesis) {
+	*out = *in
+	if in.AutoRetryRequests != nil {
+		in, out := &in.AutoRetryRequests, &out.AutoRetryRequests
+		*out = new(bool)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Kinesis.
+func (in *Kinesis) DeepCopy() *Kinesis {
+	if in == nil {
+		return nil
+	}
+	out := new(Kinesis)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Loki) DeepCopyInto(out *Loki) {
 	*out = *in
diff --git a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
index 697ee4380..a9b73a3cc 100644
--- a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
+++ b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
@@ -1298,6 +1298,11 @@ func (in *OutputSpec) DeepCopyInto(out *OutputSpec) {
 		*out = new(output.Firehose)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.Kinesis != nil {
+		in, out := &in.Kinesis, &out.Kinesis
+		*out = new(output.Kinesis)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.Stackdriver != nil {
 		in, out := &in.Stackdriver, &out.Stackdriver
 		*out = new(output.Stackdriver)
diff --git a/apis/fluentd/v1alpha1/plugins/common/parse_types.go b/apis/fluentd/v1alpha1/plugins/common/parse_types.go
index 83abb6aa7..a9943b6ac 100644
--- a/apis/fluentd/v1alpha1/plugins/common/parse_types.go
+++ b/apis/fluentd/v1alpha1/plugins/common/parse_types.go
@@ -29,7 +29,7 @@ type Parse struct {
 	// Specify time field for event time. If the event doesn't have this field, current time is used.
 	TimeKey *string `json:"timeKey,omitempty"`
 	// If true, use Fluent::Eventnow(current time) as a timestamp when time_key is specified.
-	EstimateCurentEvent *bool `json:"estimateCurrentEvent,omitempty"`
+	EstimateCurrentEvent *bool `json:"estimateCurrentEvent,omitempty"`
 	// If true, keep time field in th record.
 	KeepTimeKey *bool `json:"keepTimeKey,omitempty"`
 	// Specify timeout for parse processing.
@@ -61,8 +61,8 @@ func (p *Parse) Params(_ plugins.SecretLoader) (*params.PluginStore, error) {
 	if p.TimeKey != nil {
 		ps.InsertPairs("time_key", fmt.Sprint(*p.TimeKey))
 	}
-	if p.EstimateCurentEvent != nil {
-		ps.InsertPairs("estimate_curent_event", fmt.Sprint(*p.EstimateCurentEvent))
+	if p.EstimateCurrentEvent != nil {
+		ps.InsertPairs("estimate_current_event", fmt.Sprint(*p.EstimateCurrentEvent))
 	}
 	if p.KeepTimeKey != nil {
 		ps.InsertPairs("keep_timeout", fmt.Sprint(*p.KeepTimeKey))
diff --git a/docs/fluentbit.md b/docs/fluentbit.md
index 5e5643f85..aa4ad5b02 100644
--- a/docs/fluentbit.md
+++ b/docs/fluentbit.md
@@ -478,6 +478,7 @@ OutputSpec defines the desired state of ClusterOutput
 | influxDB | InfluxDB defines InfluxDB Output configuration. | *[output.InfluxDB](plugins/output/influxdb.md) |
 | datadog | DataDog defines DataDog Output configuration. | *[output.DataDog](plugins/output/datadog.md) |
 | firehose | Firehose defines Firehose Output configuration. | *[output.Firehose](plugins/output/firehose.md) |
+| kinesis | Kinesis defines Kinesis Output configuration. | *[output.Kinesis](plugins/output/kinesis.md) |
 | stackdriver | Stackdriver defines Stackdriver Output Configuration | *[output.Stackdriver](plugins/output/stackdriver.md) |
 | splunk | Splunk defines Splunk Output Configuration | *[output.Splunk](plugins/output/splunk.md) |
 | opensearch | OpenSearch defines OpenSearch Output configuration. | *[output.OpenSearch](plugins/output/opensearch.md) |

From 6c59ca0158122816ad58d15bf63cbf4608d5ba09 Mon Sep 17 00:00:00 2001
From: Jason Zhang <ksdpmx@gmail.com>
Date: Fri, 2 Jun 2023 17:11:12 +0800
Subject: [PATCH 44/78] add scheduler support for fluentbit & fluentd

Signed-off-by: Jason Zhang <ksdpmx@gmail.com>
---
 apis/fluentbit/v1alpha2/fluentbit_types.go                | 2 ++
 apis/fluentd/v1alpha1/fluentd_types.go                    | 2 ++
 .../crds/fluentbit.fluent.io_fluentbits.yaml              | 4 ++++
 .../fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml     | 4 ++++
 charts/fluent-operator/templates/fluentbit-fluentBit.yaml | 3 +++
 charts/fluent-operator/templates/fluentd-fluentd.yaml     | 3 +++
 charts/fluent-operator/values.yaml                        | 2 ++
 config/crd/bases/fluentbit.fluent.io_fluentbits.yaml      | 4 ++++
 config/crd/bases/fluentd.fluent.io_fluentds.yaml          | 4 ++++
 manifests/setup/fluent-operator-crd.yaml                  | 8 ++++++++
 manifests/setup/setup.yaml                                | 8 ++++++++
 pkg/operator/daemonset.go                                 | 4 ++++
 pkg/operator/sts.go                                       | 4 ++++
 13 files changed, 52 insertions(+)

diff --git a/apis/fluentbit/v1alpha2/fluentbit_types.go b/apis/fluentbit/v1alpha2/fluentbit_types.go
index 9f0991347..b57ebf208 100644
--- a/apis/fluentbit/v1alpha2/fluentbit_types.go
+++ b/apis/fluentbit/v1alpha2/fluentbit_types.go
@@ -96,6 +96,8 @@ type FluentBitSpec struct {
 	MetricsPort int32 `json:"metricsPort,omitempty"`
 	// Service represents configurations on the fluent-bit service.
 	Service FluentBitService `json:"service,omitempty"`
+	// SchedulerName represents the desired scheduler for fluent-bit pods.
+	SchedulerName string `json:"schedulerName,omitempty"`
 }
 
 // FluentBitService defines the service of the FluentBit
diff --git a/apis/fluentd/v1alpha1/fluentd_types.go b/apis/fluentd/v1alpha1/fluentd_types.go
index 8eb766a66..63f4527fb 100644
--- a/apis/fluentd/v1alpha1/fluentd_types.go
+++ b/apis/fluentd/v1alpha1/fluentd_types.go
@@ -88,6 +88,8 @@ type FluentdSpec struct {
 	Service FluentDService `json:"service,omitempty"`
 	// PodSecurityContext represents the security context for the fluentd pods.
 	SecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"`
+	// SchedulerName represents the desired scheduler for fluentd pods.
+	SchedulerName string `json:"schedulerName,omitempty"`
 }
 
 // FluentDService the service of the FluentD
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml
index 70e5e6da9..3d0a8685e 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml
@@ -4302,6 +4302,10 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              schedulerName:
+                description: SchedulerName represents the desired scheduler for fluent-bit
+                  pods.
+                type: string
               secrets:
                 description: The Secrets are mounted into /fluent-bit/secrets/<secret-name>.
                 items:
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
index 137242e0b..ea8306ab4 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
@@ -2253,6 +2253,10 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              schedulerName:
+                description: SchedulerName represents the desired scheduler for fluentd
+                  pods.
+                type: string
               securityContext:
                 description: PodSecurityContext represents the security context for
                   the fluentd pods.
diff --git a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
index b538a90a0..b25c292d6 100644
--- a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
+++ b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
@@ -40,6 +40,9 @@ spec:
   {{- with .Values.fluentbit.affinity }}
   affinity:
 {{ toYaml . | indent 4 }}
+  {{- end }}
+  {{- if .Values.fluentbit.schedulerName }}
+  schedulerName: {{ .Values.fluentbit.schedulerName }}
   {{- end }}
   {{- if .Values.fluentbit.secrets }}
   secrets:
diff --git a/charts/fluent-operator/templates/fluentd-fluentd.yaml b/charts/fluent-operator/templates/fluentd-fluentd.yaml
index 6db6b1174..8a9f9a9f4 100644
--- a/charts/fluent-operator/templates/fluentd-fluentd.yaml
+++ b/charts/fluent-operator/templates/fluentd-fluentd.yaml
@@ -18,5 +18,8 @@ spec:
   fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
+  {{- if .Values.fluentd.schedulerName }}
+  schedulerName: {{ .Values.fluentd.schedulerName }}
+  {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index b15a98913..f526490e8 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -110,6 +110,7 @@ fluentbit:
   envVars: []
   #  - name: FOO
   #    value: "bar"
+  schedulerName: ""
 
   # Remove the above empty volumes and volumesMounts, and then set additionalVolumes and additionalVolumesMounts as below if you want to collect node exporter metrics
   # additionalVolumes:
@@ -240,6 +241,7 @@ fluentd:
     requests:
       cpu: 100m
       memory: 128Mi
+  schedulerName: ""
   # Configure the output plugin parameter in Fluentd.
   # Fluentd is disabled by default, if you enable it make sure to also set up an output to use.
   output:
diff --git a/config/crd/bases/fluentbit.fluent.io_fluentbits.yaml b/config/crd/bases/fluentbit.fluent.io_fluentbits.yaml
index 70e5e6da9..3d0a8685e 100644
--- a/config/crd/bases/fluentbit.fluent.io_fluentbits.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_fluentbits.yaml
@@ -4302,6 +4302,10 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              schedulerName:
+                description: SchedulerName represents the desired scheduler for fluent-bit
+                  pods.
+                type: string
               secrets:
                 description: The Secrets are mounted into /fluent-bit/secrets/<secret-name>.
                 items:
diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
index 137242e0b..ea8306ab4 100644
--- a/config/crd/bases/fluentd.fluent.io_fluentds.yaml
+++ b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
@@ -2253,6 +2253,10 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              schedulerName:
+                description: SchedulerName represents the desired scheduler for fluentd
+                  pods.
+                type: string
               securityContext:
                 description: PodSecurityContext represents the security context for
                   the fluentd pods.
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index 61128b7a8..ca94e14cf 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -15537,6 +15537,10 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              schedulerName:
+                description: SchedulerName represents the desired scheduler for fluent-bit
+                  pods.
+                type: string
               secrets:
                 description: The Secrets are mounted into /fluent-bit/secrets/<secret-name>.
                 items:
@@ -19914,6 +19918,10 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              schedulerName:
+                description: SchedulerName represents the desired scheduler for fluentd
+                  pods.
+                type: string
               securityContext:
                 description: PodSecurityContext represents the security context for
                   the fluentd pods.
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index dabf20c2d..c918ea032 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -15537,6 +15537,10 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              schedulerName:
+                description: SchedulerName represents the desired scheduler for fluent-bit
+                  pods.
+                type: string
               secrets:
                 description: The Secrets are mounted into /fluent-bit/secrets/<secret-name>.
                 items:
@@ -19914,6 +19918,10 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              schedulerName:
+                description: SchedulerName represents the desired scheduler for fluentd
+                  pods.
+                type: string
               securityContext:
                 description: PodSecurityContext represents the security context for
                   the fluentd pods.
diff --git a/pkg/operator/daemonset.go b/pkg/operator/daemonset.go
index 645dc6dcd..a3e9c002e 100644
--- a/pkg/operator/daemonset.go
+++ b/pkg/operator/daemonset.go
@@ -176,6 +176,10 @@ func MakeDaemonSet(fb fluentbitv1alpha2.FluentBit, logPath string) *appsv1.Daemo
 		ds.Spec.Template.Spec.PriorityClassName = fb.Spec.PriorityClassName
 	}
 
+	if fb.Spec.SchedulerName != "" {
+		ds.Spec.Template.Spec.SchedulerName = fb.Spec.SchedulerName
+	}
+
 	if fb.Spec.Volumes != nil {
 		ds.Spec.Template.Spec.Volumes = append(ds.Spec.Template.Spec.Volumes, fb.Spec.Volumes...)
 	}
diff --git a/pkg/operator/sts.go b/pkg/operator/sts.go
index 59c7e044b..6b8b00342 100644
--- a/pkg/operator/sts.go
+++ b/pkg/operator/sts.go
@@ -149,6 +149,10 @@ func MakeStatefulset(fd fluentdv1alpha1.Fluentd) *appsv1.StatefulSet {
 		sts.Spec.Template.Spec.SecurityContext = fd.Spec.SecurityContext
 	}
 
+	if fd.Spec.SchedulerName != "" {
+		sts.Spec.Template.Spec.SchedulerName = fd.Spec.SchedulerName
+	}
+
 	// Mount host or emptydir VolumeSource
 	if fd.Spec.BufferVolume != nil && !fd.Spec.BufferVolume.DisableBufferVolume {
 		bufferVolName := fmt.Sprintf("%s-buffer", fd.Name)

From 6058ba379b924d1e7f8492fab4be059ada2e0bf1 Mon Sep 17 00:00:00 2001
From: Jason Zhang <ksdpmx@gmail.com>
Date: Fri, 2 Jun 2023 15:26:27 +0800
Subject: [PATCH 45/78] add global loglevel support for fluentd

Signed-off-by: Jason Zhang <ksdpmx@gmail.com>
---
 apis/fluentd/v1alpha1/fluentd_types.go                |  5 +++++
 .../fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml | 11 +++++++++++
 charts/fluent-operator/templates/fluentd-fluentd.yaml |  3 +++
 charts/fluent-operator/values.yaml                    |  1 +
 config/crd/bases/fluentd.fluent.io_fluentds.yaml      | 11 +++++++++++
 controllers/fluentdconfig_controller.go               |  4 ++--
 docs/fluentd.md                                       |  1 +
 manifests/setup/fluent-operator-crd.yaml              | 11 +++++++++++
 manifests/setup/setup.yaml                            | 11 +++++++++++
 9 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/apis/fluentd/v1alpha1/fluentd_types.go b/apis/fluentd/v1alpha1/fluentd_types.go
index 8eb766a66..91595bf0e 100644
--- a/apis/fluentd/v1alpha1/fluentd_types.go
+++ b/apis/fluentd/v1alpha1/fluentd_types.go
@@ -42,6 +42,11 @@ type FluentdSpec struct {
 	Replicas *int32 `json:"replicas,omitempty"`
 	// Numbers of the workers in Fluentd instance
 	Workers *int32 `json:"workers,omitempty"`
+	// Global logging verbosity
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:validation:Enum:=fatal;error;warn;info;debug;trace
+	// +kubebuilder:default:=info
+	LogLevel string `json:"logLevel,omitempty"`
 	// Fluentd image.
 	Image string `json:"image,omitempty"`
 	// Fluentd Watcher command line arguments.
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
index 137242e0b..5b18c1e28 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
@@ -2140,6 +2140,17 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              logLevel:
+                default: info
+                description: Global logging verbosity
+                enum:
+                - fatal
+                - error
+                - warn
+                - info
+                - debug
+                - trace
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string
diff --git a/charts/fluent-operator/templates/fluentd-fluentd.yaml b/charts/fluent-operator/templates/fluentd-fluentd.yaml
index 6db6b1174..89cb02c39 100644
--- a/charts/fluent-operator/templates/fluentd-fluentd.yaml
+++ b/charts/fluent-operator/templates/fluentd-fluentd.yaml
@@ -18,5 +18,8 @@ spec:
   fluentdCfgSelector:
     matchLabels:
       config.fluentd.fluent.io/enabled: "true"
+  {{- if .Values.fluentd.logLevel }}
+  logLevel: {{ .Values.fluentd.logLevel }}
+  {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index b15a98913..413aef671 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -240,6 +240,7 @@ fluentd:
     requests:
       cpu: 100m
       memory: 128Mi
+  logLevel: ""
   # Configure the output plugin parameter in Fluentd.
   # Fluentd is disabled by default, if you enable it make sure to also set up an output to use.
   output:
diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
index 137242e0b..5b18c1e28 100644
--- a/config/crd/bases/fluentd.fluent.io_fluentds.yaml
+++ b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
@@ -2140,6 +2140,17 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              logLevel:
+                default: info
+                description: Global logging verbosity
+                enum:
+                - fatal
+                - error
+                - warn
+                - info
+                - debug
+                - trace
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string
diff --git a/controllers/fluentdconfig_controller.go b/controllers/fluentdconfig_controller.go
index 439d1a175..d452baabf 100644
--- a/controllers/fluentdconfig_controller.go
+++ b/controllers/fluentdconfig_controller.go
@@ -55,7 +55,7 @@ const (
 	SYSTEM = `# Enable RPC endpoint
 <system>
 	rpc_endpoint 127.0.0.1:24444
-	log_level info
+	log_level %s
 	workers %d
 </system>
 `
@@ -186,7 +186,7 @@ func (r *FluentdConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 				return ctrl.Result{}, err
 			}
 
-			systemCfg = fmt.Sprintf(SYSTEM, workers)
+			systemCfg = fmt.Sprintf(SYSTEM, fd.Spec.LogLevel, workers)
 		}
 
 		secName := fmt.Sprintf("%s-config", fd.Name)
diff --git a/docs/fluentd.md b/docs/fluentd.md
index 1172e3296..a331ee86e 100644
--- a/docs/fluentd.md
+++ b/docs/fluentd.md
@@ -289,6 +289,7 @@ FluentdSpec defines the desired state of Fluentd
 | disableService | By default will build the related service according to the globalinputs definition. | bool |
 | replicas | Numbers of the Fluentd instance | *int32 |
 | workers | Numbers of the workers in Fluentd instance | *int32 |
+| logLevel | Global logging verbosity | string |
 | image | Fluentd image. | string |
 | args | Fluentd Watcher command line arguments. | []string |
 | envVars | EnvVars represent environment variables that can be passed to fluentd pods. | []corev1.EnvVar |
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index 61128b7a8..9b60b1ebb 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -19801,6 +19801,17 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              logLevel:
+                default: info
+                description: Global logging verbosity
+                enum:
+                - fatal
+                - error
+                - warn
+                - info
+                - debug
+                - trace
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index dabf20c2d..49f2f8639 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -19801,6 +19801,17 @@ spec:
                   type: object
                   x-kubernetes-map-type: atomic
                 type: array
+              logLevel:
+                default: info
+                description: Global logging verbosity
+                enum:
+                - fatal
+                - error
+                - warn
+                - info
+                - debug
+                - trace
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string

From aa5f5bd49df9225ec6141e21f93f4b20c1c9cca6 Mon Sep 17 00:00:00 2001
From: dehaocheng <dehaocheng@kubesphere.io>
Date: Mon, 5 Jun 2023 14:26:59 +0800
Subject: [PATCH 46/78] release 2.3.0

Signed-off-by: dehaocheng <dehaocheng@kubesphere.io>
---
 CHANGELOG.md                                  | 46 +++++++++++++++++++
 RELEASE.md                                    |  1 +
 charts/fluent-operator/Chart.yaml             |  4 +-
 .../charts/fluent-bit-crds/Chart.yaml         |  4 +-
 .../charts/fluentd-crds/Chart.yaml            |  4 +-
 5 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19b920301..bb7802903 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,49 @@
+## 2.3.0 / 2023-06-05
+### Features
+- Feat: Adding influxdb plugin (#690)
+- Feat: Add EnvVars support to FluentD (#697)
+- Feat: Add Pod Annotations support to FluentD (#698)
+- Feat: Fluent operator & fluentbit: Added tolerations, nodeSelector + more (#704)
+- Feat: Add fluentbit.affinity configuration (#726)
+- Feat: Allow setting fluentd PodSecurityContext (#744)
+- Feat: Fluentd in_tail plugin (#753)
+- Feat: Add missing fluentd buffer options (#757)
+- Feat: Add AWS Kinesis Data Streams output plugin for Fluent Bit (#768)
+- Feat: Add global log_level support for fluentd (#770)
+- Feat: Add scheduler support for fluentbit & fluentd (#771)
+
+### ENHANCEMENT
+- EnvVars support in fluentbit helm template (#706) 
+- Add uri field for each telemetry type in opentelemetry plugin, remove old uri field (#708)
+- Adjust fluentd watcher dependabot (#716)
+- remove the deprecated -i flag in go build (#720) 
+- Adjust fluentd arm64 image build timeout (#721)
+- Adjust edge metrics collection config (#736) 
+- Add some fluentbit helm opts (#743)
+- Align CRDs and Operator with the fluentbit loki output (#756)
+- Fluent-bit upgrade to v2.1.4 (#767)
+- build(deps): Bump k8s.io/apimachinery from 0.26.3 to 0.27.1 (#701)
+- build(deps): Bump helm/chart-testing-action from 2.1.0 to 2.4.0 (#710)
+- build(deps): Bump k8s.io/klog/v2 from 2.90.1 to 2.100.1 (#712)
+- build(deps): Bump golang from 1.20.3-alpine3.17 to 1.20.4-alpine3.17 in /cmd/fluent-manager (#713)
+- build(deps): Bump golang from 1.20.3-alpine3.16 to 1.20.4-alpine3.16 in /cmd/fluent-watcher/fluentbit (#714)
+- build(deps): Bump golang from 1.20.2 to 1.20.4 in /docs/best-practice/forwarding-logs-via-http (#715) 
+- build(deps): Bump golang from 1.19.2-alpine3.16 to 1.20.4-alpine3.16 in /cmd/fluent-watcher/fluentd (#717)
+- build(deps): Bump arm64v8/ruby from 3.1-slim-bullseye to 3.2-slim-bullseye in /cmd/fluent-watcher/fluentd (#718)
+- build(deps): Bump alpine from 3.16 to 3.17 in /cmd/fluent-watcher/fluentd (#719)
+- build(deps): Bump github.com/onsi/gomega from 1.27.6 to 1.27.7 (#748)
+- build(deps): Bump k8s.io/apimachinery from 0.27.1 to 0.27.2 (#751)
+- build(deps): Bump helm/kind-action from 1.5.0 to 1.7.0 (#765)
+
+### BUGFIX 
+- Fix: Fix missing log level  (#691) 
+- Fix: Fix rewrite_tag match rule and trim start of string pattern (#692) 
+- Fix(docs): Update cluster outputs docs link (#724)
+- Fix: dereference pointers in parser filter plugin for fluentd (#745)
+- Fix: fluentbit namespace-logging: only generate rewrite tag config once (#746)
+- Fix: minor typo fix for firehose (#764)
+- Fix: fix typo for estimate_current_event in fluentd (#769) 
+
 ## 2.2.0 / 2023-04-07
 ### Features
 - Feat: Adding Fluentd cloudwatch plugin (#586)
diff --git a/RELEASE.md b/RELEASE.md
index 7b8781788..9443adbab 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -35,6 +35,7 @@ This page describes the release process and the currently planned schedule for u
 | v2.0.1           | 2023-02-08                                 | Elon Cheng (GitHub: @wenchajun)         |
 | v2.1.0           | 2023-03-13                                 | Elon Cheng (GitHub: @wenchajun)         |
 | v2.2.0           | 2023-04-07                                 | Elon Cheng (GitHub: @wenchajun)         |
+| v2.3.0           | 2023-06-05                                 | Elon Cheng (GitHub: @wenchajun)         |
 
 # How to cut a new release
 
diff --git a/charts/fluent-operator/Chart.yaml b/charts/fluent-operator/Chart.yaml
index 05c02ce7b..ec19fcbb8 100644
--- a/charts/fluent-operator/Chart.yaml
+++ b/charts/fluent-operator/Chart.yaml
@@ -15,12 +15,12 @@ description: A Helm chart for Kubernetes
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.2.1
+version: 2.3.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 2.2.0
+appVersion: 2.3.0
 
 dependencies:
   - name: fluent-bit-crds
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml b/charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml
index 0bfaec58f..81c3e8b4e 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/Chart.yaml
@@ -14,10 +14,10 @@ description: A Helm chart delivering fluenbt-bit controller CRDS
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.0
+version: 2.3.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2.1.0"
+appVersion: "2.3.0"
diff --git a/charts/fluent-operator/charts/fluentd-crds/Chart.yaml b/charts/fluent-operator/charts/fluentd-crds/Chart.yaml
index 8252d4081..f5730348f 100644
--- a/charts/fluent-operator/charts/fluentd-crds/Chart.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/Chart.yaml
@@ -14,10 +14,10 @@ description: A Helm chart delivering fluentd controller CRDS
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.0
+version: 2.3.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2.1.0"
+appVersion: "2.3.0"

From 05a8e812fd58b1eea66d89a32543290fe855f2ff Mon Sep 17 00:00:00 2001
From: Jason Zhang <ksdpmx@gmail.com>
Date: Tue, 6 Jun 2023 10:26:16 +0800
Subject: [PATCH 47/78] add scheduler support for fluentbit collector

Signed-off-by: Jason Zhang <ksdpmx@gmail.com>
---
 apis/fluentbit/v1alpha2/collector_types.go       |  2 ++
 .../crds/fluentbit.fluent.io_collectors.yaml     |  4 ++++
 .../bases/fluentbit.fluent.io_collectors.yaml    |  4 ++++
 controllers/collector_controller.go              | 10 +++++-----
 manifests/setup/fluent-operator-crd.yaml         |  4 ++++
 manifests/setup/setup.yaml                       |  4 ++++
 pkg/operator/collector-service.go                | 16 ++++++++--------
 pkg/operator/collector-statefulset.go            | 10 +++++++---
 8 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/apis/fluentbit/v1alpha2/collector_types.go b/apis/fluentbit/v1alpha2/collector_types.go
index 79c1c30d7..d3c112289 100644
--- a/apis/fluentbit/v1alpha2/collector_types.go
+++ b/apis/fluentbit/v1alpha2/collector_types.go
@@ -77,6 +77,8 @@ type CollectorSpec struct {
 	Ports []corev1.ContainerPort `json:"ports,omitempty"`
 	// Service represents configurations on the fluent-bit service.
 	Service CollectorService `json:"service,omitempty"`
+	// SchedulerName represents the desired scheduler for the Fluentbit collector pods
+	SchedulerName string `json:"schedulerName,omitempty"`
 }
 
 // CollectorService defines the service of the FluentBit
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_collectors.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_collectors.yaml
index be86399d4..a2b9b26e6 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_collectors.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_collectors.yaml
@@ -1390,6 +1390,10 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              schedulerName:
+                description: SchedulerName represents the desired scheduler for the
+                  Fluentbit collector pods
+                type: string
               secrets:
                 description: The Secrets are mounted into /fluent-bit/secrets/<secret-name>.
                 items:
diff --git a/config/crd/bases/fluentbit.fluent.io_collectors.yaml b/config/crd/bases/fluentbit.fluent.io_collectors.yaml
index be86399d4..a2b9b26e6 100644
--- a/config/crd/bases/fluentbit.fluent.io_collectors.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_collectors.yaml
@@ -1390,6 +1390,10 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              schedulerName:
+                description: SchedulerName represents the desired scheduler for the
+                  Fluentbit collector pods
+                type: string
               secrets:
                 description: The Secrets are mounted into /fluent-bit/secrets/<secret-name>.
                 items:
diff --git a/controllers/collector_controller.go b/controllers/collector_controller.go
index 7e635866e..ec4987c3e 100644
--- a/controllers/collector_controller.go
+++ b/controllers/collector_controller.go
@@ -108,8 +108,8 @@ func (r *CollectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		return ctrl.Result{}, err
 	}
 
-	// Deploy Fluent Bit Statefuset
-	sts := operator.MakefbStatefuset(co)
+	// Deploy Fluent Bit Statefulset
+	sts := operator.MakefbStatefulset(co)
 	if err := ctrl.SetControllerReference(&co, sts, r.Scheme); err != nil {
 		return ctrl.Result{}, err
 	}
@@ -120,7 +120,7 @@ func (r *CollectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 
 	// Deploy collector Service
 	if !co.Spec.DisableService {
-		svc := operator.MakeCollecotrService(co)
+		svc := operator.MakeCollectorService(co)
 		if err := ctrl.SetControllerReference(&co, svc, r.Scheme); err != nil {
 			return ctrl.Result{}, err
 		}
@@ -136,7 +136,7 @@ func (r *CollectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 func (r *CollectorReconciler) mutate(obj client.Object, co fluentbitv1alpha2.Collector) controllerutil.MutateFn {
 	switch o := obj.(type) {
 	case *appsv1.StatefulSet:
-		expected := operator.MakefbStatefuset(co)
+		expected := operator.MakefbStatefulset(co)
 
 		return func() error {
 			o.Labels = expected.Labels
@@ -149,7 +149,7 @@ func (r *CollectorReconciler) mutate(obj client.Object, co fluentbitv1alpha2.Col
 			return nil
 		}
 	case *corev1.Service:
-		expected := operator.MakeCollecotrService(co)
+		expected := operator.MakeCollectorService(co)
 
 		return func() error {
 			o.Labels = expected.Labels
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index d8d28c94e..7fa69b16f 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -7986,6 +7986,10 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              schedulerName:
+                description: SchedulerName represents the desired scheduler for the
+                  Fluentbit collector pods
+                type: string
               secrets:
                 description: The Secrets are mounted into /fluent-bit/secrets/<secret-name>.
                 items:
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index c067f0922..950cb44be 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -7986,6 +7986,10 @@ spec:
               runtimeClassName:
                 description: RuntimeClassName represents the container runtime configuration.
                 type: string
+              schedulerName:
+                description: SchedulerName represents the desired scheduler for the
+                  Fluentbit collector pods
+                type: string
               secrets:
                 description: The Secrets are mounted into /fluent-bit/secrets/<secret-name>.
                 items:
diff --git a/pkg/operator/collector-service.go b/pkg/operator/collector-service.go
index 0985eb05b..842eac5ec 100644
--- a/pkg/operator/collector-service.go
+++ b/pkg/operator/collector-service.go
@@ -9,12 +9,12 @@ import (
 )
 
 const (
-	CollecotrMetricsPortName = "metrics"
-	CollecotrMetricsPort     = 2020
-	CollecotrTCPProtocolName = "TCP"
+	CollectorMetricsPortName = "metrics"
+	CollectorMetricsPort     = 2020
+	CollectorTCPProtocolName = "TCP"
 )
 
-func MakeCollecotrService(co fluentbitv1alpha2.Collector) *corev1.Service {
+func MakeCollectorService(co fluentbitv1alpha2.Collector) *corev1.Service {
 	var name string
 	var labels map[string]string
 
@@ -41,10 +41,10 @@ func MakeCollecotrService(co fluentbitv1alpha2.Collector) *corev1.Service {
 			Type:     corev1.ServiceTypeClusterIP,
 			Ports: []corev1.ServicePort{
 				{
-					Name:       CollecotrMetricsPortName,
-					Port:       CollecotrMetricsPort,
-					Protocol:   CollecotrTCPProtocolName,
-					TargetPort: intstr.FromInt(CollecotrMetricsPort),
+					Name:       CollectorMetricsPortName,
+					Port:       CollectorMetricsPort,
+					Protocol:   CollectorTCPProtocolName,
+					TargetPort: intstr.FromInt(CollectorMetricsPort),
 				},
 			},
 		},
diff --git a/pkg/operator/collector-statefulset.go b/pkg/operator/collector-statefulset.go
index e3844bd34..79edaf1f7 100644
--- a/pkg/operator/collector-statefulset.go
+++ b/pkg/operator/collector-statefulset.go
@@ -16,7 +16,7 @@ var (
 	DefaultBufferPath = "/buffers/fluentbit/log"
 )
 
-func MakefbStatefuset(co fluentbitv1alpha2.Collector) *appsv1.StatefulSet {
+func MakefbStatefulset(co fluentbitv1alpha2.Collector) *appsv1.StatefulSet {
 	statefulset := appsv1.StatefulSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      co.Name,
@@ -106,6 +106,10 @@ func MakefbStatefuset(co fluentbitv1alpha2.Collector) *appsv1.StatefulSet {
 		statefulset.Spec.Template.Spec.PriorityClassName = co.Spec.PriorityClassName
 	}
 
+	if co.Spec.SchedulerName != "" {
+		statefulset.Spec.Template.Spec.SchedulerName = co.Spec.SchedulerName
+	}
+
 	if co.Spec.Volumes != nil {
 		statefulset.Spec.Template.Spec.Volumes = append(statefulset.Spec.Template.Spec.Volumes, co.Spec.Volumes...)
 	}
@@ -134,7 +138,7 @@ func MakefbStatefuset(co fluentbitv1alpha2.Collector) *appsv1.StatefulSet {
 	statefulset.Spec.VolumeClaimTemplates = append(statefulset.Spec.VolumeClaimTemplates, MakeFluentbitPVC(co))
 	statefulset.Spec.Template.Spec.Containers[0].VolumeMounts = append(statefulset.Spec.Template.Spec.Containers[0].VolumeMounts, corev1.VolumeMount{
 		Name:      fmt.Sprintf("%s-buffer-pvc", co.Name),
-		MountPath: FlunetbitBufferMountPath(co),
+		MountPath: FluentbitBufferMountPath(co),
 	})
 
 	return &statefulset
@@ -185,7 +189,7 @@ func makeDefaultFluentbitPVC(co fluentbitv1alpha2.Collector) corev1.PersistentVo
 	return pvc
 }
 
-func FlunetbitBufferMountPath(co fluentbitv1alpha2.Collector) string {
+func FluentbitBufferMountPath(co fluentbitv1alpha2.Collector) string {
 	bufferPath := co.Spec.BufferPath
 	if bufferPath != nil {
 		return *bufferPath

From fa6fb43ae41ac377fd95b4e2a6df549b9f31792d Mon Sep 17 00:00:00 2001
From: Jason Zhang <ksdpmx@gmail.com>
Date: Tue, 6 Jun 2023 11:50:46 +0800
Subject: [PATCH 48/78] fix: finalizer deletion and adoption cleanup and fix
 for 3 controllers

Signed-off-by: Jason Zhang <ksdpmx@gmail.com>
---
 controllers/collector_controller.go        | 102 +++++++++++-------
 controllers/fluent_controller_finalizer.go |  74 ++++++++-----
 controllers/fluentbit_controller.go        | 115 ++++++++++++---------
 controllers/fluentd_controller.go          |  28 ++---
 pkg/operator/rbac.go                       |  43 +++++---
 5 files changed, 221 insertions(+), 141 deletions(-)

diff --git a/controllers/collector_controller.go b/controllers/collector_controller.go
index ec4987c3e..833b94331 100644
--- a/controllers/collector_controller.go
+++ b/controllers/collector_controller.go
@@ -23,6 +23,7 @@ import (
 	"github.com/go-logr/logr"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -92,40 +93,30 @@ func (r *CollectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	}
 
 	// Install RBAC resources for the filter plugin kubernetes
-	var rbacObj, saObj, bindingObj client.Object
-	rbacObj, saObj, bindingObj = operator.MakeRBACObjects(co.Name, co.Namespace, "collector", co.Spec.RBACRules, co.Spec.ServiceAccountAnnotations)
-	// Set ServiceAccount's owner to this fluentbit
-	if err := ctrl.SetControllerReference(&co, saObj, r.Scheme); err != nil {
+	cr, sa, crb := operator.MakeRBACObjects(co.Name, co.Namespace, "collector", co.Spec.RBACRules, co.Spec.ServiceAccountAnnotations)
+	// Deploy Fluent Bit Collector ClusterRole
+	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, cr, r.mutate(cr, &co)); err != nil {
 		return ctrl.Result{}, err
 	}
-	if err := r.Create(ctx, rbacObj); err != nil && !errors.IsAlreadyExists(err) {
+	// Deploy Fluent Bit Collector ClusterRoleBinding
+	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, crb, r.mutate(crb, &co)); err != nil {
 		return ctrl.Result{}, err
 	}
-	if err := r.Create(ctx, saObj); err != nil && !errors.IsAlreadyExists(err) {
-		return ctrl.Result{}, err
-	}
-	if err := r.Create(ctx, bindingObj); err != nil && !errors.IsAlreadyExists(err) {
+	// Deploy Fluent Bit Collector ServiceAccount
+	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, sa, r.mutate(sa, &co)); err != nil {
 		return ctrl.Result{}, err
 	}
 
-	// Deploy Fluent Bit Statefulset
+	// Deploy Fluent Bit Collector Statefulset
 	sts := operator.MakefbStatefulset(co)
-	if err := ctrl.SetControllerReference(&co, sts, r.Scheme); err != nil {
-		return ctrl.Result{}, err
-	}
-
-	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, sts, r.mutate(sts, co)); err != nil {
+	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, sts, r.mutate(sts, &co)); err != nil {
 		return ctrl.Result{}, err
 	}
 
-	// Deploy collector Service
+	// Deploy Fluent Bit Collector Service
 	if !co.Spec.DisableService {
 		svc := operator.MakeCollectorService(co)
-		if err := ctrl.SetControllerReference(&co, svc, r.Scheme); err != nil {
-			return ctrl.Result{}, err
-		}
-
-		if _, err := controllerutil.CreateOrPatch(ctx, r.Client, svc, r.mutate(svc, co)); err != nil {
+		if _, err := controllerutil.CreateOrPatch(ctx, r.Client, svc, r.mutate(svc, &co)); err != nil {
 			return ctrl.Result{}, err
 		}
 	}
@@ -133,35 +124,56 @@ func (r *CollectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	return ctrl.Result{}, nil
 }
 
-func (r *CollectorReconciler) mutate(obj client.Object, co fluentbitv1alpha2.Collector) controllerutil.MutateFn {
+func (r *CollectorReconciler) mutate(obj client.Object, co *fluentbitv1alpha2.Collector) controllerutil.MutateFn {
 	switch o := obj.(type) {
+	case *rbacv1.ClusterRole:
+		expected, _, _ := operator.MakeRBACObjects(co.Name, co.Namespace, "collector", co.Spec.RBACRules, co.Spec.ServiceAccountAnnotations)
+
+		return func() error {
+			o.Rules = expected.Rules
+			return nil
+		}
+	case *corev1.ServiceAccount:
+		_, expected, _ := operator.MakeRBACObjects(co.Name, co.Namespace, "collector", co.Spec.RBACRules, co.Spec.ServiceAccountAnnotations)
+
+		return func() error {
+			o.Annotations = expected.Annotations
+			if err := ctrl.SetControllerReference(co, o, r.Scheme); err != nil {
+				return err
+			}
+			return nil
+		}
+	case *rbacv1.ClusterRoleBinding:
+		_, _, expected := operator.MakeRBACObjects(co.Name, co.Namespace, "collector", co.Spec.RBACRules, co.Spec.ServiceAccountAnnotations)
+
+		return func() error {
+			o.RoleRef = expected.RoleRef
+			o.Subjects = expected.Subjects
+			return nil
+		}
 	case *appsv1.StatefulSet:
-		expected := operator.MakefbStatefulset(co)
+		expected := operator.MakefbStatefulset(*co)
 
 		return func() error {
 			o.Labels = expected.Labels
-			o.Annotations = expected.Annotations
 			o.Spec = expected.Spec
-			o.SetOwnerReferences(nil)
-			if err := ctrl.SetControllerReference(&co, o, r.Scheme); err != nil {
+			if err := ctrl.SetControllerReference(co, o, r.Scheme); err != nil {
 				return err
 			}
 			return nil
 		}
 	case *corev1.Service:
-		expected := operator.MakeCollectorService(co)
+		expected := operator.MakeCollectorService(*co)
 
 		return func() error {
 			o.Labels = expected.Labels
 			o.Spec.Selector = expected.Spec.Selector
 			o.Spec.Ports = expected.Spec.Ports
-			o.SetOwnerReferences(nil)
-			if err := ctrl.SetControllerReference(&co, o, r.Scheme); err != nil {
+			if err := ctrl.SetControllerReference(co, o, r.Scheme); err != nil {
 				return err
 			}
 			return nil
 		}
-
 	default:
 	}
 
@@ -169,18 +181,38 @@ func (r *CollectorReconciler) mutate(obj client.Object, co fluentbitv1alpha2.Col
 }
 
 func (r *CollectorReconciler) delete(ctx context.Context, co *fluentbitv1alpha2.Collector) error {
-	var sa corev1.ServiceAccount
+	sa := corev1.ServiceAccount{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      co.Name,
+			Namespace: co.Namespace,
+		},
+	}
 	if err := r.Delete(ctx, &sa); err != nil && !errors.IsNotFound(err) {
 		return err
 	}
+	// TODO: clusterrole, clusterrolebinding
 
-	var svc corev1.Service
-	if err := r.Delete(ctx, &svc); err != nil && !errors.IsNotFound(err) {
+	sts := appsv1.StatefulSet{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      co.Name,
+			Namespace: co.Namespace,
+		},
+	}
+	if err := r.Delete(ctx, &sts); err != nil && !errors.IsNotFound(err) {
 		return err
 	}
 
-	var sts appsv1.StatefulSet
-	if err := r.Delete(ctx, &sts); err != nil && !errors.IsNotFound(err) {
+	svcName := co.Name
+	if co.Spec.Service.Name != "" {
+		svcName = co.Spec.Service.Name
+	}
+	svc := corev1.Service{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      svcName,
+			Namespace: co.Namespace,
+		},
+	}
+	if err := r.Delete(ctx, &svc); err != nil && !errors.IsNotFound(err) {
 		return err
 	}
 
diff --git a/controllers/fluent_controller_finalizer.go b/controllers/fluent_controller_finalizer.go
index 26756f9c7..f0ac6c84c 100644
--- a/controllers/fluent_controller_finalizer.go
+++ b/controllers/fluent_controller_finalizer.go
@@ -2,10 +2,12 @@ package controllers
 
 import (
 	"context"
+	rbacv1 "k8s.io/api/rbac/v1"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -64,33 +66,34 @@ func (r *FluentdReconciler) handleFinalizer(ctx context.Context, instance *fluen
 }
 
 func (r *FluentdReconciler) delete(ctx context.Context, fd *fluentdv1alpha1.Fluentd) error {
-	var sa corev1.ServiceAccount
-	err := r.Get(ctx, client.ObjectKey{Namespace: fd.Namespace, Name: fd.Name}, &sa)
-	if err == nil {
-		if err := r.Delete(ctx, &sa); err != nil && !errors.IsNotFound(err) {
-			return err
-		}
-	} else if !errors.IsNotFound(err) {
+	sa := corev1.ServiceAccount{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      fd.Name,
+			Namespace: fd.Namespace,
+		},
+	}
+	if err := r.Delete(ctx, &sa); err != nil && !errors.IsNotFound(err) {
 		return err
 	}
+	// TODO: clusterrole, clusterrolebinding
 
-	var svc corev1.Service
-	err = r.Get(ctx, client.ObjectKey{Namespace: fd.Namespace, Name: fd.Name}, &svc)
-	if err == nil {
-		if err := r.Delete(ctx, &svc); err != nil && !errors.IsNotFound(err) {
-			return err
-		}
-	} else if !errors.IsNotFound(err) {
+	sts := appsv1.StatefulSet{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      fd.Name,
+			Namespace: fd.Namespace,
+		},
+	}
+	if err := r.Delete(ctx, &sts); err != nil && !errors.IsNotFound(err) {
 		return err
 	}
 
-	var sts appsv1.StatefulSet
-	err = r.Get(ctx, client.ObjectKey{Namespace: fd.Namespace, Name: fd.Name}, &sts)
-	if err == nil {
-		if err := r.Delete(ctx, &sts); err != nil && !errors.IsNotFound(err) {
-			return err
-		}
-	} else if !errors.IsNotFound(err) {
+	svc := corev1.Service{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      fd.Name,
+			Namespace: fd.Namespace,
+		},
+	}
+	if err := r.Delete(ctx, &svc); err != nil && !errors.IsNotFound(err) {
 		return err
 	}
 
@@ -99,13 +102,38 @@ func (r *FluentdReconciler) delete(ctx context.Context, fd *fluentdv1alpha1.Flue
 
 func (r *FluentdReconciler) mutate(obj client.Object, fd *fluentdv1alpha1.Fluentd) controllerutil.MutateFn {
 	switch o := obj.(type) {
+	case *rbacv1.ClusterRole:
+		expected, _, _ := operator.MakeRBACObjects(fd.Name, fd.Namespace, "fluentd", fd.Spec.RBACRules, fd.Spec.ServiceAccountAnnotations)
+
+		return func() error {
+			o.Rules = expected.Rules
+			return nil
+		}
+	case *corev1.ServiceAccount:
+		_, expected, _ := operator.MakeRBACObjects(fd.Name, fd.Namespace, "fluentd", fd.Spec.RBACRules, fd.Spec.ServiceAccountAnnotations)
+
+		return func() error {
+			o.Labels = expected.Labels
+			o.Annotations = expected.Annotations
+			if err := ctrl.SetControllerReference(fd, o, r.Scheme); err != nil {
+				return err
+			}
+			return nil
+		}
+	case *rbacv1.ClusterRoleBinding:
+		_, _, expected := operator.MakeRBACObjects(fd.Name, fd.Namespace, "fluentd", fd.Spec.RBACRules, fd.Spec.ServiceAccountAnnotations)
+
+		return func() error {
+			o.RoleRef = expected.RoleRef
+			o.Subjects = expected.Subjects
+			return nil
+		}
 	case *appsv1.StatefulSet:
 		expected := operator.MakeStatefulset(*fd)
 
 		return func() error {
 			o.Labels = expected.Labels
 			o.Spec = expected.Spec
-			o.SetOwnerReferences(nil)
 			if err := ctrl.SetControllerReference(fd, o, r.Scheme); err != nil {
 				return err
 			}
@@ -118,13 +146,11 @@ func (r *FluentdReconciler) mutate(obj client.Object, fd *fluentdv1alpha1.Fluent
 			o.Labels = expected.Labels
 			o.Spec.Selector = expected.Spec.Selector
 			o.Spec.Ports = expected.Spec.Ports
-			o.SetOwnerReferences(nil)
 			if err := ctrl.SetControllerReference(fd, o, r.Scheme); err != nil {
 				return err
 			}
 			return nil
 		}
-
 	default:
 	}
 
diff --git a/controllers/fluentbit_controller.go b/controllers/fluentbit_controller.go
index 368ebe844..9257c2b4d 100644
--- a/controllers/fluentbit_controller.go
+++ b/controllers/fluentbit_controller.go
@@ -97,45 +97,33 @@ func (r *FluentBitReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	}
 
 	// Install RBAC resources for the filter plugin kubernetes
-	var rbacObj, saObj, bindingObj client.Object
+	var role, sa, binding client.Object
 	if r.Namespaced {
-		rbacObj, saObj, bindingObj = operator.MakeScopedRBACObjects(fb.Name, fb.Namespace, fb.Spec.ServiceAccountAnnotations)
+		role, sa, binding = operator.MakeScopedRBACObjects(fb.Name, fb.Namespace, fb.Spec.ServiceAccountAnnotations)
 	} else {
-		rbacObj, saObj, bindingObj = operator.MakeRBACObjects(fb.Name, fb.Namespace, "fluent-bit", fb.Spec.RBACRules, fb.Spec.ServiceAccountAnnotations)
+		role, sa, binding = operator.MakeRBACObjects(fb.Name, fb.Namespace, "fluent-bit", fb.Spec.RBACRules, fb.Spec.ServiceAccountAnnotations)
 	}
-	// Set ServiceAccount's owner to this fluentbit
-	if err := ctrl.SetControllerReference(&fb, saObj, r.Scheme); err != nil {
+	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, role, r.mutate(role, &fb)); err != nil {
 		return ctrl.Result{}, err
 	}
-	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, rbacObj, r.mutate(rbacObj, fb)); err != nil {
+	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, sa, r.mutate(sa, &fb)); err != nil {
 		return ctrl.Result{}, err
 	}
-	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, saObj, r.mutate(saObj, fb)); err != nil {
-		return ctrl.Result{}, err
-	}
-	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, bindingObj, r.mutate(bindingObj, fb)); err != nil {
+	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, binding, r.mutate(binding, &fb)); err != nil {
 		return ctrl.Result{}, err
 	}
 
 	// Deploy Fluent Bit DaemonSet
 	logPath := r.getContainerLogPath(fb)
 	ds := operator.MakeDaemonSet(fb, logPath)
-	if err := ctrl.SetControllerReference(&fb, ds, r.Scheme); err != nil {
-		return ctrl.Result{}, err
-	}
-
-	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, ds, r.mutate(ds, fb)); err != nil {
+	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, ds, r.mutate(ds, &fb)); err != nil {
 		return ctrl.Result{}, err
 	}
 
 	// Deploy FluentBit Service
 	if !fb.Spec.DisableService {
 		svc := operator.MakeFluentbitService(fb)
-		if err := ctrl.SetControllerReference(&fb, svc, r.Scheme); err != nil {
-			return ctrl.Result{}, err
-		}
-
-		if _, err := controllerutil.CreateOrPatch(ctx, r.Client, svc, r.mutate(svc, fb)); err != nil {
+		if _, err := controllerutil.CreateOrPatch(ctx, r.Client, svc, r.mutate(svc, &fb)); err != nil {
 			return ctrl.Result{}, err
 		}
 	}
@@ -153,33 +141,31 @@ func (r *FluentBitReconciler) getContainerLogPath(fb fluentbitv1alpha2.FluentBit
 	}
 }
 
-func (r *FluentBitReconciler) mutate(obj client.Object, fb fluentbitv1alpha2.FluentBit) controllerutil.MutateFn {
-	logPath := r.getContainerLogPath(fb)
+func (r *FluentBitReconciler) mutate(obj client.Object, fb *fluentbitv1alpha2.FluentBit) controllerutil.MutateFn {
+	logPath := r.getContainerLogPath(*fb)
 
 	switch o := obj.(type) {
 	case *appsv1.DaemonSet:
-		expected := operator.MakeDaemonSet(fb, logPath)
+		expected := operator.MakeDaemonSet(*fb, logPath)
 
 		return func() error {
 			o.Labels = expected.Labels
 			o.Annotations = expected.Annotations
 			o.Spec = expected.Spec
-			o.SetOwnerReferences(nil)
-			if err := ctrl.SetControllerReference(&fb, o, r.Scheme); err != nil {
+			if err := ctrl.SetControllerReference(fb, o, r.Scheme); err != nil {
 				return err
 			}
 			return nil
 		}
 
 	case *corev1.Service:
-		expected := operator.MakeFluentbitService(fb)
+		expected := operator.MakeFluentbitService(*fb)
 
 		return func() error {
 			o.Labels = expected.Labels
 			o.Spec.Selector = expected.Spec.Selector
 			o.Spec.Ports = expected.Spec.Ports
-			o.SetOwnerReferences(nil)
-			if err := ctrl.SetControllerReference(&fb, o, r.Scheme); err != nil {
+			if err := ctrl.SetControllerReference(fb, o, r.Scheme); err != nil {
 				return err
 			}
 			return nil
@@ -188,25 +174,24 @@ func (r *FluentBitReconciler) mutate(obj client.Object, fb fluentbitv1alpha2.Flu
 		expected, _, _ := operator.MakeScopedRBACObjects(fb.Name, fb.Namespace, fb.Spec.ServiceAccountAnnotations)
 
 		return func() error {
-			o.Name = expected.Name
 			o.Rules = expected.Rules
+			if err := ctrl.SetControllerReference(fb, o, r.Scheme); err != nil {
+				return err
+			}
 			return nil
 		}
 	case *rbacv1.ClusterRole:
 		expected, _, _ := operator.MakeRBACObjects(fb.Name, fb.Namespace, "fluent-bit", fb.Spec.RBACRules, fb.Spec.ServiceAccountAnnotations)
 		return func() error {
-			o.Name = expected.Name
 			o.Rules = expected.Rules
 			return nil
 		}
-
 	case *corev1.ServiceAccount:
 		_, expected, _ := operator.MakeScopedRBACObjects(fb.Name, fb.Namespace, fb.Spec.ServiceAccountAnnotations)
 
 		return func() error {
-			o.Name = expected.Name
 			o.Annotations = expected.Annotations
-			if err := ctrl.SetControllerReference(&fb, o, r.Scheme); err != nil {
+			if err := ctrl.SetControllerReference(fb, o, r.Scheme); err != nil {
 				return err
 			}
 			return nil
@@ -214,20 +199,20 @@ func (r *FluentBitReconciler) mutate(obj client.Object, fb fluentbitv1alpha2.Flu
 	case *rbacv1.RoleBinding:
 		_, _, expected := operator.MakeScopedRBACObjects(fb.Name, fb.Namespace, fb.Spec.ServiceAccountAnnotations)
 		return func() error {
-			o.Name = expected.Name
 			o.Subjects = expected.Subjects
 			o.RoleRef = expected.RoleRef
+			if err := ctrl.SetControllerReference(fb, o, r.Scheme); err != nil {
+				return err
+			}
 			return nil
 		}
 	case *rbacv1.ClusterRoleBinding:
 		_, _, expected := operator.MakeRBACObjects(fb.Name, fb.Namespace, "fluent-bit", fb.Spec.RBACRules, fb.Spec.ServiceAccountAnnotations)
 		return func() error {
-			o.Name = expected.Name
 			o.Subjects = expected.Subjects
 			o.RoleRef = expected.RoleRef
 			return nil
 		}
-
 	default:
 	}
 
@@ -235,23 +220,57 @@ func (r *FluentBitReconciler) mutate(obj client.Object, fb fluentbitv1alpha2.Flu
 }
 
 func (r *FluentBitReconciler) delete(ctx context.Context, fb *fluentbitv1alpha2.FluentBit) error {
-	var sa corev1.ServiceAccount
-	err := r.Get(ctx, client.ObjectKey{Namespace: fb.Namespace, Name: fb.Name}, &sa)
-	if err == nil {
-		if err := r.Delete(ctx, &sa); err != nil && !errors.IsNotFound(err) {
-			return err
-		}
-	} else if !errors.IsNotFound(err) {
+	sa := corev1.ServiceAccount{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      fb.Name,
+			Namespace: fb.Namespace,
+		},
+	}
+	if err := r.Delete(ctx, &sa); err != nil && !errors.IsNotFound(err) {
 		return err
 	}
 
-	var ds appsv1.DaemonSet
-	err = r.Get(ctx, client.ObjectKey{Namespace: fb.Namespace, Name: fb.Name}, &ds)
-	if err == nil {
-		if err := r.Delete(ctx, &ds); err != nil && !errors.IsNotFound(err) {
+	if r.Namespaced {
+		roleName, _, roleBindingName := operator.MakeScopedRBACNames(fb.Name)
+		role := rbacv1.Role{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      roleName,
+				Namespace: fb.Namespace,
+			},
+		}
+		if err := r.Delete(ctx, &role); err != nil && !errors.IsNotFound(err) {
+			return err
+		}
+
+		rolebinding := rbacv1.RoleBinding{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      roleBindingName,
+				Namespace: fb.Namespace,
+			},
+		}
+		if err := r.Delete(ctx, &rolebinding); err != nil && !errors.IsNotFound(err) {
 			return err
 		}
-	} else if !errors.IsNotFound(err) {
+	}
+	// TODO: clusterrole, clusterrolebinding
+
+	ds := appsv1.DaemonSet{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      fb.Name,
+			Namespace: fb.Namespace,
+		},
+	}
+	if err := r.Delete(ctx, &ds); err != nil && !errors.IsNotFound(err) {
+		return err
+	}
+
+	svc := corev1.Service{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      fb.Name,
+			Namespace: fb.Namespace,
+		},
+	}
+	if err := r.Delete(ctx, &svc); err != nil && !errors.IsNotFound(err) {
 		return err
 	}
 
diff --git a/controllers/fluentd_controller.go b/controllers/fluentd_controller.go
index 99535898c..fada5638c 100644
--- a/controllers/fluentd_controller.go
+++ b/controllers/fluentd_controller.go
@@ -91,39 +91,29 @@ func (r *FluentdReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 	}
 
 	// Install RBAC resources for the filter plugin kubernetes
-	var rbacObj, saObj, bindingObj = operator.MakeRBACObjects(fd.Name, fd.Namespace, "fluentd", fd.Spec.RBACRules, fd.Spec.ServiceAccountAnnotations)
-
-	// Set ServiceAccount's owner to this Fluentd
-	if err := ctrl.SetControllerReference(&fd, saObj, r.Scheme); err != nil {
-		return ctrl.Result{}, err
-	}
-	if err := r.Create(ctx, rbacObj); err != nil && !errors.IsAlreadyExists(err) {
+	cr, sa, crb := operator.MakeRBACObjects(fd.Name, fd.Namespace, "fluentd", fd.Spec.RBACRules, fd.Spec.ServiceAccountAnnotations)
+	// Deploy Fluentd ClusterRole
+	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, cr, r.mutate(cr, &fd)); err != nil {
 		return ctrl.Result{}, err
 	}
-	if err := r.Create(ctx, saObj); err != nil && !errors.IsAlreadyExists(err) {
+	// Deploy Fluentd ClusterRoleBinding
+	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, crb, r.mutate(crb, &fd)); err != nil {
 		return ctrl.Result{}, err
 	}
-	if err := r.Create(ctx, bindingObj); err != nil && !errors.IsAlreadyExists(err) {
+	// Deploy Fluentd ServiceAccount
+	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, sa, r.mutate(sa, &fd)); err != nil {
 		return ctrl.Result{}, err
 	}
 
 	// Deploy Fluentd Statefulset
-	dp := operator.MakeStatefulset(fd)
-	if err := ctrl.SetControllerReference(&fd, dp, r.Scheme); err != nil {
-		return ctrl.Result{}, err
-	}
-
-	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, dp, r.mutate(dp, &fd)); err != nil {
+	sts := operator.MakeStatefulset(fd)
+	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, sts, r.mutate(sts, &fd)); err != nil {
 		return ctrl.Result{}, err
 	}
 
 	// Deploy Fluentd Service
 	if !fd.Spec.DisableService {
 		svc := operator.MakeFluentdService(fd)
-		if err := ctrl.SetControllerReference(&fd, svc, r.Scheme); err != nil {
-			return ctrl.Result{}, err
-		}
-
 		if _, err := controllerutil.CreateOrPatch(ctx, r.Client, svc, r.mutate(svc, &fd)); err != nil {
 			return ctrl.Result{}, err
 		}
diff --git a/pkg/operator/rbac.go b/pkg/operator/rbac.go
index 1321d84ee..144013ca9 100644
--- a/pkg/operator/rbac.go
+++ b/pkg/operator/rbac.go
@@ -9,10 +9,10 @@ import (
 )
 
 func MakeRBACObjects(name, namespace, component string, additionalRules []rbacv1.PolicyRule, saAnnotations map[string]string) (*rbacv1.ClusterRole, *corev1.ServiceAccount, *rbacv1.ClusterRoleBinding) {
-	rbacName := fmt.Sprintf("fluent-operator-%s", component)
+	crName, saName, crbName := MakeRBACNames(name, component)
 	cr := rbacv1.ClusterRole{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: rbacName,
+			Name: crName,
 		},
 		Rules: []rbacv1.PolicyRule{
 			{
@@ -29,7 +29,7 @@ func MakeRBACObjects(name, namespace, component string, additionalRules []rbacv1
 
 	sa := corev1.ServiceAccount{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        name,
+			Name:        saName,
 			Namespace:   namespace,
 			Annotations: saAnnotations,
 		},
@@ -37,7 +37,7 @@ func MakeRBACObjects(name, namespace, component string, additionalRules []rbacv1
 
 	crb := rbacv1.ClusterRoleBinding{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: fmt.Sprintf("fluent-operator-%s-%s", component, name),
+			Name: crbName,
 		},
 		Subjects: []rbacv1.Subject{
 			{
@@ -49,18 +49,19 @@ func MakeRBACObjects(name, namespace, component string, additionalRules []rbacv1
 		RoleRef: rbacv1.RoleRef{
 			APIGroup: rbacv1.GroupName,
 			Kind:     "ClusterRole",
-			Name:     rbacName,
+			Name:     crName,
 		},
 	}
 
 	return &cr, &sa, &crb
 }
 
-func MakeScopedRBACObjects(fbName, fbNamespace string, saAnnotations map[string]string) (*rbacv1.Role, *corev1.ServiceAccount, *rbacv1.RoleBinding) {
+func MakeScopedRBACObjects(name, namespace string, saAnnotations map[string]string) (*rbacv1.Role, *corev1.ServiceAccount, *rbacv1.RoleBinding) {
+	rName, saName, rbName := MakeScopedRBACNames(name)
 	r := rbacv1.Role{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "fluent:fluent-operator",
-			Namespace: fbNamespace,
+			Name:      rName,
+			Namespace: namespace,
 		},
 		Rules: []rbacv1.PolicyRule{
 			{
@@ -73,30 +74,42 @@ func MakeScopedRBACObjects(fbName, fbNamespace string, saAnnotations map[string]
 
 	sa := corev1.ServiceAccount{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        fbName,
-			Namespace:   fbNamespace,
+			Name:        saName,
+			Namespace:   namespace,
 			Annotations: saAnnotations,
 		},
 	}
 
 	rb := rbacv1.RoleBinding{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      fmt.Sprintf("fluent-operator-fluent-bit-%s", fbName),
-			Namespace: fbNamespace,
+			Name:      rbName,
+			Namespace: namespace,
 		},
 		Subjects: []rbacv1.Subject{
 			{
 				Kind:      rbacv1.ServiceAccountKind,
-				Name:      fbName,
-				Namespace: fbNamespace,
+				Name:      name,
+				Namespace: namespace,
 			},
 		},
 		RoleRef: rbacv1.RoleRef{
 			APIGroup: rbacv1.GroupName,
 			Kind:     "Role",
-			Name:     "fluent:fluent-operator",
+			Name:     rName,
 		},
 	}
 
 	return &r, &sa, &rb
 }
+
+func MakeRBACNames(name, component string) (string, string, string) {
+	cr := fmt.Sprintf("fluent-operator-%s", component)
+	crb := fmt.Sprintf("fluent-operator-%s-%s", component, name)
+	return cr, name, crb
+}
+
+func MakeScopedRBACNames(name string) (string, string, string) {
+	r := "fluent:fluent-operator"
+	rb := fmt.Sprintf("fluent-operator-fluent-bit-%s", name)
+	return r, name, rb
+}

From 899b4fd6944a369cfd93689b0f85a42f1f280211 Mon Sep 17 00:00:00 2001
From: karan k <karan.k@oracle.com>
Date: Sat, 3 Jun 2023 01:15:32 +0530
Subject: [PATCH 49/78] Add stripUnderscores in fluent-operator helm values for
 fluentbit Input Systemd

Signed-off-by: karan k <karan.k@oracle.com>
---
 .../templates/fluentbit-clusterinput-systemd.yaml                | 1 +
 charts/fluent-operator/values.yaml                               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/charts/fluent-operator/templates/fluentbit-clusterinput-systemd.yaml b/charts/fluent-operator/templates/fluentbit-clusterinput-systemd.yaml
index d7fa6b69b..a7fe5fe45 100644
--- a/charts/fluent-operator/templates/fluentbit-clusterinput-systemd.yaml
+++ b/charts/fluent-operator/templates/fluentbit-clusterinput-systemd.yaml
@@ -14,6 +14,7 @@ spec:
     path: {{ .Values.fluentbit.input.systemd.path }}
     db: /fluent-bit/tail/systemd.db
     dbSync: Normal
+    stripUnderscores: {{ .Values.fluentbit.input.systemd.stripUnderscores | quote }}
     systemdFilter:
       - _SYSTEMD_UNIT={{ .Values.containerRuntime }}.service
       {{- if .Values.fluentbit.input.systemd.includeKubelet }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 7be8f1fa3..30eba6e09 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -149,6 +149,7 @@ fluentbit:
       enable: true
       path: "/var/log/journal"
       includeKubelet: true
+      stripUnderscores: "off"
     nodeExporterMetrics: {}
     # uncomment below nodeExporterMetrics section if you want to collect node exporter metrics
   #   nodeExporterMetrics:

From 6ba12bbaceaf8fa18165b33d7f1ce178bf824a06 Mon Sep 17 00:00:00 2001
From: Jakob Hahn <jakob.hahn@hetzner.com>
Date: Wed, 7 Jun 2023 12:31:29 +0200
Subject: [PATCH 50/78] Fix: Correct fluentd prase TimeFormat config key

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>
---
 apis/fluentd/v1alpha1/plugins/common/buffer_types.go          | 2 +-
 apis/fluentd/v1alpha1/plugins/common/common_types.go          | 2 +-
 apis/fluentd/v1alpha1/plugins/common/parse_types.go           | 2 +-
 .../v1alpha1/tests/expected/duplicate-removal-cr-specs.cfg    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apis/fluentd/v1alpha1/plugins/common/buffer_types.go b/apis/fluentd/v1alpha1/plugins/common/buffer_types.go
index bda6a9565..8b4f59338 100644
--- a/apis/fluentd/v1alpha1/plugins/common/buffer_types.go
+++ b/apis/fluentd/v1alpha1/plugins/common/buffer_types.go
@@ -294,7 +294,7 @@ func (b *Buffer) Params(_ plugins.SecretLoader) (*params.PluginStore, error) {
 			ps.InsertPairs("time_type", fmt.Sprint(*b.Time.TimeType))
 		}
 		if b.Time.TimeFormat != nil {
-			ps.InsertPairs("time_type", fmt.Sprint(*b.Time.TimeFormat))
+			ps.InsertPairs("time_format", fmt.Sprint(*b.Time.TimeFormat))
 		}
 		if b.Time.Localtime != nil {
 			ps.InsertPairs("localtime", fmt.Sprint(*b.Time.Localtime))
diff --git a/apis/fluentd/v1alpha1/plugins/common/common_types.go b/apis/fluentd/v1alpha1/plugins/common/common_types.go
index 1e0d873ad..fd563046b 100644
--- a/apis/fluentd/v1alpha1/plugins/common/common_types.go
+++ b/apis/fluentd/v1alpha1/plugins/common/common_types.go
@@ -199,7 +199,7 @@ func (j *Inject) Params(_ plugins.SecretLoader) (*params.PluginStore, error) {
 		ps.InsertPairs("time_type", fmt.Sprint(*j.TimeType))
 	}
 	if j.TimeFormat != nil {
-		ps.InsertPairs("time_type", fmt.Sprint(*j.TimeFormat))
+		ps.InsertPairs("time_format", fmt.Sprint(*j.TimeFormat))
 	}
 	if j.Localtime != nil {
 		ps.InsertPairs("localtime", fmt.Sprint(*j.Localtime))
diff --git a/apis/fluentd/v1alpha1/plugins/common/parse_types.go b/apis/fluentd/v1alpha1/plugins/common/parse_types.go
index a9943b6ac..05e225c2d 100644
--- a/apis/fluentd/v1alpha1/plugins/common/parse_types.go
+++ b/apis/fluentd/v1alpha1/plugins/common/parse_types.go
@@ -75,7 +75,7 @@ func (p *Parse) Params(_ plugins.SecretLoader) (*params.PluginStore, error) {
 		ps.InsertPairs("time_type", fmt.Sprint(*p.TimeType))
 	}
 	if p.TimeFormat != nil {
-		ps.InsertPairs("time_type", fmt.Sprint(*p.TimeFormat))
+		ps.InsertPairs("time_format", fmt.Sprint(*p.TimeFormat))
 	}
 	if p.Localtime != nil {
 		ps.InsertPairs("localtime", fmt.Sprint(*p.Localtime))
diff --git a/apis/fluentd/v1alpha1/tests/expected/duplicate-removal-cr-specs.cfg b/apis/fluentd/v1alpha1/tests/expected/duplicate-removal-cr-specs.cfg
index 87ee162fb..16a9a1552 100644
--- a/apis/fluentd/v1alpha1/tests/expected/duplicate-removal-cr-specs.cfg
+++ b/apis/fluentd/v1alpha1/tests/expected/duplicate-removal-cr-specs.cfg
@@ -70,7 +70,7 @@
     <parse>
       @type  regexp
       expression  /^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) [(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)$/
-      time_type  %d/%b/%Y:%H:%M:%S %z
+      time_format  %d/%b/%Y:%H:%M:%S %z
     </parse>
   </filter>
   <match **>
@@ -163,7 +163,7 @@
     <parse>
       @type  regexp
       expression  /^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) [(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)$/
-      time_type  %d/%b/%Y:%H:%M:%S %z
+      time_format  %d/%b/%Y:%H:%M:%S %z
     </parse>
   </filter>
   <match **>

From 60f082edee7f8fe42957653ecd8e20444f77a093 Mon Sep 17 00:00:00 2001
From: Jakob Hahn <jakob.hahn@hetzner.com>
Date: Wed, 7 Jun 2023 13:51:46 +0200
Subject: [PATCH 51/78] Fix: Correct Kubebuilder validation for TimeType from
 *string to string

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>
---
 apis/fluentd/v1alpha1/plugins/common/common_types.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apis/fluentd/v1alpha1/plugins/common/common_types.go b/apis/fluentd/v1alpha1/plugins/common/common_types.go
index fd563046b..0c1056256 100644
--- a/apis/fluentd/v1alpha1/plugins/common/common_types.go
+++ b/apis/fluentd/v1alpha1/plugins/common/common_types.go
@@ -20,10 +20,10 @@ type CommonFields struct {
 
 // Time defines the common parameters for the time plugin
 type Time struct {
-	// parses/formats value according to this type, default is *string
-	// +kubebuilder:validation:Enum:=float;unixtime;*string;mixed
+	// parses/formats value according to this type, default is string
+	// +kubebuilder:validation:Enum:=float;unixtime;string;mixed
 	TimeType *string `json:"timeType,omitempty"`
-	// Process value according to the specified format. This is available only when time_type is *string
+	// Process value according to the specified format. This is available only when time_type is string
 	TimeFormat *string `json:"timeFormat,omitempty"`
 	// If true, uses local time.
 	Localtime *bool `json:"localtime,omitempty"`

From 1ff5f8b1df60f656c6c6eea183fb2a20a9539588 Mon Sep 17 00:00:00 2001
From: Jakob Hahn <jakob.hahn@hetzner.com>
Date: Thu, 8 Jun 2023 09:35:19 +0200
Subject: [PATCH 52/78] Render mainfests

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>
---
 .../fluentd.fluent.io_clusterfilters.yaml     | 18 ++--
 .../fluentd.fluent.io_clusteroutputs.yaml     | 18 ++--
 .../crds/fluentd.fluent.io_filters.yaml       | 18 ++--
 .../crds/fluentd.fluent.io_fluentds.yaml      | 12 +--
 .../crds/fluentd.fluent.io_outputs.yaml       | 18 ++--
 .../fluentd.fluent.io_clusterfilters.yaml     | 18 ++--
 .../fluentd.fluent.io_clusteroutputs.yaml     | 18 ++--
 .../crd/bases/fluentd.fluent.io_filters.yaml  | 18 ++--
 .../crd/bases/fluentd.fluent.io_fluentds.yaml | 12 +--
 .../crd/bases/fluentd.fluent.io_outputs.yaml  | 18 ++--
 manifests/setup/fluent-operator-crd.yaml      | 84 +++++++++----------
 manifests/setup/setup.yaml                    | 84 +++++++++----------
 12 files changed, 168 insertions(+), 168 deletions(-)

diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusterfilters.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusterfilters.yaml
index 5b99a857c..bb9e30bda 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusterfilters.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusterfilters.yaml
@@ -180,7 +180,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -194,11 +194,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -338,7 +338,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -348,11 +348,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
@@ -392,7 +392,7 @@ spec:
                                 timeFormat:
                                   description: Process value according to the specified
                                     format. This is available only when time_type
-                                    is *string
+                                    is string
                                   type: string
                                 timeFormatFallbacks:
                                   description: Uses the specified time format as a
@@ -402,11 +402,11 @@ spec:
                                   type: string
                                 timeType:
                                   description: parses/formats value according to this
-                                    type, default is *string
+                                    type, default is string
                                   enum:
                                   - float
                                   - unixtime
-                                  - '*string'
+                                  - string
                                   - mixed
                                   type: string
                                 timezone:
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml
index 933e37e3a..7cf27db0d 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml
@@ -200,7 +200,7 @@ spec:
                           type: string
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -210,11 +210,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timekey:
@@ -549,7 +549,7 @@ spec:
                           type: boolean
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -559,11 +559,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timezone:
@@ -1241,7 +1241,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -1251,11 +1251,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_filters.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_filters.yaml
index 02345496d..7892d81e4 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_filters.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_filters.yaml
@@ -180,7 +180,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -194,11 +194,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -338,7 +338,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -348,11 +348,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
@@ -392,7 +392,7 @@ spec:
                                 timeFormat:
                                   description: Process value according to the specified
                                     format. This is available only when time_type
-                                    is *string
+                                    is string
                                   type: string
                                 timeFormatFallbacks:
                                   description: Uses the specified time format as a
@@ -402,11 +402,11 @@ spec:
                                   type: string
                                 timeType:
                                   description: parses/formats value according to this
-                                    type, default is *string
+                                    type, default is string
                                   enum:
                                   - float
                                   - unixtime
-                                  - '*string'
+                                  - string
                                   - mixed
                                   type: string
                                 timezone:
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
index 83431e3ad..a7a7e0188 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
@@ -1747,7 +1747,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -1761,11 +1761,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -1996,7 +1996,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -2010,11 +2010,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml
index 43350b539..21fe3ba61 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml
@@ -200,7 +200,7 @@ spec:
                           type: string
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -210,11 +210,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timekey:
@@ -549,7 +549,7 @@ spec:
                           type: boolean
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -559,11 +559,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timezone:
@@ -1241,7 +1241,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -1251,11 +1251,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
diff --git a/config/crd/bases/fluentd.fluent.io_clusterfilters.yaml b/config/crd/bases/fluentd.fluent.io_clusterfilters.yaml
index 5b99a857c..bb9e30bda 100644
--- a/config/crd/bases/fluentd.fluent.io_clusterfilters.yaml
+++ b/config/crd/bases/fluentd.fluent.io_clusterfilters.yaml
@@ -180,7 +180,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -194,11 +194,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -338,7 +338,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -348,11 +348,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
@@ -392,7 +392,7 @@ spec:
                                 timeFormat:
                                   description: Process value according to the specified
                                     format. This is available only when time_type
-                                    is *string
+                                    is string
                                   type: string
                                 timeFormatFallbacks:
                                   description: Uses the specified time format as a
@@ -402,11 +402,11 @@ spec:
                                   type: string
                                 timeType:
                                   description: parses/formats value according to this
-                                    type, default is *string
+                                    type, default is string
                                   enum:
                                   - float
                                   - unixtime
-                                  - '*string'
+                                  - string
                                   - mixed
                                   type: string
                                 timezone:
diff --git a/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml
index 933e37e3a..7cf27db0d 100644
--- a/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml
+++ b/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml
@@ -200,7 +200,7 @@ spec:
                           type: string
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -210,11 +210,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timekey:
@@ -549,7 +549,7 @@ spec:
                           type: boolean
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -559,11 +559,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timezone:
@@ -1241,7 +1241,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -1251,11 +1251,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
diff --git a/config/crd/bases/fluentd.fluent.io_filters.yaml b/config/crd/bases/fluentd.fluent.io_filters.yaml
index 02345496d..7892d81e4 100644
--- a/config/crd/bases/fluentd.fluent.io_filters.yaml
+++ b/config/crd/bases/fluentd.fluent.io_filters.yaml
@@ -180,7 +180,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -194,11 +194,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -338,7 +338,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -348,11 +348,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
@@ -392,7 +392,7 @@ spec:
                                 timeFormat:
                                   description: Process value according to the specified
                                     format. This is available only when time_type
-                                    is *string
+                                    is string
                                   type: string
                                 timeFormatFallbacks:
                                   description: Uses the specified time format as a
@@ -402,11 +402,11 @@ spec:
                                   type: string
                                 timeType:
                                   description: parses/formats value according to this
-                                    type, default is *string
+                                    type, default is string
                                   enum:
                                   - float
                                   - unixtime
-                                  - '*string'
+                                  - string
                                   - mixed
                                   type: string
                                 timezone:
diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
index 83431e3ad..a7a7e0188 100644
--- a/config/crd/bases/fluentd.fluent.io_fluentds.yaml
+++ b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
@@ -1747,7 +1747,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -1761,11 +1761,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -1996,7 +1996,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -2010,11 +2010,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
diff --git a/config/crd/bases/fluentd.fluent.io_outputs.yaml b/config/crd/bases/fluentd.fluent.io_outputs.yaml
index 43350b539..21fe3ba61 100644
--- a/config/crd/bases/fluentd.fluent.io_outputs.yaml
+++ b/config/crd/bases/fluentd.fluent.io_outputs.yaml
@@ -200,7 +200,7 @@ spec:
                           type: string
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -210,11 +210,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timekey:
@@ -549,7 +549,7 @@ spec:
                           type: boolean
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -559,11 +559,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timezone:
@@ -1241,7 +1241,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -1251,11 +1251,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index 7fa69b16f..26eff7538 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -903,7 +903,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -917,11 +917,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -1061,7 +1061,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -1071,11 +1071,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
@@ -1115,7 +1115,7 @@ spec:
                                 timeFormat:
                                   description: Process value according to the specified
                                     format. This is available only when time_type
-                                    is *string
+                                    is string
                                   type: string
                                 timeFormatFallbacks:
                                   description: Uses the specified time format as a
@@ -1125,11 +1125,11 @@ spec:
                                   type: string
                                 timeType:
                                   description: parses/formats value according to this
-                                    type, default is *string
+                                    type, default is string
                                   enum:
                                   - float
                                   - unixtime
-                                  - '*string'
+                                  - string
                                   - mixed
                                   type: string
                                 timezone:
@@ -5051,7 +5051,7 @@ spec:
                           type: string
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -5061,11 +5061,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timekey:
@@ -5400,7 +5400,7 @@ spec:
                           type: boolean
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -5410,11 +5410,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timezone:
@@ -6092,7 +6092,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -6102,11 +6102,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
@@ -10755,7 +10755,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -10769,11 +10769,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -10913,7 +10913,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -10923,11 +10923,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
@@ -10967,7 +10967,7 @@ spec:
                                 timeFormat:
                                   description: Process value according to the specified
                                     format. This is available only when time_type
-                                    is *string
+                                    is string
                                   type: string
                                 timeFormatFallbacks:
                                   description: Uses the specified time format as a
@@ -10977,11 +10977,11 @@ spec:
                                   type: string
                                 timeType:
                                   description: parses/formats value according to this
-                                    type, default is *string
+                                    type, default is string
                                   enum:
                                   - float
                                   - unixtime
-                                  - '*string'
+                                  - string
                                   - mixed
                                   type: string
                                 timezone:
@@ -19416,7 +19416,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -19430,11 +19430,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -19665,7 +19665,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -19679,11 +19679,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -25191,7 +25191,7 @@ spec:
                           type: string
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -25201,11 +25201,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timekey:
@@ -25540,7 +25540,7 @@ spec:
                           type: boolean
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -25550,11 +25550,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timezone:
@@ -26232,7 +26232,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -26242,11 +26242,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index 950cb44be..dce923bce 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -903,7 +903,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -917,11 +917,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -1061,7 +1061,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -1071,11 +1071,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
@@ -1115,7 +1115,7 @@ spec:
                                 timeFormat:
                                   description: Process value according to the specified
                                     format. This is available only when time_type
-                                    is *string
+                                    is string
                                   type: string
                                 timeFormatFallbacks:
                                   description: Uses the specified time format as a
@@ -1125,11 +1125,11 @@ spec:
                                   type: string
                                 timeType:
                                   description: parses/formats value according to this
-                                    type, default is *string
+                                    type, default is string
                                   enum:
                                   - float
                                   - unixtime
-                                  - '*string'
+                                  - string
                                   - mixed
                                   type: string
                                 timezone:
@@ -5051,7 +5051,7 @@ spec:
                           type: string
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -5061,11 +5061,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timekey:
@@ -5400,7 +5400,7 @@ spec:
                           type: boolean
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -5410,11 +5410,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timezone:
@@ -6092,7 +6092,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -6102,11 +6102,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
@@ -10755,7 +10755,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -10769,11 +10769,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -10913,7 +10913,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -10923,11 +10923,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:
@@ -10967,7 +10967,7 @@ spec:
                                 timeFormat:
                                   description: Process value according to the specified
                                     format. This is available only when time_type
-                                    is *string
+                                    is string
                                   type: string
                                 timeFormatFallbacks:
                                   description: Uses the specified time format as a
@@ -10977,11 +10977,11 @@ spec:
                                   type: string
                                 timeType:
                                   description: parses/formats value according to this
-                                    type, default is *string
+                                    type, default is string
                                   enum:
                                   - float
                                   - unixtime
-                                  - '*string'
+                                  - string
                                   - mixed
                                   type: string
                                 timezone:
@@ -19416,7 +19416,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -19430,11 +19430,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -19665,7 +19665,7 @@ spec:
                               type: string
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -19679,11 +19679,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timeout:
@@ -25191,7 +25191,7 @@ spec:
                           type: string
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -25201,11 +25201,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timekey:
@@ -25540,7 +25540,7 @@ spec:
                           type: boolean
                         timeFormat:
                           description: Process value according to the specified format.
-                            This is available only when time_type is *string
+                            This is available only when time_type is string
                           type: string
                         timeFormatFallbacks:
                           description: Uses the specified time format as a fallback
@@ -25550,11 +25550,11 @@ spec:
                           type: string
                         timeType:
                           description: parses/formats value according to this type,
-                            default is *string
+                            default is string
                           enum:
                           - float
                           - unixtime
-                          - '*string'
+                          - string
                           - mixed
                           type: string
                         timezone:
@@ -26232,7 +26232,7 @@ spec:
                               type: boolean
                             timeFormat:
                               description: Process value according to the specified
-                                format. This is available only when time_type is *string
+                                format. This is available only when time_type is string
                               type: string
                             timeFormatFallbacks:
                               description: Uses the specified time format as a fallback
@@ -26242,11 +26242,11 @@ spec:
                               type: string
                             timeType:
                               description: parses/formats value according to this
-                                type, default is *string
+                                type, default is string
                               enum:
                               - float
                               - unixtime
-                              - '*string'
+                              - string
                               - mixed
                               type: string
                             timezone:

From 677ce61724cd0a57b4a7bda5c7c1f0ef6d6d389d Mon Sep 17 00:00:00 2001
From: karan k <karan.k@oracle.com>
Date: Thu, 8 Jun 2023 16:41:59 +0530
Subject: [PATCH 53/78] Add condition on fluentdFilter and add optios to add
 more filter

Signed-off-by: karan k <karan.k@oracle.com>

fix

fix
---
 .../templates/fluentbit-clusterinput-systemd.yaml            | 5 +++++
 charts/fluent-operator/values.yaml                           | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/charts/fluent-operator/templates/fluentbit-clusterinput-systemd.yaml b/charts/fluent-operator/templates/fluentbit-clusterinput-systemd.yaml
index d7fa6b69b..37a3c4578 100644
--- a/charts/fluent-operator/templates/fluentbit-clusterinput-systemd.yaml
+++ b/charts/fluent-operator/templates/fluentbit-clusterinput-systemd.yaml
@@ -15,10 +15,15 @@ spec:
     db: /fluent-bit/tail/systemd.db
     dbSync: Normal
     systemdFilter:
+{{- if .Values.fluentbit.input.systemd.systemdFilter.enable }}
       - _SYSTEMD_UNIT={{ .Values.containerRuntime }}.service
       {{- if .Values.fluentbit.input.systemd.includeKubelet }}
       - _SYSTEMD_UNIT=kubelet.service
       {{- end }}
+      {{- if .Values.fluentbit.input.systemd.systemdFilter.filters }}
+{{- toYaml .Values.fluentbit.input.systemd.systemdFilter.filters | nindent 6 }}
+      {{- end }}
+{{- end }}
 {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 7be8f1fa3..92eb0861a 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -147,6 +147,9 @@ fluentbit:
       readFromHead: false
     systemd:
       enable: true
+      systemdFilter:
+        enable: true
+        filters: []
       path: "/var/log/journal"
       includeKubelet: true
     nodeExporterMetrics: {}

From 13883958474497dfb0eb58ac693fdf07cb37c53d Mon Sep 17 00:00:00 2001
From: karan k <karan.k@oracle.com>
Date: Fri, 9 Jun 2023 16:55:56 +0530
Subject: [PATCH 54/78] Add Security context for fluentBit

Signed-off-by: karan k <karan.k@oracle.com>
---
 charts/fluent-operator/templates/fluentbit-fluentBit.yaml | 4 ++++
 charts/fluent-operator/values.yaml                        | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
index b538a90a0..7945a074c 100644
--- a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
+++ b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
@@ -66,5 +66,9 @@ spec:
   labels:
 {{ toYaml .Values.fluentbit.labels | indent 4 }}
   {{- end }}
+  {{- if .Values.fluentbit.podSecurityContext }}
+  securityContext:
+{{ toYaml .Values.fluentbit.podSecurityContext | nindent 4 }}
+  {{- end }}
 {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 7be8f1fa3..6f166ef2a 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -87,6 +87,8 @@ fluentbit:
   imagePullSecrets: []
   # - name: "image-pull-secret"
   secrets: []
+  # Pod security context for Fluent Bit pods. Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  podSecurityContext: {}
   # List of volumes that can be mounted by containers belonging to the pod.
   additionalVolumes: []
   # Pod volumes to mount into the container's filesystem.

From 34cd78e84623b2c4c6285e28502a0244bc008491 Mon Sep 17 00:00:00 2001
From: karan k <karan.k@oracle.com>
Date: Fri, 9 Jun 2023 18:10:28 +0530
Subject: [PATCH 55/78] rename field podSecurityContext to securityContext

Signed-off-by: karan k <karan.k@oracle.com>
---
 .../fluent-operator/templates/fluent-operator-deployment.yaml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/fluent-operator/templates/fluent-operator-deployment.yaml b/charts/fluent-operator/templates/fluent-operator-deployment.yaml
index bca4c2a83..f9c339c31 100644
--- a/charts/fluent-operator/templates/fluent-operator-deployment.yaml
+++ b/charts/fluent-operator/templates/fluent-operator-deployment.yaml
@@ -111,6 +111,6 @@ spec:
         {{ toYaml .Values.operator.nodeSelector | nindent 8 }}
       {{- end }}
       {{- if .Values.operator.podSecurityContext }}
-      podSecurityContext:
+      securityContext:
         {{ toYaml .Values.operator.podSecurityContext | nindent 8 }}
       {{- end }}

From 070574c4d62247d4f9d4672732e1ecb25ddbda9b Mon Sep 17 00:00:00 2001
From: karan k <karan.k@oracle.com>
Date: Mon, 12 Jun 2023 21:59:12 +0530
Subject: [PATCH 56/78] Add fluent operator security context for container

Signed-off-by: karan k <karan.k@oracle.com>
---
 .../fluent-operator/templates/fluent-operator-deployment.yaml | 4 ++++
 charts/fluent-operator/values.yaml                            | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/charts/fluent-operator/templates/fluent-operator-deployment.yaml b/charts/fluent-operator/templates/fluent-operator-deployment.yaml
index bca4c2a83..2141416db 100644
--- a/charts/fluent-operator/templates/fluent-operator-deployment.yaml
+++ b/charts/fluent-operator/templates/fluent-operator-deployment.yaml
@@ -80,6 +80,10 @@ spec:
       containers:
       - name: fluent-operator
         image: {{ .Values.operator.container.repository }}:{{ .Values.operator.container.tag }}
+        {{- if .Values.operator.securityContext }}
+        securityContext:
+          {{ toYaml .Values.operator.securityContext | nindent 10 }}
+        {{- end }}
         resources:
           {{- toYaml .Values.operator.resources | nindent 10 }}
         env:
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 7be8f1fa3..ea1c32b8e 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -25,6 +25,8 @@ operator:
   priorityClassName: ""
   # Pod security context for Fluent Operator. Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
   podSecurityContext: {}
+  # Container security context for Fluent Operator container. Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  securityContext: {}
   # Fluent Operator resources. Usually user needn't to adjust these.
   resources:
     limits:

From fed8efdacf4078f385b2b1dd911903acd92d7d74 Mon Sep 17 00:00:00 2001
From: karan k <karan.k@oracle.com>
Date: Thu, 15 Jun 2023 16:00:01 +0530
Subject: [PATCH 57/78] add security context for fluenbit container

Signed-off-by: karan k <karan.k@oracle.com>
---
 apis/fluentbit/v1alpha2/fluentbit_types.go    |   2 +
 .../crds/fluentbit.fluent.io_fluentbits.yaml  | 161 +++++++++++++++++-
 .../templates/fluentbit-fluentBit.yaml        |   4 +
 charts/fluent-operator/values.yaml            |   2 +
 .../bases/fluentbit.fluent.io_fluentbits.yaml | 160 +++++++++++++++++
 docs/fluentbit.md                             |   1 +
 manifests/setup/fluent-operator-crd.yaml      | 160 +++++++++++++++++
 manifests/setup/setup.yaml                    | 160 +++++++++++++++++
 pkg/operator/daemonset.go                     |   3 +-
 9 files changed, 651 insertions(+), 2 deletions(-)

diff --git a/apis/fluentbit/v1alpha2/fluentbit_types.go b/apis/fluentbit/v1alpha2/fluentbit_types.go
index b57ebf208..02f6cd473 100644
--- a/apis/fluentbit/v1alpha2/fluentbit_types.go
+++ b/apis/fluentbit/v1alpha2/fluentbit_types.go
@@ -75,6 +75,8 @@ type FluentBitSpec struct {
 	Labels map[string]string `json:"labels,omitempty"`
 	// SecurityContext holds pod-level security attributes and common container settings.
 	SecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"`
+	// ContainerSecurityContext holds container-level security attributes.
+	ContainerSecurityContext *corev1.SecurityContext `json:"containerSecurityContext,omitempty"`
 	// Host networking is requested for this pod. Use the host's network namespace. If this option is set, the ports that will be used must be specified. Default to false.
 	HostNetwork bool `json:"hostNetwork,omitempty"`
 	// EnvVars represent environment variables that can be passed to fluentbit pods.
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml
index 3d0a8685e..4e9265f6e 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml
@@ -4,7 +4,6 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
   name: fluentbits.fluentbit.fluent.io
 spec:
   group: fluentbit.fluent.io
@@ -883,6 +882,166 @@ spec:
               containerLogRealPath:
                 description: Container log path
                 type: string
+              containerSecurityContext:
+                description: ContainerSecurityContext holds container-level security
+                  attributes.
+                properties:
+                  allowPrivilegeEscalation:
+                    description: 'AllowPrivilegeEscalation controls whether a process
+                      can gain more privileges than its parent process. This bool
+                      directly controls if the no_new_privs flag will be set on the
+                      container process. AllowPrivilegeEscalation is true always when
+                      the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN
+                      Note that this field cannot be set when spec.os.name is windows.'
+                    type: boolean
+                  capabilities:
+                    description: The capabilities to add/drop when running containers.
+                      Defaults to the default set of capabilities granted by the container
+                      runtime. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    properties:
+                      add:
+                        description: Added capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                      drop:
+                        description: Removed capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                    type: object
+                  privileged:
+                    description: Run container in privileged mode. Processes in privileged
+                      containers are essentially equivalent to root on the host. Defaults
+                      to false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  procMount:
+                    description: procMount denotes the type of proc mount to use for
+                      the containers. The default is DefaultProcMount which uses the
+                      container runtime defaults for readonly paths and masked paths.
+                      This requires the ProcMountType feature flag to be enabled.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  readOnlyRootFilesystem:
+                    description: Whether this container has a read-only root filesystem.
+                      Default is false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  runAsGroup:
+                    description: The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: Indicates that the container must run as a non-root
+                      user. If true, the Kubelet will validate the image at runtime
+                      to ensure that it does not run as UID 0 (root) and fail to start
+                      the container if it does. If unset or false, no such validation
+                      will be performed. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in PodSecurityContext.  If set in both SecurityContext
+                      and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    description: The SELinux context to be applied to the container.
+                      If unspecified, the container runtime will allocate a random
+                      SELinux context for each container.  May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: The seccomp options to use by this container. If
+                      seccomp options are provided at both the pod & container level,
+                      the container options override the pod options. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: localhostProfile indicates a profile defined
+                          in a file on the node should be used. The profile must be
+                          preconfigured on the node to work. Must be a descending
+                          path, relative to the kubelet's configured seccomp profile
+                          location. Must only be set if type is "Localhost".
+                        type: string
+                      type:
+                        description: "type indicates which kind of seccomp profile
+                          will be applied. Valid options are: \n Localhost - a profile
+                          defined in a file on the node should be used. RuntimeDefault
+                          - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied."
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  windowsOptions:
+                    description: The Windows specific settings applied to all containers.
+                      If unspecified, the options from the PodSecurityContext will
+                      be used. If set in both SecurityContext and PodSecurityContext,
+                      the value specified in SecurityContext takes precedence. Note
+                      that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: GMSACredentialSpec is where the GMSA admission
+                          webhook (https://github.com/kubernetes-sigs/windows-gmsa)
+                          inlines the contents of the GMSA credential spec named by
+                          the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: HostProcess determines if a container should
+                          be run as a 'Host Process' container. This field is alpha-level
+                          and will only be honored by components that enable the WindowsHostProcessContainers
+                          feature flag. Setting this field without the feature flag
+                          will result in errors when validating the Pod. All of a
+                          Pod's containers must have the same effective HostProcess
+                          value (it is not allowed to have a mix of HostProcess containers
+                          and non-HostProcess containers).  In addition, if HostProcess
+                          is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: The UserName in Windows to run the entrypoint
+                          of the container process. Defaults to the user specified
+                          in image metadata if unspecified. May also be set in PodSecurityContext.
+                          If set in both SecurityContext and PodSecurityContext, the
+                          value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
               disableService:
                 description: DisableService tells if the fluentbit service should
                   be deployed.
diff --git a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
index 234ff305e..a09c648cd 100644
--- a/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
+++ b/charts/fluent-operator/templates/fluentbit-fluentBit.yaml
@@ -26,6 +26,10 @@ spec:
   envVars:
 {{ toYaml .Values.fluentbit.envVars | indent 4 }}
 {{- end }}
+{{- if .Values.fluentbit.securityContext }}
+  containerSecurityContext:
+  {{ toYaml .Values.fluentbit.securityContext | nindent 4 }}
+{{- end }}
 {{- with .Values.fluentbit.tolerations }}
   tolerations:
 {{ toYaml . | indent 4 }}
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 312782a20..6d6128c3e 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -91,6 +91,8 @@ fluentbit:
   secrets: []
   # Pod security context for Fluent Bit pods. Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
   podSecurityContext: {}
+  # Security context for Fluent Bit container. Ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+  securityContext: {}
   # List of volumes that can be mounted by containers belonging to the pod.
   additionalVolumes: []
   # Pod volumes to mount into the container's filesystem.
diff --git a/config/crd/bases/fluentbit.fluent.io_fluentbits.yaml b/config/crd/bases/fluentbit.fluent.io_fluentbits.yaml
index 3d0a8685e..f32e7f267 100644
--- a/config/crd/bases/fluentbit.fluent.io_fluentbits.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_fluentbits.yaml
@@ -883,6 +883,166 @@ spec:
               containerLogRealPath:
                 description: Container log path
                 type: string
+              containerSecurityContext:
+                description: ContainerSecurityContext holds container-level security
+                  attributes.
+                properties:
+                  allowPrivilegeEscalation:
+                    description: 'AllowPrivilegeEscalation controls whether a process
+                      can gain more privileges than its parent process. This bool
+                      directly controls if the no_new_privs flag will be set on the
+                      container process. AllowPrivilegeEscalation is true always when
+                      the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN
+                      Note that this field cannot be set when spec.os.name is windows.'
+                    type: boolean
+                  capabilities:
+                    description: The capabilities to add/drop when running containers.
+                      Defaults to the default set of capabilities granted by the container
+                      runtime. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    properties:
+                      add:
+                        description: Added capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                      drop:
+                        description: Removed capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                    type: object
+                  privileged:
+                    description: Run container in privileged mode. Processes in privileged
+                      containers are essentially equivalent to root on the host. Defaults
+                      to false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  procMount:
+                    description: procMount denotes the type of proc mount to use for
+                      the containers. The default is DefaultProcMount which uses the
+                      container runtime defaults for readonly paths and masked paths.
+                      This requires the ProcMountType feature flag to be enabled.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  readOnlyRootFilesystem:
+                    description: Whether this container has a read-only root filesystem.
+                      Default is false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  runAsGroup:
+                    description: The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: Indicates that the container must run as a non-root
+                      user. If true, the Kubelet will validate the image at runtime
+                      to ensure that it does not run as UID 0 (root) and fail to start
+                      the container if it does. If unset or false, no such validation
+                      will be performed. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in PodSecurityContext.  If set in both SecurityContext
+                      and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    description: The SELinux context to be applied to the container.
+                      If unspecified, the container runtime will allocate a random
+                      SELinux context for each container.  May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: The seccomp options to use by this container. If
+                      seccomp options are provided at both the pod & container level,
+                      the container options override the pod options. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: localhostProfile indicates a profile defined
+                          in a file on the node should be used. The profile must be
+                          preconfigured on the node to work. Must be a descending
+                          path, relative to the kubelet's configured seccomp profile
+                          location. Must only be set if type is "Localhost".
+                        type: string
+                      type:
+                        description: "type indicates which kind of seccomp profile
+                          will be applied. Valid options are: \n Localhost - a profile
+                          defined in a file on the node should be used. RuntimeDefault
+                          - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied."
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  windowsOptions:
+                    description: The Windows specific settings applied to all containers.
+                      If unspecified, the options from the PodSecurityContext will
+                      be used. If set in both SecurityContext and PodSecurityContext,
+                      the value specified in SecurityContext takes precedence. Note
+                      that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: GMSACredentialSpec is where the GMSA admission
+                          webhook (https://github.com/kubernetes-sigs/windows-gmsa)
+                          inlines the contents of the GMSA credential spec named by
+                          the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: HostProcess determines if a container should
+                          be run as a 'Host Process' container. This field is alpha-level
+                          and will only be honored by components that enable the WindowsHostProcessContainers
+                          feature flag. Setting this field without the feature flag
+                          will result in errors when validating the Pod. All of a
+                          Pod's containers must have the same effective HostProcess
+                          value (it is not allowed to have a mix of HostProcess containers
+                          and non-HostProcess containers).  In addition, if HostProcess
+                          is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: The UserName in Windows to run the entrypoint
+                          of the container process. Defaults to the user specified
+                          in image metadata if unspecified. May also be set in PodSecurityContext.
+                          If set in both SecurityContext and PodSecurityContext, the
+                          value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
               disableService:
                 description: DisableService tells if the fluentbit service should
                   be deployed.
diff --git a/docs/fluentbit.md b/docs/fluentbit.md
index aa4ad5b02..5e72a6cd3 100644
--- a/docs/fluentbit.md
+++ b/docs/fluentbit.md
@@ -385,6 +385,7 @@ FluentBitSpec defines the desired state of FluentBit
 | serviceAccountAnnotations | Annotations to add to the Fluentbit service account | map[string]string |
 | labels | Labels to add to each FluentBit pod | map[string]string |
 | securityContext | SecurityContext holds pod-level security attributes and common container settings. | *corev1.PodSecurityContext |
+| containerSecurityContext | ContainerSecurityContext holds container-level security attributes. | *corev1.SecurityContext |
 | hostNetwork | Host networking is requested for this pod. Use the host's network namespace. If this option is set, the ports that will be used must be specified. Default to false. | bool |
 | envVars | EnvVars represent environment variables that can be passed to fluentbit pods. | []corev1.EnvVar |
 | livenessProbe | LivenessProbe represents the pod's liveness probe. | *corev1.Probe |
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index 26eff7538..6963db7df 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -12122,6 +12122,166 @@ spec:
               containerLogRealPath:
                 description: Container log path
                 type: string
+              containerSecurityContext:
+                description: ContainerSecurityContext holds container-level security
+                  attributes.
+                properties:
+                  allowPrivilegeEscalation:
+                    description: 'AllowPrivilegeEscalation controls whether a process
+                      can gain more privileges than its parent process. This bool
+                      directly controls if the no_new_privs flag will be set on the
+                      container process. AllowPrivilegeEscalation is true always when
+                      the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN
+                      Note that this field cannot be set when spec.os.name is windows.'
+                    type: boolean
+                  capabilities:
+                    description: The capabilities to add/drop when running containers.
+                      Defaults to the default set of capabilities granted by the container
+                      runtime. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    properties:
+                      add:
+                        description: Added capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                      drop:
+                        description: Removed capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                    type: object
+                  privileged:
+                    description: Run container in privileged mode. Processes in privileged
+                      containers are essentially equivalent to root on the host. Defaults
+                      to false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  procMount:
+                    description: procMount denotes the type of proc mount to use for
+                      the containers. The default is DefaultProcMount which uses the
+                      container runtime defaults for readonly paths and masked paths.
+                      This requires the ProcMountType feature flag to be enabled.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  readOnlyRootFilesystem:
+                    description: Whether this container has a read-only root filesystem.
+                      Default is false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  runAsGroup:
+                    description: The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: Indicates that the container must run as a non-root
+                      user. If true, the Kubelet will validate the image at runtime
+                      to ensure that it does not run as UID 0 (root) and fail to start
+                      the container if it does. If unset or false, no such validation
+                      will be performed. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in PodSecurityContext.  If set in both SecurityContext
+                      and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    description: The SELinux context to be applied to the container.
+                      If unspecified, the container runtime will allocate a random
+                      SELinux context for each container.  May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: The seccomp options to use by this container. If
+                      seccomp options are provided at both the pod & container level,
+                      the container options override the pod options. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: localhostProfile indicates a profile defined
+                          in a file on the node should be used. The profile must be
+                          preconfigured on the node to work. Must be a descending
+                          path, relative to the kubelet's configured seccomp profile
+                          location. Must only be set if type is "Localhost".
+                        type: string
+                      type:
+                        description: "type indicates which kind of seccomp profile
+                          will be applied. Valid options are: \n Localhost - a profile
+                          defined in a file on the node should be used. RuntimeDefault
+                          - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied."
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  windowsOptions:
+                    description: The Windows specific settings applied to all containers.
+                      If unspecified, the options from the PodSecurityContext will
+                      be used. If set in both SecurityContext and PodSecurityContext,
+                      the value specified in SecurityContext takes precedence. Note
+                      that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: GMSACredentialSpec is where the GMSA admission
+                          webhook (https://github.com/kubernetes-sigs/windows-gmsa)
+                          inlines the contents of the GMSA credential spec named by
+                          the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: HostProcess determines if a container should
+                          be run as a 'Host Process' container. This field is alpha-level
+                          and will only be honored by components that enable the WindowsHostProcessContainers
+                          feature flag. Setting this field without the feature flag
+                          will result in errors when validating the Pod. All of a
+                          Pod's containers must have the same effective HostProcess
+                          value (it is not allowed to have a mix of HostProcess containers
+                          and non-HostProcess containers).  In addition, if HostProcess
+                          is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: The UserName in Windows to run the entrypoint
+                          of the container process. Defaults to the user specified
+                          in image metadata if unspecified. May also be set in PodSecurityContext.
+                          If set in both SecurityContext and PodSecurityContext, the
+                          value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
               disableService:
                 description: DisableService tells if the fluentbit service should
                   be deployed.
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index dce923bce..b737beda8 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -12122,6 +12122,166 @@ spec:
               containerLogRealPath:
                 description: Container log path
                 type: string
+              containerSecurityContext:
+                description: ContainerSecurityContext holds container-level security
+                  attributes.
+                properties:
+                  allowPrivilegeEscalation:
+                    description: 'AllowPrivilegeEscalation controls whether a process
+                      can gain more privileges than its parent process. This bool
+                      directly controls if the no_new_privs flag will be set on the
+                      container process. AllowPrivilegeEscalation is true always when
+                      the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN
+                      Note that this field cannot be set when spec.os.name is windows.'
+                    type: boolean
+                  capabilities:
+                    description: The capabilities to add/drop when running containers.
+                      Defaults to the default set of capabilities granted by the container
+                      runtime. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    properties:
+                      add:
+                        description: Added capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                      drop:
+                        description: Removed capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                    type: object
+                  privileged:
+                    description: Run container in privileged mode. Processes in privileged
+                      containers are essentially equivalent to root on the host. Defaults
+                      to false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  procMount:
+                    description: procMount denotes the type of proc mount to use for
+                      the containers. The default is DefaultProcMount which uses the
+                      container runtime defaults for readonly paths and masked paths.
+                      This requires the ProcMountType feature flag to be enabled.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  readOnlyRootFilesystem:
+                    description: Whether this container has a read-only root filesystem.
+                      Default is false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  runAsGroup:
+                    description: The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: Indicates that the container must run as a non-root
+                      user. If true, the Kubelet will validate the image at runtime
+                      to ensure that it does not run as UID 0 (root) and fail to start
+                      the container if it does. If unset or false, no such validation
+                      will be performed. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in PodSecurityContext.  If set in both SecurityContext
+                      and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    description: The SELinux context to be applied to the container.
+                      If unspecified, the container runtime will allocate a random
+                      SELinux context for each container.  May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: The seccomp options to use by this container. If
+                      seccomp options are provided at both the pod & container level,
+                      the container options override the pod options. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: localhostProfile indicates a profile defined
+                          in a file on the node should be used. The profile must be
+                          preconfigured on the node to work. Must be a descending
+                          path, relative to the kubelet's configured seccomp profile
+                          location. Must only be set if type is "Localhost".
+                        type: string
+                      type:
+                        description: "type indicates which kind of seccomp profile
+                          will be applied. Valid options are: \n Localhost - a profile
+                          defined in a file on the node should be used. RuntimeDefault
+                          - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied."
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  windowsOptions:
+                    description: The Windows specific settings applied to all containers.
+                      If unspecified, the options from the PodSecurityContext will
+                      be used. If set in both SecurityContext and PodSecurityContext,
+                      the value specified in SecurityContext takes precedence. Note
+                      that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: GMSACredentialSpec is where the GMSA admission
+                          webhook (https://github.com/kubernetes-sigs/windows-gmsa)
+                          inlines the contents of the GMSA credential spec named by
+                          the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: HostProcess determines if a container should
+                          be run as a 'Host Process' container. This field is alpha-level
+                          and will only be honored by components that enable the WindowsHostProcessContainers
+                          feature flag. Setting this field without the feature flag
+                          will result in errors when validating the Pod. All of a
+                          Pod's containers must have the same effective HostProcess
+                          value (it is not allowed to have a mix of HostProcess containers
+                          and non-HostProcess containers).  In addition, if HostProcess
+                          is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: The UserName in Windows to run the entrypoint
+                          of the container process. Defaults to the user specified
+                          in image metadata if unspecified. May also be set in PodSecurityContext.
+                          If set in both SecurityContext and PodSecurityContext, the
+                          value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
               disableService:
                 description: DisableService tells if the fluentbit service should
                   be deployed.
diff --git a/pkg/operator/daemonset.go b/pkg/operator/daemonset.go
index a3e9c002e..4d9eb75e8 100644
--- a/pkg/operator/daemonset.go
+++ b/pkg/operator/daemonset.go
@@ -135,7 +135,8 @@ func MakeDaemonSet(fb fluentbitv1alpha2.FluentBit, logPath string) *appsv1.Daemo
 									MountPath: "/var/log/journal",
 								},
 							},
-							Resources: fb.Spec.Resources,
+							Resources:       fb.Spec.Resources,
+							SecurityContext: fb.Spec.ContainerSecurityContext,
 						},
 					},
 					NodeSelector:    fb.Spec.NodeSelector,

From 39d6adfd8e54c97a14155190460ff539b98f496d Mon Sep 17 00:00:00 2001
From: Anthony TREUILLIER <anthony.treuillier@gmail.com>
Date: Mon, 19 Jun 2023 11:31:05 +0200
Subject: [PATCH 58/78] storageClassName field not taken into account (#798)

Signed-off-by: Anthony TREUILLIER <anthony.treuillier@gmail.com>
---
 pkg/operator/pvc.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/operator/pvc.go b/pkg/operator/pvc.go
index c25aaf909..89672eca8 100644
--- a/pkg/operator/pvc.go
+++ b/pkg/operator/pvc.go
@@ -30,9 +30,10 @@ func MakeFluentdPVC(fd fluentdv1alpha1.Fluentd) *corev1.PersistentVolumeClaim {
 			Labels:    labels,
 		},
 		Spec: corev1.PersistentVolumeClaimSpec{
-			AccessModes: bufferPvc.AccessModes,
-			Resources:   bufferPvc.Resources,
-			VolumeMode:  bufferPvc.VolumeMode,
+			AccessModes:      bufferPvc.AccessModes,
+			Resources:        bufferPvc.Resources,
+			VolumeMode:       bufferPvc.VolumeMode,
+			StorageClassName: bufferPvc.StorageClassName,
 		},
 	}
 	return &pvc

From ab72254d20ad280219b5aeb04257ec1d707cb74a Mon Sep 17 00:00:00 2001
From: Josh Baird <jbaird@galileo.io>
Date: Wed, 21 Jun 2023 11:28:15 -0400
Subject: [PATCH 59/78] Adds the fluentd output plugin for Datadog (#803)

* Add fluent-plugin-datadog to fluent images.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* Add Datadog output plugin struct.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* Add Datadog output plugin struct.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* Add tests.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* Iterate on tests.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* Iterate on tests.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* Clean up comments.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* Clean up comments.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* More iterating on tests.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* More iterating on tests.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* Fix tests.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* Fix tests.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* Fix tests.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* Add docs.

Signed-off-by: Josh Baird <jbaird@galileo.io>

* Update tests.

Signed-off-by: Josh Baird <jbaird@galileo.io>

---------

Signed-off-by: Josh Baird <jbaird@galileo.io>
---
 .../v1alpha2/zz_generated.deepcopy.go         |   5 +
 .../v1alpha1/plugins/output/datadog.go        |  53 ++++
 apis/fluentd/v1alpha1/plugins/output/types.go | 101 ++++++-
 apis/fluentd/v1alpha1/plugins/params/const.go |   2 +
 .../fluentd-cluster-cfg-output-datadog.cfg    |  33 +++
 apis/fluentd/v1alpha1/tests/helper_test.go    |  29 ++-
 apis/fluentd/v1alpha1/tests/tools.go          |  17 ++
 .../crds/fluentbit.fluent.io_fluentbits.yaml  |   1 +
 .../fluentd.fluent.io_clusteroutputs.yaml     | 123 +++++++++
 .../crds/fluentd.fluent.io_outputs.yaml       | 123 +++++++++
 cmd/fluent-watcher/fluentd/Dockerfile.amd64   |   1 +
 cmd/fluent-watcher/fluentd/Dockerfile.arm64   |   1 +
 .../fluentd/Dockerfile.arm64.base             |   1 +
 .../fluentd.fluent.io_clusteroutputs.yaml     | 123 +++++++++
 .../crd/bases/fluentd.fluent.io_outputs.yaml  | 123 +++++++++
 docs/fluentbit.md                             |   2 +
 docs/fluentd.md                               |   1 +
 docs/plugins/fluentd/common/common.md         |   4 +-
 docs/plugins/fluentd/output/datadog.md        |  28 ++
 docs/plugins/fluentd/output/types.md          |   1 +
 go.mod                                        |   4 +
 go.sum                                        |  11 +
 manifests/setup/fluent-operator-crd.yaml      | 246 ++++++++++++++++++
 manifests/setup/setup.yaml                    | 246 ++++++++++++++++++
 24 files changed, 1275 insertions(+), 4 deletions(-)
 create mode 100644 apis/fluentd/v1alpha1/plugins/output/datadog.go
 create mode 100644 apis/fluentd/v1alpha1/tests/expected/fluentd-cluster-cfg-output-datadog.cfg
 create mode 100644 docs/plugins/fluentd/output/datadog.md

diff --git a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
index a9b73a3cc..6754d69c9 100644
--- a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
+++ b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
@@ -961,6 +961,11 @@ func (in *FluentBitSpec) DeepCopyInto(out *FluentBitSpec) {
 		*out = new(v1.PodSecurityContext)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.ContainerSecurityContext != nil {
+		in, out := &in.ContainerSecurityContext, &out.ContainerSecurityContext
+		*out = new(v1.SecurityContext)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.EnvVars != nil {
 		in, out := &in.EnvVars, &out.EnvVars
 		*out = make([]v1.EnvVar, len(*in))
diff --git a/apis/fluentd/v1alpha1/plugins/output/datadog.go b/apis/fluentd/v1alpha1/plugins/output/datadog.go
new file mode 100644
index 000000000..536237539
--- /dev/null
+++ b/apis/fluentd/v1alpha1/plugins/output/datadog.go
@@ -0,0 +1,53 @@
+package output
+
+import "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins"
+
+// Datadog defines the parameters for out_datadog plugin
+type Datadog struct {
+	// This parameter is required in order to authenticate your fluent agent.
+	ApiKey *plugins.Secret `json:"apiKey,omitempty"`
+	// Event format, if true, the event is sent in json format. Othwerwise, in plain text.
+	UseJson *bool `json:"useJson,omitempty"`
+	// Automatically include the Fluentd tag in the record.
+	IncludeTagKey *bool `json:"includeTagKey,omitempty"`
+	// Where to store the Fluentd tag.
+	TagKey *string `json:"tagKey,omitempty"`
+	// Name of the attribute which will contain timestamp of the log event. If nil, timestamp attribute is not added.
+	TimestampKey *string `json:"timestampKey,omitempty"`
+	// If true, the agent initializes a secure connection to Datadog. In clear TCP otherwise.
+	UseSSL *bool `json:"useSSL,omitempty"`
+	// Disable SSL validation (useful for proxy forwarding)
+	NoSSLValidation *bool `json:"noSSLValidation,omitempty"`
+	// Port used to send logs over a SSL encrypted connection to Datadog. If use_http is disabled, use 10516 for the US region and 443 for the EU region.
+	// +kubebuilder:validation:Minimum:=1
+	// +kubebuilder:validation:Maximum:=65535
+	SSLPort *uint32 `json:"sslPort,omitempty"`
+	// The number of retries before the output plugin stops. Set to -1 for unlimited retries
+	MaxRetries *uint32 `json:"maxRetries,omitempty"`
+	// The maximum time waited between each retry in seconds
+	MaxBackoff *uint32 `json:"maxBackoff,omitempty"`
+	// Enable HTTP forwarding. If you disable it, make sure to change the port to 10514 or ssl_port to 10516
+	UseHTTP *bool `json:"useHTTP,omitempty"`
+	// Enable log compression for HTTP
+	UseCompression *bool `json:"useCompression,omitempty"`
+	// Set the log compression level for HTTP (1 to 9, 9 being the best ratio)
+	CompressionLevel *uint32 `json:"compressionLevel,omitempty"`
+	// This tells Datadog what integration it is
+	DDSource *string `json:"ddSource,omitempty"`
+	// Multiple value attribute. Can be used to refine the source attribute
+	DDSourcecategory *string `json:"ddSourcecategory,omitempty"`
+	// Custom tags with the following format "key1:value1, key2:value2"
+	DDTags *string `json:"ddTags,omitempty"`
+	// Used by Datadog to identify the host submitting the logs.
+	DDHostname *string `json:"ddHostname,omitempty"`
+	// Used by Datadog to correlate between logs, traces and metrics.
+	Service *string `json:"service,omitempty"`
+	// Proxy port when logs are not directly forwarded to Datadog and ssl is not used
+	// +kubebuilder:validation:Minimum:=1
+	// +kubebuilder:validation:Maximum:=65535
+	Port *uint32 `json:"port,omitempty"`
+	// Proxy endpoint when logs are not directly forwarded to Datadog
+	Host *string `json:"host,omitempty"`
+	// HTTP proxy, only takes effect if HTTP forwarding is enabled (use_http). Defaults to HTTP_PROXY/http_proxy env vars.
+	HttpProxy *string `json:"httpProxy,omitempty"`
+}
diff --git a/apis/fluentd/v1alpha1/plugins/output/types.go b/apis/fluentd/v1alpha1/plugins/output/types.go
index a74239b41..140ca1868 100644
--- a/apis/fluentd/v1alpha1/plugins/output/types.go
+++ b/apis/fluentd/v1alpha1/plugins/output/types.go
@@ -5,12 +5,13 @@ import (
 	"fmt"
 	"strings"
 
+	"strconv"
+
 	"github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins"
 	"github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/common"
 	"github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/custom"
 	"github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1/plugins/params"
 	"github.com/fluent/fluent-operator/v2/pkg/utils"
-	"strconv"
 )
 
 // OutputCommon defines the common parameters for output plugin
@@ -49,6 +50,8 @@ type Output struct {
 	CustomPlugin *custom.CustomPlugin `json:"customPlugin,omitempty"`
 	// out_cloudwatch plugin
 	CloudWatch *CloudWatch `json:"cloudWatch,omitempty"`
+	// datadog plugin
+	Datadog *Datadog `json:"datadog,omitempty"`
 }
 
 // DeepCopyInto implements the DeepCopyInto interface.
@@ -156,6 +159,11 @@ func (o *Output) Params(loader plugins.SecretLoader) (*params.PluginStore, error
 		ps.InsertType(string(params.CloudWatchOutputType))
 		return o.cloudWatchPlugin(ps, loader), nil
 	}
+
+	if o.Datadog != nil {
+		ps.InsertType(string(params.DatadogOutputType))
+		return o.datadogPlugin(ps, loader), nil
+	}
 	return o.customOutput(ps, loader), nil
 
 }
@@ -773,4 +781,95 @@ func (o *Output) customOutput(parent *params.PluginStore, loader plugins.SecretL
 	return parent
 }
 
+func (o *Output) datadogPlugin(parent *params.PluginStore, sl plugins.SecretLoader) *params.PluginStore {
+	if o.Datadog.ApiKey != nil {
+		apiKey, err := sl.LoadSecret(*o.Datadog.ApiKey)
+		if err != nil {
+			return nil
+		}
+		parent.InsertPairs("api_key", apiKey)
+	}
+
+	if o.Datadog.UseJson != nil {
+		parent.InsertPairs("use_json", fmt.Sprint(*o.Datadog.UseJson))
+	}
+
+	if o.Datadog.IncludeTagKey != nil {
+		parent.InsertPairs("include_tag_key", fmt.Sprint(*o.Datadog.IncludeTagKey))
+	}
+
+	if o.Datadog.TagKey != nil {
+		parent.InsertPairs("tag_key", fmt.Sprint(*o.Datadog.TagKey))
+	}
+
+	if o.Datadog.TimestampKey != nil {
+		parent.InsertPairs("timestamp_key", fmt.Sprint(*o.Datadog.TimestampKey))
+	}
+
+	if o.Datadog.UseSSL != nil {
+		parent.InsertPairs("use_ssl", fmt.Sprint(*o.Datadog.UseSSL))
+	}
+
+	if o.Datadog.NoSSLValidation != nil {
+		parent.InsertPairs("no_ssl_validation", fmt.Sprint(*o.Datadog.NoSSLValidation))
+	}
+
+	if o.Datadog.SSLPort != nil {
+		parent.InsertPairs("ssl_port", fmt.Sprint(*o.Datadog.SSLPort))
+	}
+
+	if o.Datadog.MaxRetries != nil {
+		parent.InsertPairs("max_retries", fmt.Sprint(*o.Datadog.MaxRetries))
+	}
+
+	if o.Datadog.MaxBackoff != nil {
+		parent.InsertPairs("max_backoff", fmt.Sprint(*o.Datadog.MaxBackoff))
+	}
+
+	if o.Datadog.UseHTTP != nil {
+		parent.InsertPairs("use_http", fmt.Sprint(*o.Datadog.UseHTTP))
+	}
+
+	if o.Datadog.UseCompression != nil {
+		parent.InsertPairs("use_compression", fmt.Sprint(*o.Datadog.UseCompression))
+	}
+
+	if o.Datadog.CompressionLevel != nil {
+		parent.InsertPairs("compression_level", fmt.Sprint(*o.Datadog.CompressionLevel))
+	}
+
+	if o.Datadog.DDSource != nil {
+		parent.InsertPairs("dd_source", fmt.Sprint(*o.Datadog.DDSource))
+	}
+
+	if o.Datadog.DDSourcecategory != nil {
+		parent.InsertPairs("dd_sourcecategory", fmt.Sprint(*o.Datadog.DDSourcecategory))
+	}
+
+	if o.Datadog.DDTags != nil {
+		parent.InsertPairs("dd_tags", fmt.Sprint(*o.Datadog.DDTags))
+	}
+
+	if o.Datadog.DDHostname != nil {
+		parent.InsertPairs("dd_hostname", fmt.Sprint(*o.Datadog.DDHostname))
+	}
+
+	if o.Datadog.Service != nil {
+		parent.InsertPairs("service", fmt.Sprint(*o.Datadog.Service))
+	}
+
+	if o.Datadog.Port != nil {
+		parent.InsertPairs("port", fmt.Sprint(*o.Datadog.Port))
+	}
+
+	if o.Datadog.Host != nil {
+		parent.InsertPairs("host", fmt.Sprint(*o.Datadog.Host))
+	}
+
+	if o.Datadog.HttpProxy != nil {
+		parent.InsertPairs("http_proxy", fmt.Sprint(*o.Datadog.HttpProxy))
+	}
+	return parent
+}
+
 var _ plugins.Plugin = &Output{}
diff --git a/apis/fluentd/v1alpha1/plugins/params/const.go b/apis/fluentd/v1alpha1/plugins/params/const.go
index d2d7e6bf3..4c49f3cd8 100644
--- a/apis/fluentd/v1alpha1/plugins/params/const.go
+++ b/apis/fluentd/v1alpha1/plugins/params/const.go
@@ -35,6 +35,7 @@ const (
 	MatchPlugin         PluginName = "match"
 	BufferPlugin        PluginName = "buffer"
 	CloudWatchPlugin    PluginName = "cloudwatch_logs"
+	DatadogPlugin       PluginName = "datadog"
 
 	BufferTag    string = "tag"
 	LabelTag     string = "tag"
@@ -66,6 +67,7 @@ const (
 	S3OutputType            OutputType = "s3"
 	LokiOutputType          OutputType = "loki"
 	CloudWatchOutputType    OutputType = "cloudwatch_logs"
+	DatadogOutputType       OutputType = "datadog"
 )
 
 var (
diff --git a/apis/fluentd/v1alpha1/tests/expected/fluentd-cluster-cfg-output-datadog.cfg b/apis/fluentd/v1alpha1/tests/expected/fluentd-cluster-cfg-output-datadog.cfg
new file mode 100644
index 000000000..2a0a28c9e
--- /dev/null
+++ b/apis/fluentd/v1alpha1/tests/expected/fluentd-cluster-cfg-output-datadog.cfg
@@ -0,0 +1,33 @@
+<source>
+  @type  forward
+  bind  0.0.0.0
+  port  24224
+</source>
+<match **>
+  @id  main
+  @type  label_router
+  <route>
+    @label  @a2170d34e9940ec56d328100e375c43e
+    <match>
+      namespaces  default,kube-system
+    </match>
+  </route>
+</match>
+<label @a2170d34e9940ec56d328100e375c43e>
+  <filter **>
+    @id  ClusterFluentdConfig-cluster-fluentd-config::cluster::clusterfilter::fluentd-filter-0
+    @type  record_transformer
+    enable_ruby  true
+    <record>
+      kubernetes_ns  ${record["kubernetes"]["namespace_name"]}
+    </record>
+  </filter>
+  <match **>
+    @id  ClusterFluentdConfig-cluster-fluentd-config::cluster::clusteroutput::fluentd-output-datadog-0
+    @type  datadog
+    dd_source  kubernetes
+    dd_sourcecategory  kubernetes
+    host  http-intake.logs.datadoghq.com
+    port  443
+  </match>
+</label>
\ No newline at end of file
diff --git a/apis/fluentd/v1alpha1/tests/helper_test.go b/apis/fluentd/v1alpha1/tests/helper_test.go
index 502f675e5..d7aab0f5f 100644
--- a/apis/fluentd/v1alpha1/tests/helper_test.go
+++ b/apis/fluentd/v1alpha1/tests/helper_test.go
@@ -1,10 +1,11 @@
 package cfgrender
 
 import (
-	"github.com/go-logr/logr"
 	"strings"
 	"testing"
 
+	"github.com/go-logr/logr"
+
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -256,6 +257,32 @@ func Test_ClusterCfgOutput2CloudWatch(t *testing.T) {
 	}
 }
 
+func Test_ClusterCfgOutput2Datadog(t *testing.T) {
+	g := NewGomegaWithT(t)
+	sl := plugins.NewSecretLoader(nil, Fluentd.Namespace, logr.Logger{})
+
+	psr := fluentdv1alpha1.NewGlobalPluginResources("main")
+	psr.CombineGlobalInputsPlugins(sl, Fluentd.Spec.GlobalInputs)
+
+	clustercfgRouter, err := psr.BuildCfgRouter(&FluentdClusterFluentdConfig1)
+	g.Expect(err).NotTo(HaveOccurred())
+	clusterFilters := []fluentdv1alpha1.ClusterFilter{FluentdClusterFilter1}
+	clusterOutputs := []fluentdv1alpha1.ClusterOutput{FluentdClusterOutput2Datadog}
+	clustercfgResources, _ := psr.PatchAndFilterClusterLevelResources(sl, FluentdClusterFluentdConfig1.GetCfgId(), clusterFilters, clusterOutputs)
+	err = psr.WithCfgResources(*clustercfgRouter.Label, clustercfgResources)
+	g.Expect(err).NotTo(HaveOccurred())
+
+	// we should not see any permutations in serialized config
+	i := 0
+	for i < maxRuntimes {
+		config, errs := psr.RenderMainConfig(false)
+		g.Expect(errs).NotTo(HaveOccurred())
+		g.Expect(strings.TrimSpace(string(getExpectedCfg("./expected/fluentd-cluster-cfg-output-datadog.cfg")))).To(Equal(config))
+
+		i++
+	}
+}
+
 func Test_MixedCfgs2OpenSearch(t *testing.T) {
 	g := NewGomegaWithT(t)
 	sl := plugins.NewSecretLoader(nil, Fluentd.Namespace, logr.Logger{})
diff --git a/apis/fluentd/v1alpha1/tests/tools.go b/apis/fluentd/v1alpha1/tests/tools.go
index 817a97a26..9b75a5d6e 100644
--- a/apis/fluentd/v1alpha1/tests/tools.go
+++ b/apis/fluentd/v1alpha1/tests/tools.go
@@ -399,6 +399,22 @@ spec:
       webIdentityTokenFile: /var/run/secrets/something/token
 `
 
+	FluentdClusterOutput2Datadog    fluentdv1alpha1.ClusterOutput
+	FluentdClusterOutput2DatadogRaw = `
+apiVersion: fluentd.fluent.io/v1alpha1
+kind: ClusterOutput
+metadata:
+  name: fluentd-output-datadog
+  labels:
+    output.fluentd.fluent.io/enabled: "true"
+spec: 
+  outputs: 
+  - datadog:
+      host: http-intake.logs.datadoghq.com
+      port: 443
+      ddSource: kubernetes
+      ddSourcecategory: kubernetes
+`
 	once sync.Once
 )
 
@@ -532,6 +548,7 @@ func init() {
 			ParseIntoObject(FluentdOutputUser1Raw, &FluentdOutputUser1)
 			ParseIntoObject(FluentdClusterOutputCustomRaw, &FluentdClusterOutputCustom)
 			ParseIntoObject(FluentdClusterOutput2CloudWatchRaw, &FluentdClusterOutput2CloudWatch)
+			ParseIntoObject(FluentdClusterOutput2DatadogRaw, &FluentdClusterOutput2Datadog)
 		},
 	)
 }
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml
index 4e9265f6e..f32e7f267 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml
@@ -4,6 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.11.3
+  creationTimestamp: null
   name: fluentbits.fluentbit.fluent.io
 spec:
   group: fluentbit.fluent.io
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml
index 7cf27db0d..4cb5f060c 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_clusteroutputs.yaml
@@ -413,6 +413,129 @@ spec:
                       required:
                       - config
                       type: object
+                    datadog:
+                      description: datadog plugin
+                      properties:
+                        apiKey:
+                          description: This parameter is required in order to authenticate
+                            your fluent agent.
+                          properties:
+                            valueFrom:
+                              description: ValueSource defines how to find a value's
+                                key.
+                              properties:
+                                secretKeyRef:
+                                  description: Selects a key of a secret in the pod's
+                                    namespace
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      description: 'Name of the referent. More info:
+                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        TODO: Add other useful fields. apiVersion,
+                                        kind, uid?'
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                          type: object
+                        compressionLevel:
+                          description: Set the log compression level for HTTP (1 to
+                            9, 9 being the best ratio)
+                          format: int32
+                          type: integer
+                        ddHostname:
+                          description: Used by Datadog to identify the host submitting
+                            the logs.
+                          type: string
+                        ddSource:
+                          description: This tells Datadog what integration it is
+                          type: string
+                        ddSourcecategory:
+                          description: Multiple value attribute. Can be used to refine
+                            the source attribute
+                          type: string
+                        ddTags:
+                          description: Custom tags with the following format "key1:value1,
+                            key2:value2"
+                          type: string
+                        host:
+                          description: Proxy endpoint when logs are not directly forwarded
+                            to Datadog
+                          type: string
+                        httpProxy:
+                          description: HTTP proxy, only takes effect if HTTP forwarding
+                            is enabled (use_http). Defaults to HTTP_PROXY/http_proxy
+                            env vars.
+                          type: string
+                        includeTagKey:
+                          description: Automatically include the Fluentd tag in the
+                            record.
+                          type: boolean
+                        maxBackoff:
+                          description: The maximum time waited between each retry
+                            in seconds
+                          format: int32
+                          type: integer
+                        maxRetries:
+                          description: The number of retries before the output plugin
+                            stops. Set to -1 for unlimited retries
+                          format: int32
+                          type: integer
+                        noSSLValidation:
+                          description: Disable SSL validation (useful for proxy forwarding)
+                          type: boolean
+                        port:
+                          description: Proxy port when logs are not directly forwarded
+                            to Datadog and ssl is not used
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        service:
+                          description: Used by Datadog to correlate between logs,
+                            traces and metrics.
+                          type: string
+                        sslPort:
+                          description: Port used to send logs over a SSL encrypted
+                            connection to Datadog. If use_http is disabled, use 10516
+                            for the US region and 443 for the EU region.
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        tagKey:
+                          description: Where to store the Fluentd tag.
+                          type: string
+                        timestampKey:
+                          description: Name of the attribute which will contain timestamp
+                            of the log event. If nil, timestamp attribute is not added.
+                          type: string
+                        useCompression:
+                          description: Enable log compression for HTTP
+                          type: boolean
+                        useHTTP:
+                          description: Enable HTTP forwarding. If you disable it,
+                            make sure to change the port to 10514 or ssl_port to 10516
+                          type: boolean
+                        useJson:
+                          description: Event format, if true, the event is sent in
+                            json format. Othwerwise, in plain text.
+                          type: boolean
+                        useSSL:
+                          description: If true, the agent initializes a secure connection
+                            to Datadog. In clear TCP otherwise.
+                          type: boolean
+                      type: object
                     elasticsearch:
                       description: out_es plugin
                       properties:
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml
index 21fe3ba61..8a2e1cdad 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_outputs.yaml
@@ -413,6 +413,129 @@ spec:
                       required:
                       - config
                       type: object
+                    datadog:
+                      description: datadog plugin
+                      properties:
+                        apiKey:
+                          description: This parameter is required in order to authenticate
+                            your fluent agent.
+                          properties:
+                            valueFrom:
+                              description: ValueSource defines how to find a value's
+                                key.
+                              properties:
+                                secretKeyRef:
+                                  description: Selects a key of a secret in the pod's
+                                    namespace
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      description: 'Name of the referent. More info:
+                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        TODO: Add other useful fields. apiVersion,
+                                        kind, uid?'
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                          type: object
+                        compressionLevel:
+                          description: Set the log compression level for HTTP (1 to
+                            9, 9 being the best ratio)
+                          format: int32
+                          type: integer
+                        ddHostname:
+                          description: Used by Datadog to identify the host submitting
+                            the logs.
+                          type: string
+                        ddSource:
+                          description: This tells Datadog what integration it is
+                          type: string
+                        ddSourcecategory:
+                          description: Multiple value attribute. Can be used to refine
+                            the source attribute
+                          type: string
+                        ddTags:
+                          description: Custom tags with the following format "key1:value1,
+                            key2:value2"
+                          type: string
+                        host:
+                          description: Proxy endpoint when logs are not directly forwarded
+                            to Datadog
+                          type: string
+                        httpProxy:
+                          description: HTTP proxy, only takes effect if HTTP forwarding
+                            is enabled (use_http). Defaults to HTTP_PROXY/http_proxy
+                            env vars.
+                          type: string
+                        includeTagKey:
+                          description: Automatically include the Fluentd tag in the
+                            record.
+                          type: boolean
+                        maxBackoff:
+                          description: The maximum time waited between each retry
+                            in seconds
+                          format: int32
+                          type: integer
+                        maxRetries:
+                          description: The number of retries before the output plugin
+                            stops. Set to -1 for unlimited retries
+                          format: int32
+                          type: integer
+                        noSSLValidation:
+                          description: Disable SSL validation (useful for proxy forwarding)
+                          type: boolean
+                        port:
+                          description: Proxy port when logs are not directly forwarded
+                            to Datadog and ssl is not used
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        service:
+                          description: Used by Datadog to correlate between logs,
+                            traces and metrics.
+                          type: string
+                        sslPort:
+                          description: Port used to send logs over a SSL encrypted
+                            connection to Datadog. If use_http is disabled, use 10516
+                            for the US region and 443 for the EU region.
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        tagKey:
+                          description: Where to store the Fluentd tag.
+                          type: string
+                        timestampKey:
+                          description: Name of the attribute which will contain timestamp
+                            of the log event. If nil, timestamp attribute is not added.
+                          type: string
+                        useCompression:
+                          description: Enable log compression for HTTP
+                          type: boolean
+                        useHTTP:
+                          description: Enable HTTP forwarding. If you disable it,
+                            make sure to change the port to 10514 or ssl_port to 10516
+                          type: boolean
+                        useJson:
+                          description: Event format, if true, the event is sent in
+                            json format. Othwerwise, in plain text.
+                          type: boolean
+                        useSSL:
+                          description: If true, the agent initializes a secure connection
+                            to Datadog. In clear TCP otherwise.
+                          type: boolean
+                      type: object
                     elasticsearch:
                       description: out_es plugin
                       properties:
diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.amd64 b/cmd/fluent-watcher/fluentd/Dockerfile.amd64
index 8fa3aa5bd..d66583920 100644
--- a/cmd/fluent-watcher/fluentd/Dockerfile.amd64
+++ b/cmd/fluent-watcher/fluentd/Dockerfile.amd64
@@ -49,6 +49,7 @@ RUN apk update \
          fluent-plugin-opensearch \
          fluent-plugin-grafana-loki \
          fluent-plugin-cloudwatch-logs \
+         fluent-plugin-datadog \
  && apk del .build-deps \
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/2.*/gems/fluentd-*/test
 
diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.arm64 b/cmd/fluent-watcher/fluentd/Dockerfile.arm64
index 9cf6e7624..c7a4535be 100644
--- a/cmd/fluent-watcher/fluentd/Dockerfile.arm64
+++ b/cmd/fluent-watcher/fluentd/Dockerfile.arm64
@@ -55,6 +55,7 @@ RUN apt-get update \
          fluent-plugin-multi-format-parser \
          fluent-plugin-aws-elasticsearch-service \
          fluent-plugin-opensearch \
+         fluent-plugin-datadog \
  && echo "plugin installed." \
  && wget -O /tmp/jemalloc-5.3.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 \
  && cd /tmp && tar -xjf jemalloc-5.3.0.tar.bz2 && cd jemalloc-5.3.0/ \
diff --git a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base
index 53c801992..41f01e95e 100644
--- a/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base
+++ b/cmd/fluent-watcher/fluentd/Dockerfile.arm64.base
@@ -45,6 +45,7 @@ RUN apt-get update \
          fluent-plugin-multi-format-parser \
          fluent-plugin-aws-elasticsearch-service \
          fluent-plugin-opensearch \
+         fluent-plugin-datadog \
  && wget -O /tmp/jemalloc-4.5.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/4.5.0/jemalloc-4.5.0.tar.bz2 \
  && cd /tmp && tar -xjf jemalloc-4.5.0.tar.bz2 && cd jemalloc-4.5.0/ \
  && ./configure && make \
diff --git a/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml
index 7cf27db0d..4cb5f060c 100644
--- a/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml
+++ b/config/crd/bases/fluentd.fluent.io_clusteroutputs.yaml
@@ -413,6 +413,129 @@ spec:
                       required:
                       - config
                       type: object
+                    datadog:
+                      description: datadog plugin
+                      properties:
+                        apiKey:
+                          description: This parameter is required in order to authenticate
+                            your fluent agent.
+                          properties:
+                            valueFrom:
+                              description: ValueSource defines how to find a value's
+                                key.
+                              properties:
+                                secretKeyRef:
+                                  description: Selects a key of a secret in the pod's
+                                    namespace
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      description: 'Name of the referent. More info:
+                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        TODO: Add other useful fields. apiVersion,
+                                        kind, uid?'
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                          type: object
+                        compressionLevel:
+                          description: Set the log compression level for HTTP (1 to
+                            9, 9 being the best ratio)
+                          format: int32
+                          type: integer
+                        ddHostname:
+                          description: Used by Datadog to identify the host submitting
+                            the logs.
+                          type: string
+                        ddSource:
+                          description: This tells Datadog what integration it is
+                          type: string
+                        ddSourcecategory:
+                          description: Multiple value attribute. Can be used to refine
+                            the source attribute
+                          type: string
+                        ddTags:
+                          description: Custom tags with the following format "key1:value1,
+                            key2:value2"
+                          type: string
+                        host:
+                          description: Proxy endpoint when logs are not directly forwarded
+                            to Datadog
+                          type: string
+                        httpProxy:
+                          description: HTTP proxy, only takes effect if HTTP forwarding
+                            is enabled (use_http). Defaults to HTTP_PROXY/http_proxy
+                            env vars.
+                          type: string
+                        includeTagKey:
+                          description: Automatically include the Fluentd tag in the
+                            record.
+                          type: boolean
+                        maxBackoff:
+                          description: The maximum time waited between each retry
+                            in seconds
+                          format: int32
+                          type: integer
+                        maxRetries:
+                          description: The number of retries before the output plugin
+                            stops. Set to -1 for unlimited retries
+                          format: int32
+                          type: integer
+                        noSSLValidation:
+                          description: Disable SSL validation (useful for proxy forwarding)
+                          type: boolean
+                        port:
+                          description: Proxy port when logs are not directly forwarded
+                            to Datadog and ssl is not used
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        service:
+                          description: Used by Datadog to correlate between logs,
+                            traces and metrics.
+                          type: string
+                        sslPort:
+                          description: Port used to send logs over a SSL encrypted
+                            connection to Datadog. If use_http is disabled, use 10516
+                            for the US region and 443 for the EU region.
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        tagKey:
+                          description: Where to store the Fluentd tag.
+                          type: string
+                        timestampKey:
+                          description: Name of the attribute which will contain timestamp
+                            of the log event. If nil, timestamp attribute is not added.
+                          type: string
+                        useCompression:
+                          description: Enable log compression for HTTP
+                          type: boolean
+                        useHTTP:
+                          description: Enable HTTP forwarding. If you disable it,
+                            make sure to change the port to 10514 or ssl_port to 10516
+                          type: boolean
+                        useJson:
+                          description: Event format, if true, the event is sent in
+                            json format. Othwerwise, in plain text.
+                          type: boolean
+                        useSSL:
+                          description: If true, the agent initializes a secure connection
+                            to Datadog. In clear TCP otherwise.
+                          type: boolean
+                      type: object
                     elasticsearch:
                       description: out_es plugin
                       properties:
diff --git a/config/crd/bases/fluentd.fluent.io_outputs.yaml b/config/crd/bases/fluentd.fluent.io_outputs.yaml
index 21fe3ba61..8a2e1cdad 100644
--- a/config/crd/bases/fluentd.fluent.io_outputs.yaml
+++ b/config/crd/bases/fluentd.fluent.io_outputs.yaml
@@ -413,6 +413,129 @@ spec:
                       required:
                       - config
                       type: object
+                    datadog:
+                      description: datadog plugin
+                      properties:
+                        apiKey:
+                          description: This parameter is required in order to authenticate
+                            your fluent agent.
+                          properties:
+                            valueFrom:
+                              description: ValueSource defines how to find a value's
+                                key.
+                              properties:
+                                secretKeyRef:
+                                  description: Selects a key of a secret in the pod's
+                                    namespace
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      description: 'Name of the referent. More info:
+                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        TODO: Add other useful fields. apiVersion,
+                                        kind, uid?'
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                          type: object
+                        compressionLevel:
+                          description: Set the log compression level for HTTP (1 to
+                            9, 9 being the best ratio)
+                          format: int32
+                          type: integer
+                        ddHostname:
+                          description: Used by Datadog to identify the host submitting
+                            the logs.
+                          type: string
+                        ddSource:
+                          description: This tells Datadog what integration it is
+                          type: string
+                        ddSourcecategory:
+                          description: Multiple value attribute. Can be used to refine
+                            the source attribute
+                          type: string
+                        ddTags:
+                          description: Custom tags with the following format "key1:value1,
+                            key2:value2"
+                          type: string
+                        host:
+                          description: Proxy endpoint when logs are not directly forwarded
+                            to Datadog
+                          type: string
+                        httpProxy:
+                          description: HTTP proxy, only takes effect if HTTP forwarding
+                            is enabled (use_http). Defaults to HTTP_PROXY/http_proxy
+                            env vars.
+                          type: string
+                        includeTagKey:
+                          description: Automatically include the Fluentd tag in the
+                            record.
+                          type: boolean
+                        maxBackoff:
+                          description: The maximum time waited between each retry
+                            in seconds
+                          format: int32
+                          type: integer
+                        maxRetries:
+                          description: The number of retries before the output plugin
+                            stops. Set to -1 for unlimited retries
+                          format: int32
+                          type: integer
+                        noSSLValidation:
+                          description: Disable SSL validation (useful for proxy forwarding)
+                          type: boolean
+                        port:
+                          description: Proxy port when logs are not directly forwarded
+                            to Datadog and ssl is not used
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        service:
+                          description: Used by Datadog to correlate between logs,
+                            traces and metrics.
+                          type: string
+                        sslPort:
+                          description: Port used to send logs over a SSL encrypted
+                            connection to Datadog. If use_http is disabled, use 10516
+                            for the US region and 443 for the EU region.
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        tagKey:
+                          description: Where to store the Fluentd tag.
+                          type: string
+                        timestampKey:
+                          description: Name of the attribute which will contain timestamp
+                            of the log event. If nil, timestamp attribute is not added.
+                          type: string
+                        useCompression:
+                          description: Enable log compression for HTTP
+                          type: boolean
+                        useHTTP:
+                          description: Enable HTTP forwarding. If you disable it,
+                            make sure to change the port to 10514 or ssl_port to 10516
+                          type: boolean
+                        useJson:
+                          description: Event format, if true, the event is sent in
+                            json format. Othwerwise, in plain text.
+                          type: boolean
+                        useSSL:
+                          description: If true, the agent initializes a secure connection
+                            to Datadog. In clear TCP otherwise.
+                          type: boolean
+                      type: object
                     elasticsearch:
                       description: out_es plugin
                       properties:
diff --git a/docs/fluentbit.md b/docs/fluentbit.md
index 5e72a6cd3..7f75ee0e3 100644
--- a/docs/fluentbit.md
+++ b/docs/fluentbit.md
@@ -214,6 +214,7 @@ CollectorSpec defines the desired state of FluentBit
 | bufferPath | The path where buffer chunks are stored. | *string |
 | ports | Ports represents the pod's ports. | []corev1.ContainerPort |
 | service | Service represents configurations on the fluent-bit service. | CollectorService |
+| schedulerName | SchedulerName represents the desired scheduler for the Fluentbit collector pods | string |
 
 [Back to TOC](#table-of-contents)
 # Decorder
@@ -396,6 +397,7 @@ FluentBitSpec defines the desired state of FluentBit
 | dnsPolicy | Set DNS policy for the pod. Defaults to \"ClusterFirst\". Valid values are 'ClusterFirstWithHostNet', 'ClusterFirst', 'Default' or 'None'. | corev1.DNSPolicy |
 | metricsPort | MetricsPort is the port used by the metrics server. If this option is set, HttpPort from ClusterFluentBitConfig needs to match this value. Default is 2020. | int32 |
 | service | Service represents configurations on the fluent-bit service. | FluentBitService |
+| schedulerName | SchedulerName represents the desired scheduler for fluent-bit pods. | string |
 
 [Back to TOC](#table-of-contents)
 # InputSpec
diff --git a/docs/fluentd.md b/docs/fluentd.md
index a331ee86e..13cfb127b 100644
--- a/docs/fluentd.md
+++ b/docs/fluentd.md
@@ -311,6 +311,7 @@ FluentdSpec defines the desired state of Fluentd
 | volumeClaimTemplates | volumeClaimTemplates is a list of claims that pods are allowed to reference. The StatefulSet controller is responsible for mapping network identities to claims in a way that maintains the identity of a pod. Every claim in this list must have at least one matching (by name) volumeMount in one container in the template. | []corev1.PersistentVolumeClaim |
 | service | Service represents configurations on the fluentd service. | FluentDService |
 | securityContext | PodSecurityContext represents the security context for the fluentd pods. | *corev1.PodSecurityContext |
+| schedulerName | SchedulerName represents the desired scheduler for fluentd pods. | string |
 
 [Back to TOC](#table-of-contents)
 # FluentdStatus
diff --git a/docs/plugins/fluentd/common/common.md b/docs/plugins/fluentd/common/common.md
index 2b3979b76..75f89cf46 100644
--- a/docs/plugins/fluentd/common/common.md
+++ b/docs/plugins/fluentd/common/common.md
@@ -15,8 +15,8 @@ Time defines the common parameters for the time plugin
 
 | Field | Description | Scheme |
 | ----- | ----------- | ------ |
-| timeType | parses/formats value according to this type, default is *string | *string |
-| timeFormat | Process value according to the specified format. This is available only when time_type is *string | *string |
+| timeType | parses/formats value according to this type, default is string | *string |
+| timeFormat | Process value according to the specified format. This is available only when time_type is string | *string |
 | localtime | If true, uses local time. | *bool |
 | utc | If true, uses UTC. | *bool |
 | timezone | Uses the specified timezone. | *string |
diff --git a/docs/plugins/fluentd/output/datadog.md b/docs/plugins/fluentd/output/datadog.md
new file mode 100644
index 000000000..ac0a460c5
--- /dev/null
+++ b/docs/plugins/fluentd/output/datadog.md
@@ -0,0 +1,28 @@
+# Datadog
+
+Datadog defines the parameters for out_datadog plugin
+
+
+| Field | Description | Scheme |
+| ----- | ----------- | ------ |
+| apiKey | This parameter is required in order to authenticate your fluent agent. | *[plugins.Secret](../secret.md) |
+| useJson | Event format, if true, the event is sent in json format. Othwerwise, in plain text. | *bool |
+| includeTagKey | Automatically include the Fluentd tag in the record. | *bool |
+| tagKey | Where to store the Fluentd tag. | *string |
+| timestampKey | Name of the attribute which will contain timestamp of the log event. If nil, timestamp attribute is not added. | *string |
+| useSSL | If true, the agent initializes a secure connection to Datadog. In clear TCP otherwise. | *bool |
+| noSSLValidation | Disable SSL validation (useful for proxy forwarding) | *bool |
+| sslPort | Port used to send logs over a SSL encrypted connection to Datadog. If use_http is disabled, use 10516 for the US region and 443 for the EU region. | *uint32 |
+| maxRetries | The number of retries before the output plugin stops. Set to -1 for unlimited retries | *uint32 |
+| maxBackoff | The maximum time waited between each retry in seconds | *uint32 |
+| useHTTP | Enable HTTP forwarding. If you disable it, make sure to change the port to 10514 or ssl_port to 10516 | *bool |
+| useCompression | Enable log compression for HTTP | *bool |
+| compressionLevel | Set the log compression level for HTTP (1 to 9, 9 being the best ratio) | *uint32 |
+| ddSource | This tells Datadog what integration it is | *string |
+| ddSourcecategory | Multiple value attribute. Can be used to refine the source attribute | *string |
+| ddTags | Custom tags with the following format \"key1:value1, key2:value2\" | *string |
+| ddHostname | Used by Datadog to identify the host submitting the logs. | *string |
+| service | Used by Datadog to correlate between logs, traces and metrics. | *string |
+| port | Proxy port when logs are not directly forwarded to Datadog and ssl is not used | *uint32 |
+| host | Proxy endpoint when logs are not directly forwarded to Datadog | *string |
+| httpProxy | HTTP proxy, only takes effect if HTTP forwarding is enabled (use_http). Defaults to HTTP_PROXY/http_proxy env vars. | *string |
diff --git a/docs/plugins/fluentd/output/types.md b/docs/plugins/fluentd/output/types.md
index 72c4aebcd..2ed549f23 100644
--- a/docs/plugins/fluentd/output/types.md
+++ b/docs/plugins/fluentd/output/types.md
@@ -24,3 +24,4 @@ Output defines all available output plugins and their parameters
 | loki | out_loki plugin | *Loki |
 | customPlugin | Custom plugin type | *custom.CustomPlugin |
 | cloudWatch | out_cloudwatch plugin | *CloudWatch |
+| datadog | datadog plugin | *Datadog |
diff --git a/go.mod b/go.mod
index b6dd22429..b8ff43e8b 100644
--- a/go.mod
+++ b/go.mod
@@ -58,12 +58,14 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/mod v0.10.0 // indirect
 	golang.org/x/net v0.10.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
 	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/term v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.9.1 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
@@ -72,7 +74,9 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
+	k8s.io/code-generator v0.26.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
+	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
 	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
diff --git a/go.sum b/go.sum
index dbf27a540..5268da82a 100644
--- a/go.sum
+++ b/go.sum
@@ -89,6 +89,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -349,6 +350,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 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.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -503,6 +506,7 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -513,6 +517,7 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
+golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -640,8 +645,13 @@ k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg=
 k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
 k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
 k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
+k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo=
+k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I=
 k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
 k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
+k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
 k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
@@ -657,5 +667,6 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index 6963db7df..407b30eef 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -5264,6 +5264,129 @@ spec:
                       required:
                       - config
                       type: object
+                    datadog:
+                      description: datadog plugin
+                      properties:
+                        apiKey:
+                          description: This parameter is required in order to authenticate
+                            your fluent agent.
+                          properties:
+                            valueFrom:
+                              description: ValueSource defines how to find a value's
+                                key.
+                              properties:
+                                secretKeyRef:
+                                  description: Selects a key of a secret in the pod's
+                                    namespace
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      description: 'Name of the referent. More info:
+                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        TODO: Add other useful fields. apiVersion,
+                                        kind, uid?'
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                          type: object
+                        compressionLevel:
+                          description: Set the log compression level for HTTP (1 to
+                            9, 9 being the best ratio)
+                          format: int32
+                          type: integer
+                        ddHostname:
+                          description: Used by Datadog to identify the host submitting
+                            the logs.
+                          type: string
+                        ddSource:
+                          description: This tells Datadog what integration it is
+                          type: string
+                        ddSourcecategory:
+                          description: Multiple value attribute. Can be used to refine
+                            the source attribute
+                          type: string
+                        ddTags:
+                          description: Custom tags with the following format "key1:value1,
+                            key2:value2"
+                          type: string
+                        host:
+                          description: Proxy endpoint when logs are not directly forwarded
+                            to Datadog
+                          type: string
+                        httpProxy:
+                          description: HTTP proxy, only takes effect if HTTP forwarding
+                            is enabled (use_http). Defaults to HTTP_PROXY/http_proxy
+                            env vars.
+                          type: string
+                        includeTagKey:
+                          description: Automatically include the Fluentd tag in the
+                            record.
+                          type: boolean
+                        maxBackoff:
+                          description: The maximum time waited between each retry
+                            in seconds
+                          format: int32
+                          type: integer
+                        maxRetries:
+                          description: The number of retries before the output plugin
+                            stops. Set to -1 for unlimited retries
+                          format: int32
+                          type: integer
+                        noSSLValidation:
+                          description: Disable SSL validation (useful for proxy forwarding)
+                          type: boolean
+                        port:
+                          description: Proxy port when logs are not directly forwarded
+                            to Datadog and ssl is not used
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        service:
+                          description: Used by Datadog to correlate between logs,
+                            traces and metrics.
+                          type: string
+                        sslPort:
+                          description: Port used to send logs over a SSL encrypted
+                            connection to Datadog. If use_http is disabled, use 10516
+                            for the US region and 443 for the EU region.
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        tagKey:
+                          description: Where to store the Fluentd tag.
+                          type: string
+                        timestampKey:
+                          description: Name of the attribute which will contain timestamp
+                            of the log event. If nil, timestamp attribute is not added.
+                          type: string
+                        useCompression:
+                          description: Enable log compression for HTTP
+                          type: boolean
+                        useHTTP:
+                          description: Enable HTTP forwarding. If you disable it,
+                            make sure to change the port to 10514 or ssl_port to 10516
+                          type: boolean
+                        useJson:
+                          description: Event format, if true, the event is sent in
+                            json format. Othwerwise, in plain text.
+                          type: boolean
+                        useSSL:
+                          description: If true, the agent initializes a secure connection
+                            to Datadog. In clear TCP otherwise.
+                          type: boolean
+                      type: object
                     elasticsearch:
                       description: out_es plugin
                       properties:
@@ -25564,6 +25687,129 @@ spec:
                       required:
                       - config
                       type: object
+                    datadog:
+                      description: datadog plugin
+                      properties:
+                        apiKey:
+                          description: This parameter is required in order to authenticate
+                            your fluent agent.
+                          properties:
+                            valueFrom:
+                              description: ValueSource defines how to find a value's
+                                key.
+                              properties:
+                                secretKeyRef:
+                                  description: Selects a key of a secret in the pod's
+                                    namespace
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      description: 'Name of the referent. More info:
+                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        TODO: Add other useful fields. apiVersion,
+                                        kind, uid?'
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                          type: object
+                        compressionLevel:
+                          description: Set the log compression level for HTTP (1 to
+                            9, 9 being the best ratio)
+                          format: int32
+                          type: integer
+                        ddHostname:
+                          description: Used by Datadog to identify the host submitting
+                            the logs.
+                          type: string
+                        ddSource:
+                          description: This tells Datadog what integration it is
+                          type: string
+                        ddSourcecategory:
+                          description: Multiple value attribute. Can be used to refine
+                            the source attribute
+                          type: string
+                        ddTags:
+                          description: Custom tags with the following format "key1:value1,
+                            key2:value2"
+                          type: string
+                        host:
+                          description: Proxy endpoint when logs are not directly forwarded
+                            to Datadog
+                          type: string
+                        httpProxy:
+                          description: HTTP proxy, only takes effect if HTTP forwarding
+                            is enabled (use_http). Defaults to HTTP_PROXY/http_proxy
+                            env vars.
+                          type: string
+                        includeTagKey:
+                          description: Automatically include the Fluentd tag in the
+                            record.
+                          type: boolean
+                        maxBackoff:
+                          description: The maximum time waited between each retry
+                            in seconds
+                          format: int32
+                          type: integer
+                        maxRetries:
+                          description: The number of retries before the output plugin
+                            stops. Set to -1 for unlimited retries
+                          format: int32
+                          type: integer
+                        noSSLValidation:
+                          description: Disable SSL validation (useful for proxy forwarding)
+                          type: boolean
+                        port:
+                          description: Proxy port when logs are not directly forwarded
+                            to Datadog and ssl is not used
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        service:
+                          description: Used by Datadog to correlate between logs,
+                            traces and metrics.
+                          type: string
+                        sslPort:
+                          description: Port used to send logs over a SSL encrypted
+                            connection to Datadog. If use_http is disabled, use 10516
+                            for the US region and 443 for the EU region.
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        tagKey:
+                          description: Where to store the Fluentd tag.
+                          type: string
+                        timestampKey:
+                          description: Name of the attribute which will contain timestamp
+                            of the log event. If nil, timestamp attribute is not added.
+                          type: string
+                        useCompression:
+                          description: Enable log compression for HTTP
+                          type: boolean
+                        useHTTP:
+                          description: Enable HTTP forwarding. If you disable it,
+                            make sure to change the port to 10514 or ssl_port to 10516
+                          type: boolean
+                        useJson:
+                          description: Event format, if true, the event is sent in
+                            json format. Othwerwise, in plain text.
+                          type: boolean
+                        useSSL:
+                          description: If true, the agent initializes a secure connection
+                            to Datadog. In clear TCP otherwise.
+                          type: boolean
+                      type: object
                     elasticsearch:
                       description: out_es plugin
                       properties:
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index b737beda8..6e7ddb21f 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -5264,6 +5264,129 @@ spec:
                       required:
                       - config
                       type: object
+                    datadog:
+                      description: datadog plugin
+                      properties:
+                        apiKey:
+                          description: This parameter is required in order to authenticate
+                            your fluent agent.
+                          properties:
+                            valueFrom:
+                              description: ValueSource defines how to find a value's
+                                key.
+                              properties:
+                                secretKeyRef:
+                                  description: Selects a key of a secret in the pod's
+                                    namespace
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      description: 'Name of the referent. More info:
+                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        TODO: Add other useful fields. apiVersion,
+                                        kind, uid?'
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                          type: object
+                        compressionLevel:
+                          description: Set the log compression level for HTTP (1 to
+                            9, 9 being the best ratio)
+                          format: int32
+                          type: integer
+                        ddHostname:
+                          description: Used by Datadog to identify the host submitting
+                            the logs.
+                          type: string
+                        ddSource:
+                          description: This tells Datadog what integration it is
+                          type: string
+                        ddSourcecategory:
+                          description: Multiple value attribute. Can be used to refine
+                            the source attribute
+                          type: string
+                        ddTags:
+                          description: Custom tags with the following format "key1:value1,
+                            key2:value2"
+                          type: string
+                        host:
+                          description: Proxy endpoint when logs are not directly forwarded
+                            to Datadog
+                          type: string
+                        httpProxy:
+                          description: HTTP proxy, only takes effect if HTTP forwarding
+                            is enabled (use_http). Defaults to HTTP_PROXY/http_proxy
+                            env vars.
+                          type: string
+                        includeTagKey:
+                          description: Automatically include the Fluentd tag in the
+                            record.
+                          type: boolean
+                        maxBackoff:
+                          description: The maximum time waited between each retry
+                            in seconds
+                          format: int32
+                          type: integer
+                        maxRetries:
+                          description: The number of retries before the output plugin
+                            stops. Set to -1 for unlimited retries
+                          format: int32
+                          type: integer
+                        noSSLValidation:
+                          description: Disable SSL validation (useful for proxy forwarding)
+                          type: boolean
+                        port:
+                          description: Proxy port when logs are not directly forwarded
+                            to Datadog and ssl is not used
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        service:
+                          description: Used by Datadog to correlate between logs,
+                            traces and metrics.
+                          type: string
+                        sslPort:
+                          description: Port used to send logs over a SSL encrypted
+                            connection to Datadog. If use_http is disabled, use 10516
+                            for the US region and 443 for the EU region.
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        tagKey:
+                          description: Where to store the Fluentd tag.
+                          type: string
+                        timestampKey:
+                          description: Name of the attribute which will contain timestamp
+                            of the log event. If nil, timestamp attribute is not added.
+                          type: string
+                        useCompression:
+                          description: Enable log compression for HTTP
+                          type: boolean
+                        useHTTP:
+                          description: Enable HTTP forwarding. If you disable it,
+                            make sure to change the port to 10514 or ssl_port to 10516
+                          type: boolean
+                        useJson:
+                          description: Event format, if true, the event is sent in
+                            json format. Othwerwise, in plain text.
+                          type: boolean
+                        useSSL:
+                          description: If true, the agent initializes a secure connection
+                            to Datadog. In clear TCP otherwise.
+                          type: boolean
+                      type: object
                     elasticsearch:
                       description: out_es plugin
                       properties:
@@ -25564,6 +25687,129 @@ spec:
                       required:
                       - config
                       type: object
+                    datadog:
+                      description: datadog plugin
+                      properties:
+                        apiKey:
+                          description: This parameter is required in order to authenticate
+                            your fluent agent.
+                          properties:
+                            valueFrom:
+                              description: ValueSource defines how to find a value's
+                                key.
+                              properties:
+                                secretKeyRef:
+                                  description: Selects a key of a secret in the pod's
+                                    namespace
+                                  properties:
+                                    key:
+                                      description: The key of the secret to select
+                                        from.  Must be a valid secret key.
+                                      type: string
+                                    name:
+                                      description: 'Name of the referent. More info:
+                                        https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                        TODO: Add other useful fields. apiVersion,
+                                        kind, uid?'
+                                      type: string
+                                    optional:
+                                      description: Specify whether the Secret or its
+                                        key must be defined
+                                      type: boolean
+                                  required:
+                                  - key
+                                  type: object
+                                  x-kubernetes-map-type: atomic
+                              type: object
+                          type: object
+                        compressionLevel:
+                          description: Set the log compression level for HTTP (1 to
+                            9, 9 being the best ratio)
+                          format: int32
+                          type: integer
+                        ddHostname:
+                          description: Used by Datadog to identify the host submitting
+                            the logs.
+                          type: string
+                        ddSource:
+                          description: This tells Datadog what integration it is
+                          type: string
+                        ddSourcecategory:
+                          description: Multiple value attribute. Can be used to refine
+                            the source attribute
+                          type: string
+                        ddTags:
+                          description: Custom tags with the following format "key1:value1,
+                            key2:value2"
+                          type: string
+                        host:
+                          description: Proxy endpoint when logs are not directly forwarded
+                            to Datadog
+                          type: string
+                        httpProxy:
+                          description: HTTP proxy, only takes effect if HTTP forwarding
+                            is enabled (use_http). Defaults to HTTP_PROXY/http_proxy
+                            env vars.
+                          type: string
+                        includeTagKey:
+                          description: Automatically include the Fluentd tag in the
+                            record.
+                          type: boolean
+                        maxBackoff:
+                          description: The maximum time waited between each retry
+                            in seconds
+                          format: int32
+                          type: integer
+                        maxRetries:
+                          description: The number of retries before the output plugin
+                            stops. Set to -1 for unlimited retries
+                          format: int32
+                          type: integer
+                        noSSLValidation:
+                          description: Disable SSL validation (useful for proxy forwarding)
+                          type: boolean
+                        port:
+                          description: Proxy port when logs are not directly forwarded
+                            to Datadog and ssl is not used
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        service:
+                          description: Used by Datadog to correlate between logs,
+                            traces and metrics.
+                          type: string
+                        sslPort:
+                          description: Port used to send logs over a SSL encrypted
+                            connection to Datadog. If use_http is disabled, use 10516
+                            for the US region and 443 for the EU region.
+                          format: int32
+                          maximum: 65535
+                          minimum: 1
+                          type: integer
+                        tagKey:
+                          description: Where to store the Fluentd tag.
+                          type: string
+                        timestampKey:
+                          description: Name of the attribute which will contain timestamp
+                            of the log event. If nil, timestamp attribute is not added.
+                          type: string
+                        useCompression:
+                          description: Enable log compression for HTTP
+                          type: boolean
+                        useHTTP:
+                          description: Enable HTTP forwarding. If you disable it,
+                            make sure to change the port to 10514 or ssl_port to 10516
+                          type: boolean
+                        useJson:
+                          description: Event format, if true, the event is sent in
+                            json format. Othwerwise, in plain text.
+                          type: boolean
+                        useSSL:
+                          description: If true, the agent initializes a secure connection
+                            to Datadog. In clear TCP otherwise.
+                          type: boolean
+                      type: object
                     elasticsearch:
                       description: out_es plugin
                       properties:

From 251932ed9240ee00adb8e6e5106f4e16a1055725 Mon Sep 17 00:00:00 2001
From: Jakob <jakob.hahn@hetzner.com>
Date: Tue, 27 Jun 2023 09:38:16 +0200
Subject: [PATCH 60/78] Feat: Add DefaultFilterSelector and
 DefaultOutputSelector to fluentd (#804)

* apis: Add DefaultFilterSelector, DefaultOutputSelector to fluentdSpec

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>

* Render manifests with updated fluentdSpec

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>

* apis: Update/Add comments, Fix PatchAndFilter errors

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>

* apis: Generate deepcopy code

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>

* controllers: Update/Add comments, Use DefaultFilter and DefaultOutput for fluentd

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>

* docs: Updated

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>

---------

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>
---
 apis/fluentd/v1alpha1/fluentd_types.go        |   4 +
 apis/fluentd/v1alpha1/helper.go               |  33 +++--
 apis/fluentd/v1alpha1/plugins/params/model.go |  19 +--
 .../fluentd/v1alpha1/zz_generated.deepcopy.go |  10 ++
 .../crds/fluentd.fluent.io_fluentds.yaml      |  92 ++++++++++++++
 .../crd/bases/fluentd.fluent.io_fluentds.yaml |  92 ++++++++++++++
 controllers/fluentdconfig_controller.go       | 116 ++++++++++++------
 docs/fluentd.md                               |   2 +
 manifests/setup/fluent-operator-crd.yaml      |  92 ++++++++++++++
 manifests/setup/setup.yaml                    |  92 ++++++++++++++
 10 files changed, 496 insertions(+), 56 deletions(-)

diff --git a/apis/fluentd/v1alpha1/fluentd_types.go b/apis/fluentd/v1alpha1/fluentd_types.go
index 9d47d0fd5..7697d9fbf 100644
--- a/apis/fluentd/v1alpha1/fluentd_types.go
+++ b/apis/fluentd/v1alpha1/fluentd_types.go
@@ -36,6 +36,10 @@ const (
 type FluentdSpec struct {
 	// Fluentd global inputs.
 	GlobalInputs []input.Input `json:"globalInputs,omitempty"`
+	// Select cluster filter plugins used to filter for the default cluster output
+	DefaultFilterSelector *metav1.LabelSelector `json:"defaultFilterSelector,omitempty"`
+	// Select cluster output plugins used to send all logs that did not match any route to the matching outputs
+	DefaultOutputSelector *metav1.LabelSelector `json:"defaultOutputSelector,omitempty"`
 	// By default will build the related service according to the globalinputs definition.
 	DisableService bool `json:"disableService,omitempty"`
 	// Numbers of the Fluentd instance
diff --git a/apis/fluentd/v1alpha1/helper.go b/apis/fluentd/v1alpha1/helper.go
index 4a5ad0e29..a9701f4cf 100644
--- a/apis/fluentd/v1alpha1/helper.go
+++ b/apis/fluentd/v1alpha1/helper.go
@@ -98,6 +98,7 @@ func (pgr *PluginResources) BuildCfgRouter(cfg Renderer) (*fluentdRouter.Route,
 		return nil, err
 	}
 
+	// Insert the route to the MainRouter
 	pgr.MainRouterPlugins.InsertChilds(routePluginStore)
 
 	return cfgRoute, nil
@@ -105,8 +106,12 @@ func (pgr *PluginResources) BuildCfgRouter(cfg Renderer) (*fluentdRouter.Route,
 
 // PatchAndFilterClusterLevelResources will combine and patch all the cluster CRs that the fluentdconfig selected,
 // convert the related filter/output pluginstores to the global pluginresources.
-func (pgr *PluginResources) PatchAndFilterClusterLevelResources(sl plugins.SecretLoader, cfgId string,
-	clusterfilters []ClusterFilter, clusteroutputs []ClusterOutput) (*CfgResources, []string) {
+func (pgr *PluginResources) PatchAndFilterClusterLevelResources(
+	sl plugins.SecretLoader,
+	cfgId string,
+	clusterfilters []ClusterFilter,
+	clusteroutputs []ClusterOutput,
+) (*CfgResources, []string) {
 	// To store all filters/outputs plugins that this cfg selected
 	cfgResources := NewCfgResources()
 
@@ -135,8 +140,12 @@ func (pgr *PluginResources) PatchAndFilterClusterLevelResources(sl plugins.Secre
 
 // PatchAndFilterNamespacedLevelResources will combine and patch all the cluster CRs that the fluentdconfig selected,
 // convert the related filter/output pluginstores to the global pluginresources.
-func (pgr *PluginResources) PatchAndFilterNamespacedLevelResources(sl plugins.SecretLoader, cfgId string,
-	filters []Filter, outputs []Output) (*CfgResources, []string) {
+func (pgr *PluginResources) PatchAndFilterNamespacedLevelResources(
+	sl plugins.SecretLoader,
+	cfgId string,
+	filters []Filter,
+	outputs []Output,
+) (*CfgResources, []string) {
 	// To store all filters/outputs plugins that this cfg selected
 	cfgResources := NewCfgResources()
 
@@ -163,8 +172,11 @@ func (pgr *PluginResources) PatchAndFilterNamespacedLevelResources(sl plugins.Se
 	return cfgResources, errs
 }
 
-func (r *CfgResources) filterForFilters(cfgId, namespace, name, crdtype string,
-	sl plugins.SecretLoader, filters []filter.Filter) error {
+func (r *CfgResources) filterForFilters(
+	cfgId, namespace, name, crdtype string,
+	sl plugins.SecretLoader,
+	filters []filter.Filter,
+) error {
 	for n, filter := range filters {
 		filterId := fmt.Sprintf("%s::%s::%s::%s-%d", cfgId, namespace, crdtype, name, n)
 		filter.FilterCommon.Id = &filterId
@@ -189,8 +201,11 @@ func (r *CfgResources) filterForFilters(cfgId, namespace, name, crdtype string,
 	return nil
 }
 
-func (r *CfgResources) filterForOutputs(cfgId, namespace, name, crdtype string,
-	sl plugins.SecretLoader, outputs []output.Output) error {
+func (r *CfgResources) filterForOutputs(
+	cfgId, namespace, name, crdtype string,
+	sl plugins.SecretLoader,
+	outputs []output.Output,
+) error {
 	for n, output := range outputs {
 		outputId := fmt.Sprintf("%s::%s::%s::%s-%d", cfgId, namespace, crdtype, name, n)
 		output.OutputCommon.Id = &outputId
@@ -218,7 +233,7 @@ func (r *CfgResources) filterForOutputs(cfgId, namespace, name, crdtype string,
 // convert the cfg plugins to a label plugin, appends to the global label plugins
 func (pgr *PluginResources) WithCfgResources(cfgRouteLabel string, r *CfgResources) error {
 	if len(r.FilterPlugins) == 0 && len(r.OutputPlugins) == 0 {
-		return errors.New("no filter plugins or output plugins matched")
+		return errors.New("no filter plugins and no output plugins matched")
 	}
 
 	cfgLabelPlugin := params.NewPluginStore("label")
diff --git a/apis/fluentd/v1alpha1/plugins/params/model.go b/apis/fluentd/v1alpha1/plugins/params/model.go
index 2805aa1bd..99e03bdc2 100644
--- a/apis/fluentd/v1alpha1/plugins/params/model.go
+++ b/apis/fluentd/v1alpha1/plugins/params/model.go
@@ -34,12 +34,12 @@ func (ps *PluginStore) InsertPairs(key, value string) {
 	ps.Store[key] = value
 }
 
-// The @type parameter specifies the type of the plugin.
+// The @type parameter specifies the type of the plugin
 func (ps *PluginStore) InsertType(value string) {
 	ps.InsertPairs("@type", value)
 }
 
-// SetIgnorePath will ignore the buffer path.
+// SetIgnorePath will ignore the buffer path
 func (ps *PluginStore) SetIgnorePath() {
 	ps.IgnorePath = true
 }
@@ -58,7 +58,7 @@ func (ps *PluginStore) InsertChilds(childs ...*PluginStore) {
 	}
 }
 
-// The total hash string for this plugin store.
+// The total hash string for this plugin store
 func (ps *PluginStore) Hash() string {
 	c := NewPluginStore(ps.Name)
 
@@ -78,7 +78,7 @@ func (ps *PluginStore) GetTag() string {
 	return ps.Store["tag"]
 }
 
-// Returns the @label value string of this plugin store.
+// Returns the @label value string of this plugin store
 func (ps *PluginStore) RouteLabel() string {
 	if ps.Name != "route" {
 		return ""
@@ -100,10 +100,10 @@ func (ps *PluginStore) String() string {
 	}
 	var buf bytes.Buffer
 
-	// Handles the head section.
+	// Handles the head directive
 	ps.processHead(&buf)
 
-	// The body needs to be indented by two whitespace characters.
+	// The body needs to be indented by two whitespace characters
 	parentPrefixWhitespaces := ps.PrefixWhitespaces
 	ps.setWhitespaces(parentPrefixWhitespaces + IntervalWhitespaces)
 	ps.processBody(&buf)
@@ -115,7 +115,7 @@ func (ps *PluginStore) String() string {
 		}
 	}
 
-	// The tail must be indented in the same format as head.
+	// The tail must be indented in the same format as head directive
 	ps.setWhitespaces(parentPrefixWhitespaces)
 	ps.processTail(&buf)
 
@@ -126,7 +126,7 @@ func (ps *PluginStore) setWhitespaces(curentWhitespaces string) {
 	ps.PrefixWhitespaces = curentWhitespaces
 }
 
-// processes head, i.e: <match xx>
+// write the head directive to buffer, i.e.: <match xx>
 func (ps *PluginStore) processHead(buf *bytes.Buffer) {
 	var head string
 	switch PluginName(ps.Name) {
@@ -173,11 +173,12 @@ func (ps *PluginStore) processBody(buf *bytes.Buffer) {
 	buf.WriteString(body)
 }
 
-// processes the tail
+// write the tail directive to the buffer, i.e.: </match>
 func (ps *PluginStore) processTail(buf *bytes.Buffer) {
 	buf.WriteString(fmt.Sprintf("%s</%s>\n", ps.PrefixWhitespaces, ps.Name))
 }
 
+// decide to return the head directive with our without a filter - <match> or <match xx>
 func (ps *PluginStore) headFmtSprintf(value string) string {
 	if value != "" {
 		return fmt.Sprintf("%s<%s %s>\n", ps.PrefixWhitespaces, ps.Name, value)
diff --git a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
index abc90a530..4720d5b6e 100644
--- a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
@@ -694,6 +694,16 @@ func (in *FluentdSpec) DeepCopyInto(out *FluentdSpec) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
+	if in.DefaultFilterSelector != nil {
+		in, out := &in.DefaultFilterSelector, &out.DefaultFilterSelector
+		*out = new(v1.LabelSelector)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.DefaultOutputSelector != nil {
+		in, out := &in.DefaultOutputSelector, &out.DefaultOutputSelector
+		*out = new(v1.LabelSelector)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.Replicas != nil {
 		in, out := &in.Replicas, &out.Replicas
 		*out = new(int32)
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
index a7a7e0188..952415f70 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
@@ -1262,6 +1262,98 @@ spec:
                         type: object
                     type: object
                 type: object
+              defaultFilterSelector:
+                description: Select cluster filter plugins used to filter for the
+                  default cluster output
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: A label selector requirement is a selector that
+                        contains values, a key, and an operator that relates the key
+                        and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: operator represents a key's relationship to
+                            a set of values. Valid operators are In, NotIn, Exists
+                            and DoesNotExist.
+                          type: string
+                        values:
+                          description: values is an array of string values. If the
+                            operator is In or NotIn, the values array must be non-empty.
+                            If the operator is Exists or DoesNotExist, the values
+                            array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: matchLabels is a map of {key,value} pairs. A single
+                      {key,value} in the matchLabels map is equivalent to an element
+                      of matchExpressions, whose key field is "key", the operator
+                      is "In", and the values array contains only "value". The requirements
+                      are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              defaultOutputSelector:
+                description: Select cluster output plugins used to send all logs that
+                  did not match a route to the matching outputs
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: A label selector requirement is a selector that
+                        contains values, a key, and an operator that relates the key
+                        and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: operator represents a key's relationship to
+                            a set of values. Valid operators are In, NotIn, Exists
+                            and DoesNotExist.
+                          type: string
+                        values:
+                          description: values is an array of string values. If the
+                            operator is In or NotIn, the values array must be non-empty.
+                            If the operator is Exists or DoesNotExist, the values
+                            array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: matchLabels is a map of {key,value} pairs. A single
+                      {key,value} in the matchLabels map is equivalent to an element
+                      of matchExpressions, whose key field is "key", the operator
+                      is "In", and the values array contains only "value". The requirements
+                      are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
               disableService:
                 description: By default will build the related service according to
                   the globalinputs definition.
diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
index a7a7e0188..952415f70 100644
--- a/config/crd/bases/fluentd.fluent.io_fluentds.yaml
+++ b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
@@ -1262,6 +1262,98 @@ spec:
                         type: object
                     type: object
                 type: object
+              defaultFilterSelector:
+                description: Select cluster filter plugins used to filter for the
+                  default cluster output
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: A label selector requirement is a selector that
+                        contains values, a key, and an operator that relates the key
+                        and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: operator represents a key's relationship to
+                            a set of values. Valid operators are In, NotIn, Exists
+                            and DoesNotExist.
+                          type: string
+                        values:
+                          description: values is an array of string values. If the
+                            operator is In or NotIn, the values array must be non-empty.
+                            If the operator is Exists or DoesNotExist, the values
+                            array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: matchLabels is a map of {key,value} pairs. A single
+                      {key,value} in the matchLabels map is equivalent to an element
+                      of matchExpressions, whose key field is "key", the operator
+                      is "In", and the values array contains only "value". The requirements
+                      are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              defaultOutputSelector:
+                description: Select cluster output plugins used to send all logs that
+                  did not match a route to the matching outputs
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: A label selector requirement is a selector that
+                        contains values, a key, and an operator that relates the key
+                        and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: operator represents a key's relationship to
+                            a set of values. Valid operators are In, NotIn, Exists
+                            and DoesNotExist.
+                          type: string
+                        values:
+                          description: values is an array of string values. If the
+                            operator is In or NotIn, the values array must be non-empty.
+                            If the operator is Exists or DoesNotExist, the values
+                            array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: matchLabels is a map of {key,value} pairs. A single
+                      {key,value} in the matchLabels map is equivalent to an element
+                      of matchExpressions, whose key field is "key", the operator
+                      is "In", and the values array contains only "value". The requirements
+                      are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
               disableService:
                 description: By default will build the related service according to
                   the globalinputs definition.
diff --git a/controllers/fluentdconfig_controller.go b/controllers/fluentdconfig_controller.go
index d452baabf..a8e19c451 100644
--- a/controllers/fluentdconfig_controller.go
+++ b/controllers/fluentdconfig_controller.go
@@ -104,7 +104,7 @@ func (r *FluentdConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	_ = r.Log.WithValues("fluentdconfig", req.NamespacedName)
 
 	var fluentdList fluentdv1alpha1.FluentdList
-	// List all fluentd instances to bind the generated runtime configuration to each fluentd.
+	// List all fluentd instances to bind the generated runtime configuration to each fluentd
 	if err := r.List(ctx, &fluentdList); err != nil {
 		if errors.IsNotFound(err) {
 			r.Log.Info("can not find fluentd CR definition.")
@@ -113,29 +113,54 @@ func (r *FluentdConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		return ctrl.Result{}, err
 	}
 
+	// Loop over all Fluentd CRs
 	for _, fd := range fluentdList.Items {
 		// Get the config selector in this fluentd instance
 		fdSelector, err := metav1.LabelSelectorAsSelector(&fd.Spec.FluentdCfgSelector)
 		if err != nil {
-			// Patch this fluentd instance if the selectors exsit errors
+			// Patch this fluentd instance if the selectors exit with errors
 			if err := r.PatchObjects(ctx, &fd, fluentdv1alpha1.InactiveState, err.Error()); err != nil {
 				return ctrl.Result{}, err
 			}
 
 			continue
 		}
-
-		// A secret loader supports LoadSecret method to parse the targeted secret.
+		// A secret loader supports LoadSecret method to parse the targeted secret
 		sl := plugins.NewSecretLoader(r.Client, fd.Namespace, r.Log)
 
 		// gpr acts as a global resource to store the related plugin resources
 		gpr := fluentdv1alpha1.NewGlobalPluginResources("main")
 
 		// Each cluster/namespace scope fluentd configs will generate their own filters/outputs plugins with their own cfgId/cfgLabel,
-		// and they will finally be combined into one fluentd config file.
+		// and they will finally be combined into one fluentd config file
 		gpr.CombineGlobalInputsPlugins(sl, fd.Spec.GlobalInputs)
 
-		// globalCfgLabels stores cfgLabels, the same cfg label is not allowed.
+		// Default Output and filter
+		// list all namespaced CRs
+		filters, outputs, err := r.ListNamespacedLevelResources(ctx, fd.Namespace, fd.Spec.DefaultFilterSelector, fd.Spec.DefaultOutputSelector)
+		if err != nil {
+			r.Log.Info("List namespace level resources failed", "config", "default", "err", err.Error())
+			return ctrl.Result{}, err
+		}
+		if len(filters) > 0 || len(outputs) > 0 {
+			// Combine the namespaced filter/output pluginstores in this fluentd config
+			cfgResouces, errs := gpr.PatchAndFilterNamespacedLevelResources(sl, fmt.Sprintf("%s-%s-%s", fd.Kind, fd.Namespace, fd.Name), filters, outputs)
+			if len(errs) > 0 {
+				r.Log.Info("Patch and filter namespace level resources failed", "config", "default", "err", strings.Join(errs, ","))
+				return ctrl.Result{}, fmt.Errorf(strings.Join(errs, ","))
+			}
+
+			// WithCfgResources will collect all plugins to generate main config
+			err = gpr.WithCfgResources("@default", cfgResouces)
+			if err != nil {
+				r.Log.Info("Combine resources failed", "config", "default", "err", err.Error())
+				return ctrl.Result{}, err
+			}
+			// Add the default route to the main routing plugin
+			gpr.MainRouterPlugins.InsertPairs("default_route", "@default")
+		}
+
+		// globalCfgLabels stores cfgLabels, the same cfg label is not allowed
 		globalCfgLabels := make(map[string]bool)
 
 		// Combine the resources matching the FluentdClusterConfigs selector into gpr
@@ -152,7 +177,7 @@ func (r *FluentdConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 
 		// Combine the resources matching the FluentdConfigs selector into gpr
 		var cfgs fluentdv1alpha1.FluentdConfigList
-		// Use fluentd selector to match the cluster config.
+		// Use fluentd selector to match the cluster config
 		if err := r.List(ctx, &cfgs, client.MatchingLabelsSelector{Selector: fdSelector}); err != nil {
 			if !errors.IsNotFound(err) {
 				return ctrl.Result{}, err
@@ -180,7 +205,7 @@ func (r *FluentdConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 				workers = *fd.Spec.Workers
 			}
 
-			// Create or update the secret of the fluentd instance in its namespace.
+			// Create or update the secret of the fluentd instance in its namespace
 			mainAppCfg, err = gpr.RenderMainConfig(bool(workers > 1))
 			if err != nil {
 				return ctrl.Result{}, err
@@ -205,7 +230,7 @@ func (r *FluentdConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 				FluentdSecretSystemKey: []byte(systemCfg),
 				FluentdSecretLogKey:    []byte(FLUENTD_LOG),
 			}
-			// The current fd owns the namespaced secret.
+			// The current fd owns the namespaced secret
 			sec.SetOwnerReferences(nil)
 			if err := ctrl.SetControllerReference(&fd, sec, r.Scheme); err != nil {
 				return err
@@ -223,12 +248,16 @@ func (r *FluentdConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 
 // ClusterCfgsForFluentd combines all cluster cfgs selected by this fd
 func (r *FluentdConfigReconciler) ClusterCfgsForFluentd(
-	ctx context.Context, clustercfgs fluentdv1alpha1.ClusterFluentdConfigList, sl plugins.SecretLoader, gpr *fluentdv1alpha1.PluginResources,
-	globalCfgLabels map[string]bool) error {
+	ctx context.Context,
+	clustercfgs fluentdv1alpha1.ClusterFluentdConfigList,
+	sl plugins.SecretLoader,
+	gpr *fluentdv1alpha1.PluginResources,
+	globalCfgLabels map[string]bool,
+) error {
 
 	for _, cfg := range clustercfgs.Items {
 
-		// Build the inner router for this cfg.
+		// Build the inner router for this cfg and append it to the MainRouter
 		// Each cfg is a workflow.
 		cfgRouter, err := gpr.BuildCfgRouter(&cfg)
 		if err != nil {
@@ -239,8 +268,9 @@ func (r *FluentdConfigReconciler) ClusterCfgsForFluentd(
 
 			continue
 		}
-
+		// Set the route label which was calculated by a sub function of BuildCfgRoute
 		cfgRouterLabel := fmt.Sprint(*cfgRouter.Label)
+
 		if err := r.registerCfgLabel(cfgRouterLabel, globalCfgLabels); err != nil {
 			r.Log.Info("Register fluentd config label failed", "config", cfg.Name, "err", err.Error())
 			if err = r.PatchObjects(ctx, &cfg, fluentdv1alpha1.InvalidState, err.Error()); err != nil {
@@ -251,7 +281,7 @@ func (r *FluentdConfigReconciler) ClusterCfgsForFluentd(
 		}
 
 		// list all cluster CRs
-		clusterfilters, clusteroutputs, err := r.ListClusterLevelResources(ctx, cfg.GetCfgId(), cfg.Spec.ClusterFilterSelector, cfg.Spec.ClusterOutputSelector)
+		clusterfilters, clusteroutputs, err := r.ListClusterLevelResources(ctx, cfg.Spec.ClusterFilterSelector, cfg.Spec.ClusterOutputSelector)
 		if err != nil {
 			r.Log.Info("List cluster level resources failed", "config", cfg.Name, "err", err.Error())
 			if err = r.PatchObjects(ctx, &cfg, fluentdv1alpha1.InvalidState, err.Error()); err != nil {
@@ -261,10 +291,10 @@ func (r *FluentdConfigReconciler) ClusterCfgsForFluentd(
 			continue
 		}
 
-		// Combine the filter/output pluginstores in this fluentd config.
+		// Combine the filter/output pluginstores in this fluentd config
 		cfgResouces, errs := gpr.PatchAndFilterClusterLevelResources(sl, cfg.GetCfgId(), clusterfilters, clusteroutputs)
 		if len(errs) > 0 {
-			r.Log.Info("Patch and filter cluster level resources failed", "config", cfg.Name, "err", err.Error())
+			r.Log.Info("Patch and filter cluster level resources failed", "config", cfg.Name, "err", strings.Join(errs, ","))
 			if err = r.PatchObjects(ctx, &cfg, fluentdv1alpha1.InvalidState, strings.Join(errs, ", ")); err != nil {
 				return err
 			}
@@ -272,7 +302,7 @@ func (r *FluentdConfigReconciler) ClusterCfgsForFluentd(
 			continue
 		}
 
-		// WithCfgResources will collect all plugins to generate main config.
+		// WithCfgResources will collect all plugins to generate main config
 		var msg string
 		err = gpr.WithCfgResources(cfgRouterLabel, cfgResouces)
 		if err != nil {
@@ -295,7 +325,7 @@ func (r *FluentdConfigReconciler) CfgsForFluentd(ctx context.Context, cfgs fluen
 	gpr *fluentdv1alpha1.PluginResources, globalCfgLabels map[string]bool) error {
 
 	for _, cfg := range cfgs.Items {
-		// build the inner router for this cfg.
+		// Build the inner router for this cfg and append it to the MainRouter
 		cfgRouter, err := gpr.BuildCfgRouter(&cfg)
 		if err != nil {
 			r.Log.Info("Build router failed", "config", cfg.Name, "err", err.Error())
@@ -306,7 +336,7 @@ func (r *FluentdConfigReconciler) CfgsForFluentd(ctx context.Context, cfgs fluen
 			continue
 		}
 
-		// register routeLabel, the same routelabel is not allowed.
+		// register routeLabel and fail if it is already present
 		cfgRouterLabel := fmt.Sprint(*cfgRouter.Label)
 		if err := r.registerCfgLabel(cfgRouterLabel, globalCfgLabels); err != nil {
 			r.Log.Info("Register fluentd config label failed", "config", cfg.Name, "err", err.Error())
@@ -318,7 +348,7 @@ func (r *FluentdConfigReconciler) CfgsForFluentd(ctx context.Context, cfgs fluen
 		}
 
 		// list all cluster CRs
-		clusterfilters, clusteroutputs, err := r.ListClusterLevelResources(ctx, cfg.GetCfgId(), cfg.Spec.ClusterFilterSelector, cfg.Spec.ClusterOutputSelector)
+		clusterfilters, clusteroutputs, err := r.ListClusterLevelResources(ctx, cfg.Spec.ClusterFilterSelector, cfg.Spec.ClusterOutputSelector)
 		if err != nil {
 			r.Log.Info("List cluster level resources failed", "config", cfg.Name, "err", err.Error())
 			if err = r.PatchObjects(ctx, &cfg, fluentdv1alpha1.InvalidState, err.Error()); err != nil {
@@ -329,7 +359,7 @@ func (r *FluentdConfigReconciler) CfgsForFluentd(ctx context.Context, cfgs fluen
 		}
 
 		// list all namespaced CRs
-		filters, outputs, err := r.ListNamespacedLevelResources(ctx, cfg.Namespace, cfg.GetCfgId(), cfg.Spec.FilterSelector, cfg.Spec.OutputSelector)
+		filters, outputs, err := r.ListNamespacedLevelResources(ctx, cfg.Namespace, cfg.Spec.FilterSelector, cfg.Spec.OutputSelector)
 		if err != nil {
 			r.Log.Info("List namespace level resources failed", "config", cfg.Name, "err", err.Error())
 			if err = r.PatchObjects(ctx, &cfg, fluentdv1alpha1.InvalidState, err.Error()); err != nil {
@@ -339,10 +369,10 @@ func (r *FluentdConfigReconciler) CfgsForFluentd(ctx context.Context, cfgs fluen
 			continue
 		}
 
-		// Combine the cluster filter/output pluginstores in this fluentd config.
+		// Combine the cluster filter/output pluginstores in this fluentd config
 		clustercfgResouces, errs := gpr.PatchAndFilterClusterLevelResources(sl, cfg.GetCfgId(), clusterfilters, clusteroutputs)
 		if len(errs) > 0 {
-			r.Log.Info("Patch and filter cluster level resources failed", "config", cfg.Name, "err", err.Error())
+			r.Log.Info("Patch and filter cluster level resources failed", "config", cfg.Name, "err", strings.Join(errs, ","))
 			if err = r.PatchObjects(ctx, &cfg, fluentdv1alpha1.InvalidState, strings.Join(errs, ", ")); err != nil {
 				return err
 			}
@@ -350,10 +380,10 @@ func (r *FluentdConfigReconciler) CfgsForFluentd(ctx context.Context, cfgs fluen
 			continue
 		}
 
-		// Combine the namespaced filter/output pluginstores in this fluentd config.
+		// Combine the namespaced filter/output pluginstores in this fluentd config
 		cfgResouces, errs := gpr.PatchAndFilterNamespacedLevelResources(sl, cfg.GetCfgId(), filters, outputs)
 		if len(errs) > 0 {
-			r.Log.Info("Patch and filter namespace level resources failed", "config", cfg.Name, "err", err.Error())
+			r.Log.Info("Patch and filter namespace level resources failed", "config", cfg.Name, "err", strings.Join(errs, ","))
 			if err = r.PatchObjects(ctx, &cfg, fluentdv1alpha1.InvalidState, strings.Join(errs, ", ")); err != nil {
 				return err
 			}
@@ -364,7 +394,7 @@ func (r *FluentdConfigReconciler) CfgsForFluentd(ctx context.Context, cfgs fluen
 		cfgResouces.FilterPlugins = append(cfgResouces.FilterPlugins, clustercfgResouces.FilterPlugins...)
 		cfgResouces.OutputPlugins = append(cfgResouces.OutputPlugins, clustercfgResouces.OutputPlugins...)
 
-		// WithCfgResources will collect all plugins to generate main config.
+		// WithCfgResources will collect all plugins to generate main config
 		var msg string
 		err = gpr.WithCfgResources(cfgRouterLabel, cfgResouces)
 		if err != nil {
@@ -383,7 +413,9 @@ func (r *FluentdConfigReconciler) CfgsForFluentd(ctx context.Context, cfgs fluen
 }
 
 func (r *FluentdConfigReconciler) CheckAllState(
-	cfgs fluentdv1alpha1.FluentdConfigList, clustercfgs fluentdv1alpha1.ClusterFluentdConfigList) (fluentdv1alpha1.StatusState, string) {
+	cfgs fluentdv1alpha1.FluentdConfigList,
+	clustercfgs fluentdv1alpha1.ClusterFluentdConfigList,
+) (fluentdv1alpha1.StatusState, string) {
 	invalidCfgIds := make([]string, 0, len(cfgs.Items)+len(cfgs.Items))
 
 	for _, cfg := range cfgs.Items {
@@ -412,18 +444,22 @@ func (r *FluentdConfigReconciler) CheckAllState(
 // registerCfgLabel registers a cfglabel for this clustercfg/cfg
 func (r *FluentdConfigReconciler) registerCfgLabel(cfgLabel string, globalCfgLabels map[string]bool) error {
 	// cfgRouterLabel contains the important information for this cfg.
+	// check if the calculated cfgLabel is already present
 	if ok := globalCfgLabels[cfgLabel]; ok {
 		return fmt.Errorf("the current configuration already exists: %s", cfgLabel)
 	}
 
-	// register the cfg labels, the same cfg labels is not allowed.
+	// register the cfg labels, the same cfg labels is not allowed
 	globalCfgLabels[cfgLabel] = true
 	return nil
 }
 
-func (r *FluentdConfigReconciler) ListClusterLevelResources(ctx context.Context, cfgId string,
-	filterSelector, outputSelector *metav1.LabelSelector) ([]fluentdv1alpha1.ClusterFilter, []fluentdv1alpha1.ClusterOutput, error) {
-	// List all filters matching the label selector.
+func (r *FluentdConfigReconciler) ListClusterLevelResources(
+	ctx context.Context,
+	filterSelector,
+	outputSelector *metav1.LabelSelector,
+) ([]fluentdv1alpha1.ClusterFilter, []fluentdv1alpha1.ClusterOutput, error) {
+	// List all filters matching the label selector
 	var clusterfilters fluentdv1alpha1.ClusterFilterList
 	if filterSelector != nil {
 		selector, err := metav1.LabelSelectorAsSelector(filterSelector)
@@ -435,7 +471,7 @@ func (r *FluentdConfigReconciler) ListClusterLevelResources(ctx context.Context,
 		}
 	}
 
-	// List all outputs matching the label selector.
+	// List all outputs matching the label selector
 	var clusteroutputs fluentdv1alpha1.ClusterOutputList
 	if outputSelector != nil {
 		selector, err := metav1.LabelSelectorAsSelector(outputSelector)
@@ -449,8 +485,12 @@ func (r *FluentdConfigReconciler) ListClusterLevelResources(ctx context.Context,
 	return clusterfilters.Items, clusteroutputs.Items, nil
 }
 
-func (r *FluentdConfigReconciler) ListNamespacedLevelResources(ctx context.Context, namespace, cfgId string,
-	filterSelector, outputSelector *metav1.LabelSelector) ([]fluentdv1alpha1.Filter, []fluentdv1alpha1.Output, error) {
+func (r *FluentdConfigReconciler) ListNamespacedLevelResources(
+	ctx context.Context,
+	namespace string,
+	filterSelector,
+	outputSelector *metav1.LabelSelector,
+) ([]fluentdv1alpha1.Filter, []fluentdv1alpha1.Output, error) {
 	// List and patch the related cluster CRs
 	var filters fluentdv1alpha1.FilterList
 	if filterSelector != nil {
@@ -463,7 +503,7 @@ func (r *FluentdConfigReconciler) ListNamespacedLevelResources(ctx context.Conte
 		}
 	}
 
-	// List all outputs matching the label selector.
+	// List all outputs matching the label selector
 	var outputs fluentdv1alpha1.OutputList
 	if outputSelector != nil {
 		selector, err := metav1.LabelSelectorAsSelector(outputSelector)
@@ -505,16 +545,16 @@ func (r *FluentdConfigReconciler) PatchObjects(ctx context.Context, obj client.O
 	return nil
 }
 
-// SetupWithManager sets up the controller with the Manager.
+// SetupWithManager sets up the controller with the Manager
 func (r *FluentdConfigReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	if err := mgr.GetFieldIndexer().IndexField(context.Background(), &corev1.ServiceAccount{}, fluentdOwnerKey, func(rawObj client.Object) []string {
-		// grab the job object, extract the owner.
+		// grab the job object, extract the owner
 		sa := rawObj.(*corev1.ServiceAccount)
 		owner := metav1.GetControllerOf(sa)
 		if owner == nil {
 			return nil
 		}
-		// Make sure it's a Fluentd. If so, return it.
+		// Make sure it's a Fluentd. If so, return it
 		if owner.APIVersion != fluentdApiGVStr || owner.Kind != "Fluentd" {
 			return nil
 		}
diff --git a/docs/fluentd.md b/docs/fluentd.md
index 13cfb127b..298825f92 100644
--- a/docs/fluentd.md
+++ b/docs/fluentd.md
@@ -286,6 +286,8 @@ FluentdSpec defines the desired state of Fluentd
 | Field | Description | Scheme |
 | ----- | ----------- | ------ |
 | globalInputs | Fluentd global inputs. | [][[input.Input](plugins/input/input.md)](plugins/[input/input](plugins/input/input/md).md) |
+| defaultFilterSelector | Select cluster filter plugins used to filter for the default cluster output | *[metav1.LabelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#labelselector-v1-meta) |
+| defaultOutputSelector | Select cluster output plugins used to send all logs that did not match a route to the matching outputs | *[metav1.LabelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#labelselector-v1-meta) |
 | disableService | By default will build the related service according to the globalinputs definition. | bool |
 | replicas | Numbers of the Fluentd instance | *int32 |
 | workers | Numbers of the workers in Fluentd instance | *int32 |
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index 407b30eef..e81dec557 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -19214,6 +19214,98 @@ spec:
                         type: object
                     type: object
                 type: object
+              defaultFilterSelector:
+                description: Select cluster filter plugins used to filter for the
+                  default cluster output
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: A label selector requirement is a selector that
+                        contains values, a key, and an operator that relates the key
+                        and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: operator represents a key's relationship to
+                            a set of values. Valid operators are In, NotIn, Exists
+                            and DoesNotExist.
+                          type: string
+                        values:
+                          description: values is an array of string values. If the
+                            operator is In or NotIn, the values array must be non-empty.
+                            If the operator is Exists or DoesNotExist, the values
+                            array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: matchLabels is a map of {key,value} pairs. A single
+                      {key,value} in the matchLabels map is equivalent to an element
+                      of matchExpressions, whose key field is "key", the operator
+                      is "In", and the values array contains only "value". The requirements
+                      are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              defaultOutputSelector:
+                description: Select cluster output plugins used to send all logs that
+                  did not match a route to the matching outputs
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: A label selector requirement is a selector that
+                        contains values, a key, and an operator that relates the key
+                        and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: operator represents a key's relationship to
+                            a set of values. Valid operators are In, NotIn, Exists
+                            and DoesNotExist.
+                          type: string
+                        values:
+                          description: values is an array of string values. If the
+                            operator is In or NotIn, the values array must be non-empty.
+                            If the operator is Exists or DoesNotExist, the values
+                            array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: matchLabels is a map of {key,value} pairs. A single
+                      {key,value} in the matchLabels map is equivalent to an element
+                      of matchExpressions, whose key field is "key", the operator
+                      is "In", and the values array contains only "value". The requirements
+                      are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
               disableService:
                 description: By default will build the related service according to
                   the globalinputs definition.
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index 6e7ddb21f..b9a5ae3b5 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -19214,6 +19214,98 @@ spec:
                         type: object
                     type: object
                 type: object
+              defaultFilterSelector:
+                description: Select cluster filter plugins used to filter for the
+                  default cluster output
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: A label selector requirement is a selector that
+                        contains values, a key, and an operator that relates the key
+                        and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: operator represents a key's relationship to
+                            a set of values. Valid operators are In, NotIn, Exists
+                            and DoesNotExist.
+                          type: string
+                        values:
+                          description: values is an array of string values. If the
+                            operator is In or NotIn, the values array must be non-empty.
+                            If the operator is Exists or DoesNotExist, the values
+                            array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: matchLabels is a map of {key,value} pairs. A single
+                      {key,value} in the matchLabels map is equivalent to an element
+                      of matchExpressions, whose key field is "key", the operator
+                      is "In", and the values array contains only "value". The requirements
+                      are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
+              defaultOutputSelector:
+                description: Select cluster output plugins used to send all logs that
+                  did not match a route to the matching outputs
+                properties:
+                  matchExpressions:
+                    description: matchExpressions is a list of label selector requirements.
+                      The requirements are ANDed.
+                    items:
+                      description: A label selector requirement is a selector that
+                        contains values, a key, and an operator that relates the key
+                        and values.
+                      properties:
+                        key:
+                          description: key is the label key that the selector applies
+                            to.
+                          type: string
+                        operator:
+                          description: operator represents a key's relationship to
+                            a set of values. Valid operators are In, NotIn, Exists
+                            and DoesNotExist.
+                          type: string
+                        values:
+                          description: values is an array of string values. If the
+                            operator is In or NotIn, the values array must be non-empty.
+                            If the operator is Exists or DoesNotExist, the values
+                            array must be empty. This array is replaced during a strategic
+                            merge patch.
+                          items:
+                            type: string
+                          type: array
+                      required:
+                      - key
+                      - operator
+                      type: object
+                    type: array
+                  matchLabels:
+                    additionalProperties:
+                      type: string
+                    description: matchLabels is a map of {key,value} pairs. A single
+                      {key,value} in the matchLabels map is equivalent to an element
+                      of matchExpressions, whose key field is "key", the operator
+                      is "In", and the values array contains only "value". The requirements
+                      are ANDed.
+                    type: object
+                type: object
+                x-kubernetes-map-type: atomic
               disableService:
                 description: By default will build the related service according to
                   the globalinputs definition.

From df4f02eafb229a7e3fb0b7fabfcd86a5612b5d33 Mon Sep 17 00:00:00 2001
From: Gyorgy Nadaban <gyorgy.nadaban@gmail.com>
Date: Thu, 29 Jun 2023 11:37:39 -0400
Subject: [PATCH 61/78] Specify init container resources for fluent-operator
 deployment

Signed-off-by: Gyorgy Nadaban <gyorgy.nadaban@gmail.com>
---
 .../templates/fluent-operator-deployment.yaml    |  6 ++++++
 charts/fluent-operator/values.yaml               | 16 ++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/charts/fluent-operator/templates/fluent-operator-deployment.yaml b/charts/fluent-operator/templates/fluent-operator-deployment.yaml
index d8cc8b3c5..68eaafbf5 100644
--- a/charts/fluent-operator/templates/fluent-operator-deployment.yaml
+++ b/charts/fluent-operator/templates/fluent-operator-deployment.yaml
@@ -40,6 +40,8 @@ spec:
         - '-c'
         - set -ex;
           echo CONTAINER_ROOT_DIR=$(docker info -f '{{`{{.DockerRootDir}}`}}' 2> /dev/null) > /fluent-operator/fluent-bit.env
+        resources:
+          {{- toYaml .Values.operator.initcontainer.resources | nindent 10 }}
         volumeMounts:
         - name: env
           mountPath: /fluent-operator
@@ -58,6 +60,8 @@ spec:
         - '-c'
         - set -ex;
           echo CONTAINER_ROOT_DIR={{ .Values.operator.logPath.containerd }} > /fluent-operator/fluent-bit.env
+        resources:
+          {{- toYaml .Values.operator.initcontainer.resources | nindent 10 }}
         volumeMounts:
         - name: env
           mountPath: /fluent-operator
@@ -73,6 +77,8 @@ spec:
         - '-c'
         - set -ex;
           echo CONTAINER_ROOT_DIR={{ .Values.operator.logPath.crio }} > /fluent-operator/fluent-bit.env
+        resources:
+          {{- toYaml .Values.operator.initcontainer.resources | nindent 10 }}
         volumeMounts:
         - name: env
           mountPath: /fluent-operator
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 6d6128c3e..c3bfe88f8 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -14,6 +14,14 @@ operator:
   initcontainer:
     repository: "docker"
     tag: "20.10"
+
+    resources:
+      limits:
+        cpu: 100m
+        memory: 64Mi
+      requests:
+        cpu: 50m
+        memory: 64Mi
   container:
     repository: "kubesphere/fluent-operator"
     tag: "latest"
@@ -108,8 +116,8 @@ fluentbit:
   # nodeSelector configuration for Fluent Bit pods. Ref: https://kubernetes.io/docs/user-guide/node-selection/
   nodeSelector: {}
   # Node tolerations applied to Fluent Bit pods. Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-  tolerations: 
-  - operator: Exists
+  tolerations:
+    - operator: Exists
   # Priority Class applied to Fluent Bit pods. Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass
   priorityClassName: ""
   # Environment variables that can be passed to fluentbit pods
@@ -224,9 +232,9 @@ fluentbit:
   kubeedge:
     enable: false
     prometheusRemoteWrite:
-    # Change the host to the address of a cloud-side Prometheus-compatible server that can receive Prometheus remote write data
+      # Change the host to the address of a cloud-side Prometheus-compatible server that can receive Prometheus remote write data
       host: "<cloud-prometheus-service-host>"
-    # Change the port to the port of a cloud-side Prometheus-compatible server that can receive Prometheus remote write data
+      # Change the port to the port of a cloud-side Prometheus-compatible server that can receive Prometheus remote write data
       port: "<cloud-prometheus-service-port>"
 
 fluentd:

From 96d504ed111d592f0aa6ace1aab6d786db573e38 Mon Sep 17 00:00:00 2001
From: Kaio Cunha <kaio.cunha@al.infnet.edu.br>
Date: Fri, 30 Jun 2023 16:35:42 -0300
Subject: [PATCH 62/78] Update fluentd base Dockerfile

Setting fluent-plugin-opensearch to v1.1.0. Version v1.1.1 is broken.

Signed-off-by: Kaio Cunha <kaio.cunha@al.infnet.edu.br>
---
 cmd/fluent-watcher/fluentd/base/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/fluent-watcher/fluentd/base/Dockerfile b/cmd/fluent-watcher/fluentd/base/Dockerfile
index 7c497ff44..3961f71a1 100644
--- a/cmd/fluent-watcher/fluentd/base/Dockerfile
+++ b/cmd/fluent-watcher/fluentd/base/Dockerfile
@@ -29,6 +29,7 @@ RUN apk update \
  && gem install elasticsearch -v 7.13.3 \
  && gem install elasticsearch-xpack -v 7.13.3 \
  && gem install fluent-plugin-detect-exceptions -v 0.0.14 \
+ && gem install fluent-plugin-opensearch -v 1.1.0 \
  && gem install \
          fluent-plugin-s3 \
          fluent-plugin-rewrite-tag-filter \
@@ -40,7 +41,6 @@ RUN apk update \
          fluent-plugin-record-modifier \
          fluent-plugin-multi-format-parser \
          fluent-plugin-aws-elasticsearch-service \
-         fluent-plugin-opensearch \
          fluent-plugin-grafana-loki \
  && apk del .build-deps \
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test

From cbbe43814c0cdec69a9130a96afec6fb9923e2f4 Mon Sep 17 00:00:00 2001
From: Sergey Kacheev <s.kacheev@gmail.com>
Date: Mon, 3 Jul 2023 14:25:42 +0700
Subject: [PATCH 63/78] fix: plugins document index

Signed-off-by: Sergey Kacheev <s.kacheev@gmail.com>
---
 docs/plugins/fluentbit/index.md | 70 ++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/docs/plugins/fluentbit/index.md b/docs/plugins/fluentbit/index.md
index a31dfdc51..c6bdcabb7 100644
--- a/docs/plugins/fluentbit/index.md
+++ b/docs/plugins/fluentbit/index.md
@@ -1,40 +1,40 @@
 - [ClusterInput](../../fluentbit.md#ClusterInput)
-  - [dummy](clusterinput/dummy.md)
-  - [tail](clusterinput/tail.md)
-  - [systemd](clusterinput/systemd.md)
-  - [node exporter metrics](clusterinput/node-exporter-metrics.md)
-  - [fluentbit metrics](clusterinput/fluentbit-metrics.md)
-  - [prometheus scrape metrics](clusterinput/prometheus-scrape-metrics.md)
+  - [dummy](input/dummy.md)
+  - [tail](input/tail.md)
+  - [systemd](input/systemd.md)
+  - [node exporter metrics](input/node-exporter-metrics.md)
+  - [fluentbit metrics](input/fluentbit-metrics.md)
+  - [prometheus scrape metrics](input/prometheus-scrape-metrics.md)
 - [ClusterParser](../../fluentbit.md#ClusterParser)
-  - [json](clusterparser/json.md)
-  - [logfmt](clusterparser/logfmt.md)
-  - [lstv](clusterparser/lstv.md)
-  - [regex](clusterparser/regex.md)
+  - [json](parser/json.md)
+  - [logfmt](parser/logfmt.md)
+  - [lstv](parser/lstv.md)
+  - [regex](parser/regex.md)
 - [ClusterFilter](../../fluentbit.md#ClusterFilter)
-  - [kubernetes](clusterfilter/kubernetes.md)
-  - [modify](clusterfilter/modify.md)
-  - [nest](clusterfilter/nest.md)
-  - [parser](clusterfilter/parser.md)
-  - [grep](clusterfilter/grep.md)
-  - [record modifier](clusterfilter/recordmodifier.md)
-  - [lua](clusterfilter/lua.md)
-  - [throttle](clusterfilter/throttle.md)
-  - [aws](clusterfilter/aws.md)
-  - [multiline](clusterfilter/multiline.md)
+  - [kubernetes](filter/kubernetes.md)
+  - [modify](filter/modify.md)
+  - [nest](filter/nest.md)
+  - [parser](filter/parser.md)
+  - [grep](filter/grep.md)
+  - [record modifier](filter/recordmodifier.md)
+  - [lua](filter/lua.md)
+  - [throttle](filter/throttle.md)
+  - [aws](filter/aws.md)
+  - [multiline](filter/multiline.md)
 - [ClusterOutput](../../fluentbit.md#ClusterOutput)
-  - [elasticsearch](clusteroutput/elasticsearch.md)
-  - [file](clusteroutput/file.md)
-  - [forward](clusteroutput/forward.md)
-  - [http](clusteroutput/http.md)
-  - [kafka](clusteroutput/kafka.md)
-  - [null](clusteroutput/null.md)
-  - [stdout](clusteroutput/stdout.md)
-  - [tcp](clusteroutput/tcp.md)
-  - [loki](clusteroutput/loki.md)
-  - [syslog](clusteroutput/syslog.md)
-  - [datadog](clusteroutput/datadog.md)
-  - [firehose](clusteroutput/firehose.md)
-  - [opensearch](clusteroutput/opensearch.md)
-  - [opentelemetry](clusteroutput/opentelemetry.md)
-  - [prometheus remote write](clusteroutput/prometheus-remote-write.md)
+  - [elasticsearch](output/elasticsearch.md)
+  - [file](output/file.md)
+  - [forward](output/forward.md)
+  - [http](output/http.md)
+  - [kafka](output/kafka.md)
+  - [null](output/null.md)
+  - [stdout](output/stdout.md)
+  - [tcp](output/tcp.md)
+  - [loki](output/loki.md)
+  - [syslog](output/syslog.md)
+  - [datadog](output/datadog.md)
+  - [firehose](output/firehose.md)
+  - [opensearch](output/opensearch.md)
+  - [opentelemetry](output/opentelemetry.md)
+  - [prometheus remote write](output/prometheus-remote-write.md)
 

From 7564fa6f55823e33e9d36ebdcc673a9ae54036f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gre=CC=81gory=20Cuellar?= <gregory.cuellar@gmail.com>
Date: Fri, 30 Jun 2023 11:59:50 +0200
Subject: [PATCH 64/78] add S3 output plugin for Fluent Bit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Grégory Cuellar <gregory.cuellar@gmail.com>
---
 .../fluentbit/v1alpha2/clusteroutput_types.go |   2 +
 .../v1alpha2/plugins/output/s3_types.go       | 157 ++++++++++++
 .../v1alpha2/plugins/output/s3_types_test.go  |  77 ++++++
 .../plugins/output/zz_generated.deepcopy.go   |  45 ++++
 .../v1alpha2/zz_generated.deepcopy.go         |   5 +
 .../fluentbit.fluent.io_clusteroutputs.yaml   | 114 +++++++++
 .../crds/fluentbit.fluent.io_outputs.yaml     | 114 +++++++++
 .../fluentbit.fluent.io_clusteroutputs.yaml   | 114 +++++++++
 .../bases/fluentbit.fluent.io_outputs.yaml    | 114 +++++++++
 docs/fluentbit.md                             |   1 +
 docs/plugins/fluentbit/output/s3.md           |  33 +++
 manifests/setup/fluent-operator-crd.yaml      | 228 ++++++++++++++++++
 manifests/setup/setup.yaml                    | 228 ++++++++++++++++++
 13 files changed, 1232 insertions(+)
 create mode 100644 apis/fluentbit/v1alpha2/plugins/output/s3_types.go
 create mode 100644 apis/fluentbit/v1alpha2/plugins/output/s3_types_test.go
 create mode 100644 docs/plugins/fluentbit/output/s3.md

diff --git a/apis/fluentbit/v1alpha2/clusteroutput_types.go b/apis/fluentbit/v1alpha2/clusteroutput_types.go
index efb97292b..b1e78f448 100644
--- a/apis/fluentbit/v1alpha2/clusteroutput_types.go
+++ b/apis/fluentbit/v1alpha2/clusteroutput_types.go
@@ -94,6 +94,8 @@ type OutputSpec struct {
 	OpenTelemetry *output.OpenTelemetry `json:"opentelemetry,omitempty"`
 	// PrometheusRemoteWrite_types defines Prometheus Remote Write configuration.
 	PrometheusRemoteWrite *output.PrometheusRemoteWrite `json:"prometheusRemoteWrite,omitempty"`
+	// S3 defines S3 Output configuration.
+	S3 *output.S3 `json:"s3,omitempty"`
 
 	// CustomPlugin defines Custom Output configuration.
 	CustomPlugin *custom.CustomPlugin `json:"customPlugin,omitempty"`
diff --git a/apis/fluentbit/v1alpha2/plugins/output/s3_types.go b/apis/fluentbit/v1alpha2/plugins/output/s3_types.go
new file mode 100644
index 000000000..063499b30
--- /dev/null
+++ b/apis/fluentbit/v1alpha2/plugins/output/s3_types.go
@@ -0,0 +1,157 @@
+package output
+
+import (
+	"fmt"
+
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins"
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params"
+)
+
+// +kubebuilder:object:generate:=true
+
+// The S3 output plugin, allows to flush your records into a S3 time series database. <br />
+// **For full documentation, refer to https://docs.fluentbit.io/manual/pipeline/outputs/s3**
+type S3 struct {
+	// The AWS region of your S3 bucket
+	Region string `json:"Region"`
+	// S3 Bucket name
+	Bucket string `json:"Bucket"`
+	// Specify the name of the time key in the output record. To disable the time key just set the value to false.
+	JsonDateKey string `json:"JsonDateKey,omitempty"`
+	// Specify the format of the date. Supported formats are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z) and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)
+	JsonDateFormat string `json:"JsonDateFormat,omitempty"`
+	// Specifies the size of files in S3. Minimum size is 1M. With use_put_object On the maximum size is 1G. With multipart upload mode, the maximum size is 50G.
+	TotalFileSize string `json:"TotalFileSize,omitempty"`
+	// The size of each 'part' for multipart uploads. Max: 50M
+	UploadChunkSize string `json:"UploadChunkSize,omitempty"`
+	// Whenever this amount of time has elapsed, Fluent Bit will complete an upload and create a new file in S3. For example, set this value to 60m and you will get a new file every hour.
+	UploadTimeout string `json:"UploadTimeout,omitempty"`
+	// Directory to locally buffer data before sending.
+	StoreDir string `json:"StoreDir,omitempty"`
+	// The size of the limitation for disk usage in S3.
+	StoreDirLimitSize string `json:"StoreDirLimitSize,omitempty"`
+	// Format string for keys in S3.
+	S3KeyFormat string `json:"S3KeyFormat,omitempty"`
+	// A series of characters which will be used to split the tag into 'parts' for use with the s3_key_format option.
+	S3KeyFormatTagDelimiters string `json:"S3KeyFormatTagDelimiters,omitempty"`
+	// Disables behavior where UUID string is automatically appended to end of S3 key name when $UUID is not provided in s3_key_format. $UUID, time formatters, $TAG, and other dynamic key formatters all work as expected while this feature is set to true.
+	StaticFilePath *bool `json:"StaticFilePath,omitempty"`
+	// Use the S3 PutObject API, instead of the multipart upload API.
+	UsePutObject *bool `json:"UsePutObject,omitempty"`
+	// ARN of an IAM role to assume
+	RoleArn string `json:"RoleArn,omitempty"`
+	// Custom endpoint for the S3 API.
+	Endpoint string `json:"Endpoint,omitempty"`
+	// Custom endpoint for the STS API.
+	StsEndpoint string `json:"StsEndpoint,omitempty"`
+	// Predefined Canned ACL Policy for S3 objects.
+	CannedAcl string `json:"CannedAcl,omitempty"`
+	// Compression type for S3 objects.
+	Compression string `json:"Compression,omitempty"`
+	// A standard MIME type for the S3 object; this will be set as the Content-Type HTTP header.
+	ContentType string `json:"ContentType,omitempty"`
+	// Send the Content-MD5 header with PutObject and UploadPart requests, as is required when Object Lock is enabled.
+	SendContentMd5 *bool `json:"SendContentMd5,omitempty"`
+	// Immediately retry failed requests to AWS services once.
+	AutoRetryRequests *bool `json:"AutoRetryRequests,omitempty"`
+	// By default, the whole log record will be sent to S3. If you specify a key name with this option, then only the value of that key will be sent to S3.
+	LogKey string `json:"LogKey,omitempty"`
+	// Normally, when an upload request fails, there is a high chance for the last received chunk to be swapped with a later chunk, resulting in data shuffling. This feature prevents this shuffling by using a queue logic for uploads.
+	PreserveDataOrdering *bool `json:"PreserveDataOrdering,omitempty"`
+	// Specify the storage class for S3 objects. If this option is not specified, objects will be stored with the default 'STANDARD' storage class.
+	StorageClass string `json:"StorageClass,omitempty"`
+	// Integer value to set the maximum number of retries allowed.
+	RetryLimit *int32 `json:"RetryLimit,omitempty"`
+	// Specify an external ID for the STS API, can be used with the role_arn parameter if your role requires an external ID.
+	ExternalId string `json:"ExternalId,omitempty"`
+}
+
+// Name implement Section() method
+func (_ *S3) Name() string {
+	return "s3"
+}
+
+func (o *S3) Params(sl plugins.SecretLoader) (*params.KVs, error) {
+	kvs := params.NewKVs()
+	// S3 Validation
+
+	if o.Region != "" {
+		kvs.Insert("region", o.Region)
+	}
+	if o.Bucket != "" {
+		kvs.Insert("bucket", o.Bucket)
+	}
+	if o.JsonDateKey != "" {
+		kvs.Insert("json_date_key", o.JsonDateKey)
+	}
+	if o.JsonDateFormat != "" {
+		kvs.Insert("json_date_format", o.JsonDateFormat)
+	}
+	if o.TotalFileSize != "" {
+		kvs.Insert("total_file_size", o.TotalFileSize)
+	}
+	if o.UploadChunkSize != "" {
+		kvs.Insert("upload_chunk_size", o.UploadChunkSize)
+	}
+	if o.UploadTimeout != "" {
+		kvs.Insert("upload_timeout", o.UploadTimeout)
+	}
+	if o.StoreDir != "" {
+		kvs.Insert("store_dir", o.StoreDir)
+	}
+	if o.StoreDirLimitSize != "" {
+		kvs.Insert("store_dir_limit_size", o.StoreDirLimitSize)
+	}
+	if o.S3KeyFormat != "" {
+		kvs.Insert("s3_key_format", o.S3KeyFormat)
+	}
+	if o.S3KeyFormatTagDelimiters != "" {
+		kvs.Insert("s3_key_format_tag_delimiters", o.S3KeyFormatTagDelimiters)
+	}
+	if o.StaticFilePath != nil {
+		kvs.Insert("static_file_path", fmt.Sprint(*o.StaticFilePath))
+	}
+	if o.UsePutObject != nil {
+		kvs.Insert("use_put_object", fmt.Sprint(*o.UsePutObject))
+	}
+	if o.RoleArn != "" {
+		kvs.Insert("role_arn", o.RoleArn)
+	}
+	if o.Endpoint != "" {
+		kvs.Insert("endpoint", o.Endpoint)
+	}
+	if o.StsEndpoint != "" {
+		kvs.Insert("sts_endpoint", o.StsEndpoint)
+	}
+	if o.CannedAcl != "" {
+		kvs.Insert("canned_acl", o.CannedAcl)
+	}
+	if o.Compression != "" {
+		kvs.Insert("compression", o.Compression)
+	}
+	if o.ContentType != "" {
+		kvs.Insert("content_type", o.ContentType)
+	}
+	if o.SendContentMd5 != nil {
+		kvs.Insert("send_content_md5", fmt.Sprint(*o.SendContentMd5))
+	}
+	if o.AutoRetryRequests != nil {
+		kvs.Insert("auto_retry_requests", fmt.Sprint(*o.AutoRetryRequests))
+	}
+	if o.LogKey != "" {
+		kvs.Insert("log_key", o.LogKey)
+	}
+	if o.PreserveDataOrdering != nil {
+		kvs.Insert("preserve_data_ordering", fmt.Sprint(*o.PreserveDataOrdering))
+	}
+	if o.StorageClass != "" {
+		kvs.Insert("storage_class", o.StorageClass)
+	}
+	if o.RetryLimit != nil {
+		kvs.Insert("retry_limit", fmt.Sprint(*o.RetryLimit))
+	}
+	if o.ExternalId != "" {
+		kvs.Insert("external_id", o.ExternalId)
+	}
+	return kvs, nil
+}
diff --git a/apis/fluentbit/v1alpha2/plugins/output/s3_types_test.go b/apis/fluentbit/v1alpha2/plugins/output/s3_types_test.go
new file mode 100644
index 000000000..39b622d7d
--- /dev/null
+++ b/apis/fluentbit/v1alpha2/plugins/output/s3_types_test.go
@@ -0,0 +1,77 @@
+package output
+
+import (
+	"testing"
+
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins"
+	"github.com/fluent/fluent-operator/v2/apis/fluentbit/v1alpha2/plugins/params"
+	. "github.com/onsi/gomega"
+)
+
+func TestOutput_S3_Params(t *testing.T) {
+	g := NewGomegaWithT(t)
+
+	sl := plugins.NewSecretLoader(nil, "test namespace")
+
+	s3 := S3{
+		Region:                   "us-east-1",
+		Bucket:                   "fluentbit",
+		JsonDateKey:              "2018-05-30T09:39:52.000681Z",
+		JsonDateFormat:           "iso8601",
+		TotalFileSize:            "100M",
+		UploadChunkSize:          "50M",
+		UploadTimeout:            "10m",
+		StoreDir:                 "/tmp/fluent-bit/s3",
+		StoreDirLimitSize:        "0",
+		S3KeyFormat:              "/fluent-bit-logs/$TAG/%Y/%m/%d/%H/%M/%S",
+		S3KeyFormatTagDelimiters: ".",
+		StaticFilePath:           ptrAny(false),
+		UsePutObject:             ptrAny(false),
+		RoleArn:                  "role",
+		Endpoint:                 "endpoint",
+		StsEndpoint:              "sts_endpoint",
+		CannedAcl:                "canned_acl",
+		Compression:              "gzip",
+		ContentType:              "text/plain",
+		SendContentMd5:           ptrAny(false),
+		AutoRetryRequests:        ptrAny(true),
+		LogKey:                   "log_key",
+		PreserveDataOrdering:     ptrAny(true),
+		StorageClass:             "storage_class",
+		RetryLimit:               ptrAny(int32(1)),
+		ExternalId:               "external_id",
+	}
+
+	expected := params.NewKVs()
+	expected.Insert("region", "us-east-1")
+	expected.Insert("bucket", "fluentbit")
+	expected.Insert("json_date_key", "2018-05-30T09:39:52.000681Z")
+	expected.Insert("json_date_format", "iso8601")
+	expected.Insert("total_file_size", "100M")
+	expected.Insert("upload_chunk_size", "50M")
+	expected.Insert("upload_timeout", "10m")
+	expected.Insert("store_dir", "/tmp/fluent-bit/s3")
+	expected.Insert("store_dir_limit_size", "0")
+	expected.Insert("s3_key_format", "/fluent-bit-logs/$TAG/%Y/%m/%d/%H/%M/%S")
+	expected.Insert("s3_key_format_tag_delimiters", ".")
+	expected.Insert("static_file_path", "false")
+	expected.Insert("use_put_object", "false")
+	expected.Insert("role_arn", "role")
+	expected.Insert("endpoint", "endpoint")
+	expected.Insert("sts_endpoint", "sts_endpoint")
+	expected.Insert("canned_acl", "canned_acl")
+	expected.Insert("compression", "gzip")
+	expected.Insert("content_type", "text/plain")
+	expected.Insert("send_content_md5", "false")
+	expected.Insert("auto_retry_requests", "true")
+	expected.Insert("log_key", "log_key")
+	expected.Insert("preserve_data_ordering", "true")
+	expected.Insert("storage_class", "storage_class")
+	expected.Insert("retry_limit", "1")
+	expected.Insert("external_id", "external_id")
+
+	kvs, err := s3.Params(sl)
+	g.Expect(err).NotTo(HaveOccurred())
+	g.Expect(kvs).To(Equal(expected))
+
+}
diff --git a/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
index 784e4bca0..574f4bf02 100644
--- a/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
+++ b/apis/fluentbit/v1alpha2/plugins/output/zz_generated.deepcopy.go
@@ -767,6 +767,51 @@ func (in *PrometheusRemoteWrite) DeepCopy() *PrometheusRemoteWrite {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *S3) DeepCopyInto(out *S3) {
+	*out = *in
+	if in.StaticFilePath != nil {
+		in, out := &in.StaticFilePath, &out.StaticFilePath
+		*out = new(bool)
+		**out = **in
+	}
+	if in.UsePutObject != nil {
+		in, out := &in.UsePutObject, &out.UsePutObject
+		*out = new(bool)
+		**out = **in
+	}
+	if in.SendContentMd5 != nil {
+		in, out := &in.SendContentMd5, &out.SendContentMd5
+		*out = new(bool)
+		**out = **in
+	}
+	if in.AutoRetryRequests != nil {
+		in, out := &in.AutoRetryRequests, &out.AutoRetryRequests
+		*out = new(bool)
+		**out = **in
+	}
+	if in.PreserveDataOrdering != nil {
+		in, out := &in.PreserveDataOrdering, &out.PreserveDataOrdering
+		*out = new(bool)
+		**out = **in
+	}
+	if in.RetryLimit != nil {
+		in, out := &in.RetryLimit, &out.RetryLimit
+		*out = new(int32)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new S3.
+func (in *S3) DeepCopy() *S3 {
+	if in == nil {
+		return nil
+	}
+	out := new(S3)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Splunk) DeepCopyInto(out *Splunk) {
 	*out = *in
diff --git a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
index 6754d69c9..4ba987718 100644
--- a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
+++ b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
@@ -1333,6 +1333,11 @@ func (in *OutputSpec) DeepCopyInto(out *OutputSpec) {
 		*out = new(output.PrometheusRemoteWrite)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.S3 != nil {
+		in, out := &in.S3, &out.S3
+		*out = new(output.S3)
+		(*in).DeepCopyInto(*out)
+	}
 	if in.CustomPlugin != nil {
 		in, out := &in.CustomPlugin, &out.CustomPlugin
 		*out = new(custom.CustomPlugin)
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
index addb6cd28..ee10b9518 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
@@ -2211,6 +2211,120 @@ spec:
                   allows to disable retries or impose a limit to try N times and then
                   discard the data after reaching that limit.
                 type: string
+              s3:
+                description: S3 defines S3 Output configuration.
+                properties:
+                  auto_retry_requests:
+                    description: Immediately retry failed requests to AWS services
+                      once.
+                    type: boolean
+                  bucket:
+                    description: S3 Bucket name
+                    type: string
+                  canned_acl:
+                    description: Predefined Canned ACL Policy for S3 objects.
+                    type: string
+                  compression:
+                    description: Compression type for S3 objects.
+                    type: string
+                  content_type:
+                    description: A standard MIME type for the S3 object; this will
+                      be set as the Content-Type HTTP header.
+                    type: string
+                  endpoint:
+                    description: Custom endpoint for the S3 API.
+                    type: string
+                  external_id:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  json_date_format:
+                    description: 'Specify the format of the date. Supported formats
+                      are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
+                      and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
+                    type: string
+                  json_date_key:
+                    description: Specify the name of the time key in the output record.
+                      To disable the time key just set the value to false.
+                    type: string
+                  log_key:
+                    description: By default, the whole log record will be sent to
+                      S3. If you specify a key name with this option, then only the
+                      value of that key will be sent to S3.
+                    type: string
+                  preserve_data_ordering:
+                    description: Normally, when an upload request fails, there is
+                      a high chance for the last received chunk to be swapped with
+                      a later chunk, resulting in data shuffling. This feature prevents
+                      this shuffling by using a queue logic for uploads.
+                    type: boolean
+                  region:
+                    description: The AWS region of your S3 bucket
+                    type: string
+                  retry_limit:
+                    description: Integer value to set the maximum number of retries
+                      allowed.
+                    format: int32
+                    type: integer
+                  role_arn:
+                    description: ARN of an IAM role to assume
+                    type: string
+                  s3_key_format:
+                    description: Format string for keys in S3.
+                    type: string
+                  s3_key_format_tag_delimiters:
+                    description: A series of characters which will be used to split
+                      the tag into 'parts' for use with the s3_key_format option.
+                    type: string
+                  send_content_md5:
+                    description: Send the Content-MD5 header with PutObject and UploadPart
+                      requests, as is required when Object Lock is enabled.
+                    type: boolean
+                  static_file_path:
+                    description: Disables behavior where UUID string is automatically
+                      appended to end of S3 key name when $UUID is not provided in
+                      s3_key_format. $UUID, time formatters, $TAG, and other dynamic
+                      key formatters all work as expected while this feature is set
+                      to true.
+                    type: boolean
+                  storage_class:
+                    description: Specify the storage class for S3 objects. If this
+                      option is not specified, objects will be stored with the default
+                      'STANDARD' storage class.
+                    type: string
+                  store_dir:
+                    description: Directory to locally buffer data before sending.
+                    type: string
+                  store_dir_limit_size:
+                    description: The size of the limitation for disk usage in S3.
+                    type: string
+                  sts_endpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  total_file_size:
+                    description: Specifies the size of files in S3. Minimum size is
+                      1M. With use_put_object On the maximum size is 1G. With multipart
+                      upload mode, the maximum size is 50G.
+                    type: string
+                  upload_chunk_size:
+                    description: 'The size of each ''part'' for multipart uploads.
+                      Max: 50M'
+                    type: string
+                  upload_timeout:
+                    description: Whenever this amount of time has elapsed, Fluent
+                      Bit will complete an upload and create a new file in S3. For
+                      example, set this value to 60m and you will get a new file every
+                      hour.
+                    type: string
+                  use_put_object:
+                    description: Use the S3 PutObject API, instead of the multipart
+                      upload API.
+                    type: boolean
+                required:
+                - bucket
+                - region
+                type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
                 properties:
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
index f431dc7f4..9b52e800c 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
@@ -2211,6 +2211,120 @@ spec:
                   allows to disable retries or impose a limit to try N times and then
                   discard the data after reaching that limit.
                 type: string
+              s3:
+                description: S3 defines S3 Output configuration.
+                properties:
+                  auto_retry_requests:
+                    description: Immediately retry failed requests to AWS services
+                      once.
+                    type: boolean
+                  bucket:
+                    description: S3 Bucket name
+                    type: string
+                  canned_acl:
+                    description: Predefined Canned ACL Policy for S3 objects.
+                    type: string
+                  compression:
+                    description: Compression type for S3 objects.
+                    type: string
+                  content_type:
+                    description: A standard MIME type for the S3 object; this will
+                      be set as the Content-Type HTTP header.
+                    type: string
+                  endpoint:
+                    description: Custom endpoint for the S3 API.
+                    type: string
+                  external_id:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  json_date_format:
+                    description: 'Specify the format of the date. Supported formats
+                      are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
+                      and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
+                    type: string
+                  json_date_key:
+                    description: Specify the name of the time key in the output record.
+                      To disable the time key just set the value to false.
+                    type: string
+                  log_key:
+                    description: By default, the whole log record will be sent to
+                      S3. If you specify a key name with this option, then only the
+                      value of that key will be sent to S3.
+                    type: string
+                  preserve_data_ordering:
+                    description: Normally, when an upload request fails, there is
+                      a high chance for the last received chunk to be swapped with
+                      a later chunk, resulting in data shuffling. This feature prevents
+                      this shuffling by using a queue logic for uploads.
+                    type: boolean
+                  region:
+                    description: The AWS region of your S3 bucket
+                    type: string
+                  retry_limit:
+                    description: Integer value to set the maximum number of retries
+                      allowed.
+                    format: int32
+                    type: integer
+                  role_arn:
+                    description: ARN of an IAM role to assume
+                    type: string
+                  s3_key_format:
+                    description: Format string for keys in S3.
+                    type: string
+                  s3_key_format_tag_delimiters:
+                    description: A series of characters which will be used to split
+                      the tag into 'parts' for use with the s3_key_format option.
+                    type: string
+                  send_content_md5:
+                    description: Send the Content-MD5 header with PutObject and UploadPart
+                      requests, as is required when Object Lock is enabled.
+                    type: boolean
+                  static_file_path:
+                    description: Disables behavior where UUID string is automatically
+                      appended to end of S3 key name when $UUID is not provided in
+                      s3_key_format. $UUID, time formatters, $TAG, and other dynamic
+                      key formatters all work as expected while this feature is set
+                      to true.
+                    type: boolean
+                  storage_class:
+                    description: Specify the storage class for S3 objects. If this
+                      option is not specified, objects will be stored with the default
+                      'STANDARD' storage class.
+                    type: string
+                  store_dir:
+                    description: Directory to locally buffer data before sending.
+                    type: string
+                  store_dir_limit_size:
+                    description: The size of the limitation for disk usage in S3.
+                    type: string
+                  sts_endpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  total_file_size:
+                    description: Specifies the size of files in S3. Minimum size is
+                      1M. With use_put_object On the maximum size is 1G. With multipart
+                      upload mode, the maximum size is 50G.
+                    type: string
+                  upload_chunk_size:
+                    description: 'The size of each ''part'' for multipart uploads.
+                      Max: 50M'
+                    type: string
+                  upload_timeout:
+                    description: Whenever this amount of time has elapsed, Fluent
+                      Bit will complete an upload and create a new file in S3. For
+                      example, set this value to 60m and you will get a new file every
+                      hour.
+                    type: string
+                  use_put_object:
+                    description: Use the S3 PutObject API, instead of the multipart
+                      upload API.
+                    type: boolean
+                required:
+                - bucket
+                - region
+                type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
                 properties:
diff --git a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
index addb6cd28..ee10b9518 100644
--- a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
@@ -2211,6 +2211,120 @@ spec:
                   allows to disable retries or impose a limit to try N times and then
                   discard the data after reaching that limit.
                 type: string
+              s3:
+                description: S3 defines S3 Output configuration.
+                properties:
+                  auto_retry_requests:
+                    description: Immediately retry failed requests to AWS services
+                      once.
+                    type: boolean
+                  bucket:
+                    description: S3 Bucket name
+                    type: string
+                  canned_acl:
+                    description: Predefined Canned ACL Policy for S3 objects.
+                    type: string
+                  compression:
+                    description: Compression type for S3 objects.
+                    type: string
+                  content_type:
+                    description: A standard MIME type for the S3 object; this will
+                      be set as the Content-Type HTTP header.
+                    type: string
+                  endpoint:
+                    description: Custom endpoint for the S3 API.
+                    type: string
+                  external_id:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  json_date_format:
+                    description: 'Specify the format of the date. Supported formats
+                      are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
+                      and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
+                    type: string
+                  json_date_key:
+                    description: Specify the name of the time key in the output record.
+                      To disable the time key just set the value to false.
+                    type: string
+                  log_key:
+                    description: By default, the whole log record will be sent to
+                      S3. If you specify a key name with this option, then only the
+                      value of that key will be sent to S3.
+                    type: string
+                  preserve_data_ordering:
+                    description: Normally, when an upload request fails, there is
+                      a high chance for the last received chunk to be swapped with
+                      a later chunk, resulting in data shuffling. This feature prevents
+                      this shuffling by using a queue logic for uploads.
+                    type: boolean
+                  region:
+                    description: The AWS region of your S3 bucket
+                    type: string
+                  retry_limit:
+                    description: Integer value to set the maximum number of retries
+                      allowed.
+                    format: int32
+                    type: integer
+                  role_arn:
+                    description: ARN of an IAM role to assume
+                    type: string
+                  s3_key_format:
+                    description: Format string for keys in S3.
+                    type: string
+                  s3_key_format_tag_delimiters:
+                    description: A series of characters which will be used to split
+                      the tag into 'parts' for use with the s3_key_format option.
+                    type: string
+                  send_content_md5:
+                    description: Send the Content-MD5 header with PutObject and UploadPart
+                      requests, as is required when Object Lock is enabled.
+                    type: boolean
+                  static_file_path:
+                    description: Disables behavior where UUID string is automatically
+                      appended to end of S3 key name when $UUID is not provided in
+                      s3_key_format. $UUID, time formatters, $TAG, and other dynamic
+                      key formatters all work as expected while this feature is set
+                      to true.
+                    type: boolean
+                  storage_class:
+                    description: Specify the storage class for S3 objects. If this
+                      option is not specified, objects will be stored with the default
+                      'STANDARD' storage class.
+                    type: string
+                  store_dir:
+                    description: Directory to locally buffer data before sending.
+                    type: string
+                  store_dir_limit_size:
+                    description: The size of the limitation for disk usage in S3.
+                    type: string
+                  sts_endpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  total_file_size:
+                    description: Specifies the size of files in S3. Minimum size is
+                      1M. With use_put_object On the maximum size is 1G. With multipart
+                      upload mode, the maximum size is 50G.
+                    type: string
+                  upload_chunk_size:
+                    description: 'The size of each ''part'' for multipart uploads.
+                      Max: 50M'
+                    type: string
+                  upload_timeout:
+                    description: Whenever this amount of time has elapsed, Fluent
+                      Bit will complete an upload and create a new file in S3. For
+                      example, set this value to 60m and you will get a new file every
+                      hour.
+                    type: string
+                  use_put_object:
+                    description: Use the S3 PutObject API, instead of the multipart
+                      upload API.
+                    type: boolean
+                required:
+                - bucket
+                - region
+                type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
                 properties:
diff --git a/config/crd/bases/fluentbit.fluent.io_outputs.yaml b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
index f431dc7f4..9b52e800c 100644
--- a/config/crd/bases/fluentbit.fluent.io_outputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
@@ -2211,6 +2211,120 @@ spec:
                   allows to disable retries or impose a limit to try N times and then
                   discard the data after reaching that limit.
                 type: string
+              s3:
+                description: S3 defines S3 Output configuration.
+                properties:
+                  auto_retry_requests:
+                    description: Immediately retry failed requests to AWS services
+                      once.
+                    type: boolean
+                  bucket:
+                    description: S3 Bucket name
+                    type: string
+                  canned_acl:
+                    description: Predefined Canned ACL Policy for S3 objects.
+                    type: string
+                  compression:
+                    description: Compression type for S3 objects.
+                    type: string
+                  content_type:
+                    description: A standard MIME type for the S3 object; this will
+                      be set as the Content-Type HTTP header.
+                    type: string
+                  endpoint:
+                    description: Custom endpoint for the S3 API.
+                    type: string
+                  external_id:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  json_date_format:
+                    description: 'Specify the format of the date. Supported formats
+                      are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
+                      and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
+                    type: string
+                  json_date_key:
+                    description: Specify the name of the time key in the output record.
+                      To disable the time key just set the value to false.
+                    type: string
+                  log_key:
+                    description: By default, the whole log record will be sent to
+                      S3. If you specify a key name with this option, then only the
+                      value of that key will be sent to S3.
+                    type: string
+                  preserve_data_ordering:
+                    description: Normally, when an upload request fails, there is
+                      a high chance for the last received chunk to be swapped with
+                      a later chunk, resulting in data shuffling. This feature prevents
+                      this shuffling by using a queue logic for uploads.
+                    type: boolean
+                  region:
+                    description: The AWS region of your S3 bucket
+                    type: string
+                  retry_limit:
+                    description: Integer value to set the maximum number of retries
+                      allowed.
+                    format: int32
+                    type: integer
+                  role_arn:
+                    description: ARN of an IAM role to assume
+                    type: string
+                  s3_key_format:
+                    description: Format string for keys in S3.
+                    type: string
+                  s3_key_format_tag_delimiters:
+                    description: A series of characters which will be used to split
+                      the tag into 'parts' for use with the s3_key_format option.
+                    type: string
+                  send_content_md5:
+                    description: Send the Content-MD5 header with PutObject and UploadPart
+                      requests, as is required when Object Lock is enabled.
+                    type: boolean
+                  static_file_path:
+                    description: Disables behavior where UUID string is automatically
+                      appended to end of S3 key name when $UUID is not provided in
+                      s3_key_format. $UUID, time formatters, $TAG, and other dynamic
+                      key formatters all work as expected while this feature is set
+                      to true.
+                    type: boolean
+                  storage_class:
+                    description: Specify the storage class for S3 objects. If this
+                      option is not specified, objects will be stored with the default
+                      'STANDARD' storage class.
+                    type: string
+                  store_dir:
+                    description: Directory to locally buffer data before sending.
+                    type: string
+                  store_dir_limit_size:
+                    description: The size of the limitation for disk usage in S3.
+                    type: string
+                  sts_endpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  total_file_size:
+                    description: Specifies the size of files in S3. Minimum size is
+                      1M. With use_put_object On the maximum size is 1G. With multipart
+                      upload mode, the maximum size is 50G.
+                    type: string
+                  upload_chunk_size:
+                    description: 'The size of each ''part'' for multipart uploads.
+                      Max: 50M'
+                    type: string
+                  upload_timeout:
+                    description: Whenever this amount of time has elapsed, Fluent
+                      Bit will complete an upload and create a new file in S3. For
+                      example, set this value to 60m and you will get a new file every
+                      hour.
+                    type: string
+                  use_put_object:
+                    description: Use the S3 PutObject API, instead of the multipart
+                      upload API.
+                    type: boolean
+                required:
+                - bucket
+                - region
+                type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
                 properties:
diff --git a/docs/fluentbit.md b/docs/fluentbit.md
index 7f75ee0e3..77addfd31 100644
--- a/docs/fluentbit.md
+++ b/docs/fluentbit.md
@@ -487,6 +487,7 @@ OutputSpec defines the desired state of ClusterOutput
 | opensearch | OpenSearch defines OpenSearch Output configuration. | *[output.OpenSearch](plugins/output/opensearch.md) |
 | opentelemetry | OpenTelemetry defines OpenTelemetry Output configuration. | *[output.OpenTelemetry](plugins/output/opentelemetry.md) |
 | prometheusRemoteWrite | PrometheusRemoteWrite_types defines Prometheus Remote Write configuration. | *[output.PrometheusRemoteWrite](plugins/output/prometheusremotewrite.md) |
+| s3 | S3 defines S3 Output configuration. | *[output.S3](plugins/output/s3.md) |
 | customPlugin | CustomPlugin defines Custom Output configuration. | *custom.CustomPlugin |
 
 [Back to TOC](#table-of-contents)
diff --git a/docs/plugins/fluentbit/output/s3.md b/docs/plugins/fluentbit/output/s3.md
new file mode 100644
index 000000000..c331eae14
--- /dev/null
+++ b/docs/plugins/fluentbit/output/s3.md
@@ -0,0 +1,33 @@
+# S3
+
+The S3 output plugin, allows to flush your records into a S3 time series database. <br /> **For full documentation, refer to https://docs.fluentbit.io/manual/pipeline/outputs/s3**
+
+
+| Field | Description | Scheme |
+| ----- | ----------- | ------ |
+| region | The AWS region of your S3 bucket | string |
+| bucket | S3 Bucket name | string |
+| json_date_key | Specify the name of the time key in the output record. To disable the time key just set the value to false. | string |
+| json_date_format | Specify the format of the date. Supported formats are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z) and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681) | string |
+| total_file_size | Specifies the size of files in S3. Minimum size is 1M. With use_put_object On the maximum size is 1G. With multipart upload mode, the maximum size is 50G. | string |
+| upload_chunk_size | The size of each 'part' for multipart uploads. Max: 50M | string |
+| upload_timeout | Whenever this amount of time has elapsed, Fluent Bit will complete an upload and create a new file in S3. For example, set this value to 60m and you will get a new file every hour. | string |
+| store_dir | Directory to locally buffer data before sending. | string |
+| store_dir_limit_size | The size of the limitation for disk usage in S3. | string |
+| s3_key_format | Format string for keys in S3. | string |
+| s3_key_format_tag_delimiters | A series of characters which will be used to split the tag into 'parts' for use with the s3_key_format option. | string |
+| static_file_path | Disables behavior where UUID string is automatically appended to end of S3 key name when $UUID is not provided in s3_key_format. $UUID, time formatters, $TAG, and other dynamic key formatters all work as expected while this feature is set to true. | *bool |
+| use_put_object | Use the S3 PutObject API, instead of the multipart upload API. | *bool |
+| role_arn | ARN of an IAM role to assume | string |
+| endpoint | Custom endpoint for the S3 API. | string |
+| sts_endpoint | Custom endpoint for the STS API. | string |
+| canned_acl | Predefined Canned ACL Policy for S3 objects. | string |
+| compression | Compression type for S3 objects. | string |
+| content_type | A standard MIME type for the S3 object; this will be set as the Content-Type HTTP header. | string |
+| send_content_md5 | Send the Content-MD5 header with PutObject and UploadPart requests, as is required when Object Lock is enabled. | *bool |
+| auto_retry_requests | Immediately retry failed requests to AWS services once. | *bool |
+| log_key | By default, the whole log record will be sent to S3. If you specify a key name with this option, then only the value of that key will be sent to S3. | string |
+| preserve_data_ordering | Normally, when an upload request fails, there is a high chance for the last received chunk to be swapped with a later chunk, resulting in data shuffling. This feature prevents this shuffling by using a queue logic for uploads. | *bool |
+| storage_class | Specify the storage class for S3 objects. If this option is not specified, objects will be stored with the default 'STANDARD' storage class. | string |
+| retry_limit | Integer value to set the maximum number of retries allowed. | *int32 |
+| external_id | Specify an external ID for the STS API, can be used with the role_arn parameter if your role requires an external ID. | string |
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index e81dec557..b681a0519 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -4224,6 +4224,120 @@ spec:
                   allows to disable retries or impose a limit to try N times and then
                   discard the data after reaching that limit.
                 type: string
+              s3:
+                description: S3 defines S3 Output configuration.
+                properties:
+                  auto_retry_requests:
+                    description: Immediately retry failed requests to AWS services
+                      once.
+                    type: boolean
+                  bucket:
+                    description: S3 Bucket name
+                    type: string
+                  canned_acl:
+                    description: Predefined Canned ACL Policy for S3 objects.
+                    type: string
+                  compression:
+                    description: Compression type for S3 objects.
+                    type: string
+                  content_type:
+                    description: A standard MIME type for the S3 object; this will
+                      be set as the Content-Type HTTP header.
+                    type: string
+                  endpoint:
+                    description: Custom endpoint for the S3 API.
+                    type: string
+                  external_id:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  json_date_format:
+                    description: 'Specify the format of the date. Supported formats
+                      are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
+                      and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
+                    type: string
+                  json_date_key:
+                    description: Specify the name of the time key in the output record.
+                      To disable the time key just set the value to false.
+                    type: string
+                  log_key:
+                    description: By default, the whole log record will be sent to
+                      S3. If you specify a key name with this option, then only the
+                      value of that key will be sent to S3.
+                    type: string
+                  preserve_data_ordering:
+                    description: Normally, when an upload request fails, there is
+                      a high chance for the last received chunk to be swapped with
+                      a later chunk, resulting in data shuffling. This feature prevents
+                      this shuffling by using a queue logic for uploads.
+                    type: boolean
+                  region:
+                    description: The AWS region of your S3 bucket
+                    type: string
+                  retry_limit:
+                    description: Integer value to set the maximum number of retries
+                      allowed.
+                    format: int32
+                    type: integer
+                  role_arn:
+                    description: ARN of an IAM role to assume
+                    type: string
+                  s3_key_format:
+                    description: Format string for keys in S3.
+                    type: string
+                  s3_key_format_tag_delimiters:
+                    description: A series of characters which will be used to split
+                      the tag into 'parts' for use with the s3_key_format option.
+                    type: string
+                  send_content_md5:
+                    description: Send the Content-MD5 header with PutObject and UploadPart
+                      requests, as is required when Object Lock is enabled.
+                    type: boolean
+                  static_file_path:
+                    description: Disables behavior where UUID string is automatically
+                      appended to end of S3 key name when $UUID is not provided in
+                      s3_key_format. $UUID, time formatters, $TAG, and other dynamic
+                      key formatters all work as expected while this feature is set
+                      to true.
+                    type: boolean
+                  storage_class:
+                    description: Specify the storage class for S3 objects. If this
+                      option is not specified, objects will be stored with the default
+                      'STANDARD' storage class.
+                    type: string
+                  store_dir:
+                    description: Directory to locally buffer data before sending.
+                    type: string
+                  store_dir_limit_size:
+                    description: The size of the limitation for disk usage in S3.
+                    type: string
+                  sts_endpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  total_file_size:
+                    description: Specifies the size of files in S3. Minimum size is
+                      1M. With use_put_object On the maximum size is 1G. With multipart
+                      upload mode, the maximum size is 50G.
+                    type: string
+                  upload_chunk_size:
+                    description: 'The size of each ''part'' for multipart uploads.
+                      Max: 50M'
+                    type: string
+                  upload_timeout:
+                    description: Whenever this amount of time has elapsed, Fluent
+                      Bit will complete an upload and create a new file in S3. For
+                      example, set this value to 60m and you will get a new file every
+                      hour.
+                    type: string
+                  use_put_object:
+                    description: Use the S3 PutObject API, instead of the multipart
+                      upload API.
+                    type: boolean
+                required:
+                - bucket
+                - region
+                type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
                 properties:
@@ -24739,6 +24853,120 @@ spec:
                   allows to disable retries or impose a limit to try N times and then
                   discard the data after reaching that limit.
                 type: string
+              s3:
+                description: S3 defines S3 Output configuration.
+                properties:
+                  auto_retry_requests:
+                    description: Immediately retry failed requests to AWS services
+                      once.
+                    type: boolean
+                  bucket:
+                    description: S3 Bucket name
+                    type: string
+                  canned_acl:
+                    description: Predefined Canned ACL Policy for S3 objects.
+                    type: string
+                  compression:
+                    description: Compression type for S3 objects.
+                    type: string
+                  content_type:
+                    description: A standard MIME type for the S3 object; this will
+                      be set as the Content-Type HTTP header.
+                    type: string
+                  endpoint:
+                    description: Custom endpoint for the S3 API.
+                    type: string
+                  external_id:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  json_date_format:
+                    description: 'Specify the format of the date. Supported formats
+                      are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
+                      and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
+                    type: string
+                  json_date_key:
+                    description: Specify the name of the time key in the output record.
+                      To disable the time key just set the value to false.
+                    type: string
+                  log_key:
+                    description: By default, the whole log record will be sent to
+                      S3. If you specify a key name with this option, then only the
+                      value of that key will be sent to S3.
+                    type: string
+                  preserve_data_ordering:
+                    description: Normally, when an upload request fails, there is
+                      a high chance for the last received chunk to be swapped with
+                      a later chunk, resulting in data shuffling. This feature prevents
+                      this shuffling by using a queue logic for uploads.
+                    type: boolean
+                  region:
+                    description: The AWS region of your S3 bucket
+                    type: string
+                  retry_limit:
+                    description: Integer value to set the maximum number of retries
+                      allowed.
+                    format: int32
+                    type: integer
+                  role_arn:
+                    description: ARN of an IAM role to assume
+                    type: string
+                  s3_key_format:
+                    description: Format string for keys in S3.
+                    type: string
+                  s3_key_format_tag_delimiters:
+                    description: A series of characters which will be used to split
+                      the tag into 'parts' for use with the s3_key_format option.
+                    type: string
+                  send_content_md5:
+                    description: Send the Content-MD5 header with PutObject and UploadPart
+                      requests, as is required when Object Lock is enabled.
+                    type: boolean
+                  static_file_path:
+                    description: Disables behavior where UUID string is automatically
+                      appended to end of S3 key name when $UUID is not provided in
+                      s3_key_format. $UUID, time formatters, $TAG, and other dynamic
+                      key formatters all work as expected while this feature is set
+                      to true.
+                    type: boolean
+                  storage_class:
+                    description: Specify the storage class for S3 objects. If this
+                      option is not specified, objects will be stored with the default
+                      'STANDARD' storage class.
+                    type: string
+                  store_dir:
+                    description: Directory to locally buffer data before sending.
+                    type: string
+                  store_dir_limit_size:
+                    description: The size of the limitation for disk usage in S3.
+                    type: string
+                  sts_endpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  total_file_size:
+                    description: Specifies the size of files in S3. Minimum size is
+                      1M. With use_put_object On the maximum size is 1G. With multipart
+                      upload mode, the maximum size is 50G.
+                    type: string
+                  upload_chunk_size:
+                    description: 'The size of each ''part'' for multipart uploads.
+                      Max: 50M'
+                    type: string
+                  upload_timeout:
+                    description: Whenever this amount of time has elapsed, Fluent
+                      Bit will complete an upload and create a new file in S3. For
+                      example, set this value to 60m and you will get a new file every
+                      hour.
+                    type: string
+                  use_put_object:
+                    description: Use the S3 PutObject API, instead of the multipart
+                      upload API.
+                    type: boolean
+                required:
+                - bucket
+                - region
+                type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
                 properties:
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index b9a5ae3b5..a51e4e9a8 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -4224,6 +4224,120 @@ spec:
                   allows to disable retries or impose a limit to try N times and then
                   discard the data after reaching that limit.
                 type: string
+              s3:
+                description: S3 defines S3 Output configuration.
+                properties:
+                  auto_retry_requests:
+                    description: Immediately retry failed requests to AWS services
+                      once.
+                    type: boolean
+                  bucket:
+                    description: S3 Bucket name
+                    type: string
+                  canned_acl:
+                    description: Predefined Canned ACL Policy for S3 objects.
+                    type: string
+                  compression:
+                    description: Compression type for S3 objects.
+                    type: string
+                  content_type:
+                    description: A standard MIME type for the S3 object; this will
+                      be set as the Content-Type HTTP header.
+                    type: string
+                  endpoint:
+                    description: Custom endpoint for the S3 API.
+                    type: string
+                  external_id:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  json_date_format:
+                    description: 'Specify the format of the date. Supported formats
+                      are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
+                      and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
+                    type: string
+                  json_date_key:
+                    description: Specify the name of the time key in the output record.
+                      To disable the time key just set the value to false.
+                    type: string
+                  log_key:
+                    description: By default, the whole log record will be sent to
+                      S3. If you specify a key name with this option, then only the
+                      value of that key will be sent to S3.
+                    type: string
+                  preserve_data_ordering:
+                    description: Normally, when an upload request fails, there is
+                      a high chance for the last received chunk to be swapped with
+                      a later chunk, resulting in data shuffling. This feature prevents
+                      this shuffling by using a queue logic for uploads.
+                    type: boolean
+                  region:
+                    description: The AWS region of your S3 bucket
+                    type: string
+                  retry_limit:
+                    description: Integer value to set the maximum number of retries
+                      allowed.
+                    format: int32
+                    type: integer
+                  role_arn:
+                    description: ARN of an IAM role to assume
+                    type: string
+                  s3_key_format:
+                    description: Format string for keys in S3.
+                    type: string
+                  s3_key_format_tag_delimiters:
+                    description: A series of characters which will be used to split
+                      the tag into 'parts' for use with the s3_key_format option.
+                    type: string
+                  send_content_md5:
+                    description: Send the Content-MD5 header with PutObject and UploadPart
+                      requests, as is required when Object Lock is enabled.
+                    type: boolean
+                  static_file_path:
+                    description: Disables behavior where UUID string is automatically
+                      appended to end of S3 key name when $UUID is not provided in
+                      s3_key_format. $UUID, time formatters, $TAG, and other dynamic
+                      key formatters all work as expected while this feature is set
+                      to true.
+                    type: boolean
+                  storage_class:
+                    description: Specify the storage class for S3 objects. If this
+                      option is not specified, objects will be stored with the default
+                      'STANDARD' storage class.
+                    type: string
+                  store_dir:
+                    description: Directory to locally buffer data before sending.
+                    type: string
+                  store_dir_limit_size:
+                    description: The size of the limitation for disk usage in S3.
+                    type: string
+                  sts_endpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  total_file_size:
+                    description: Specifies the size of files in S3. Minimum size is
+                      1M. With use_put_object On the maximum size is 1G. With multipart
+                      upload mode, the maximum size is 50G.
+                    type: string
+                  upload_chunk_size:
+                    description: 'The size of each ''part'' for multipart uploads.
+                      Max: 50M'
+                    type: string
+                  upload_timeout:
+                    description: Whenever this amount of time has elapsed, Fluent
+                      Bit will complete an upload and create a new file in S3. For
+                      example, set this value to 60m and you will get a new file every
+                      hour.
+                    type: string
+                  use_put_object:
+                    description: Use the S3 PutObject API, instead of the multipart
+                      upload API.
+                    type: boolean
+                required:
+                - bucket
+                - region
+                type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
                 properties:
@@ -24739,6 +24853,120 @@ spec:
                   allows to disable retries or impose a limit to try N times and then
                   discard the data after reaching that limit.
                 type: string
+              s3:
+                description: S3 defines S3 Output configuration.
+                properties:
+                  auto_retry_requests:
+                    description: Immediately retry failed requests to AWS services
+                      once.
+                    type: boolean
+                  bucket:
+                    description: S3 Bucket name
+                    type: string
+                  canned_acl:
+                    description: Predefined Canned ACL Policy for S3 objects.
+                    type: string
+                  compression:
+                    description: Compression type for S3 objects.
+                    type: string
+                  content_type:
+                    description: A standard MIME type for the S3 object; this will
+                      be set as the Content-Type HTTP header.
+                    type: string
+                  endpoint:
+                    description: Custom endpoint for the S3 API.
+                    type: string
+                  external_id:
+                    description: Specify an external ID for the STS API, can be used
+                      with the role_arn parameter if your role requires an external
+                      ID.
+                    type: string
+                  json_date_format:
+                    description: 'Specify the format of the date. Supported formats
+                      are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
+                      and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
+                    type: string
+                  json_date_key:
+                    description: Specify the name of the time key in the output record.
+                      To disable the time key just set the value to false.
+                    type: string
+                  log_key:
+                    description: By default, the whole log record will be sent to
+                      S3. If you specify a key name with this option, then only the
+                      value of that key will be sent to S3.
+                    type: string
+                  preserve_data_ordering:
+                    description: Normally, when an upload request fails, there is
+                      a high chance for the last received chunk to be swapped with
+                      a later chunk, resulting in data shuffling. This feature prevents
+                      this shuffling by using a queue logic for uploads.
+                    type: boolean
+                  region:
+                    description: The AWS region of your S3 bucket
+                    type: string
+                  retry_limit:
+                    description: Integer value to set the maximum number of retries
+                      allowed.
+                    format: int32
+                    type: integer
+                  role_arn:
+                    description: ARN of an IAM role to assume
+                    type: string
+                  s3_key_format:
+                    description: Format string for keys in S3.
+                    type: string
+                  s3_key_format_tag_delimiters:
+                    description: A series of characters which will be used to split
+                      the tag into 'parts' for use with the s3_key_format option.
+                    type: string
+                  send_content_md5:
+                    description: Send the Content-MD5 header with PutObject and UploadPart
+                      requests, as is required when Object Lock is enabled.
+                    type: boolean
+                  static_file_path:
+                    description: Disables behavior where UUID string is automatically
+                      appended to end of S3 key name when $UUID is not provided in
+                      s3_key_format. $UUID, time formatters, $TAG, and other dynamic
+                      key formatters all work as expected while this feature is set
+                      to true.
+                    type: boolean
+                  storage_class:
+                    description: Specify the storage class for S3 objects. If this
+                      option is not specified, objects will be stored with the default
+                      'STANDARD' storage class.
+                    type: string
+                  store_dir:
+                    description: Directory to locally buffer data before sending.
+                    type: string
+                  store_dir_limit_size:
+                    description: The size of the limitation for disk usage in S3.
+                    type: string
+                  sts_endpoint:
+                    description: Custom endpoint for the STS API.
+                    type: string
+                  total_file_size:
+                    description: Specifies the size of files in S3. Minimum size is
+                      1M. With use_put_object On the maximum size is 1G. With multipart
+                      upload mode, the maximum size is 50G.
+                    type: string
+                  upload_chunk_size:
+                    description: 'The size of each ''part'' for multipart uploads.
+                      Max: 50M'
+                    type: string
+                  upload_timeout:
+                    description: Whenever this amount of time has elapsed, Fluent
+                      Bit will complete an upload and create a new file in S3. For
+                      example, set this value to 60m and you will get a new file every
+                      hour.
+                    type: string
+                  use_put_object:
+                    description: Use the S3 PutObject API, instead of the multipart
+                      upload API.
+                    type: boolean
+                required:
+                - bucket
+                - region
+                type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
                 properties:

From bb88e0a1f764b6d06410c1bee2fd62f4e7ddd32f Mon Sep 17 00:00:00 2001
From: dehaocheng <dehaocheng@kubesphere.io>
Date: Mon, 3 Jul 2023 16:49:48 +0800
Subject: [PATCH 65/78] Update the _helpers.tpl file

Signed-off-by: dehaocheng <dehaocheng@kubesphere.io>
---
 charts/fluent-operator/templates/_helpers.tpl | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/charts/fluent-operator/templates/_helpers.tpl b/charts/fluent-operator/templates/_helpers.tpl
index 7805f0ea4..50e5cf2e0 100644
--- a/charts/fluent-operator/templates/_helpers.tpl
+++ b/charts/fluent-operator/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "fluentbit-operator.name" -}}
+{{- define "fluent-operator.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "fluentbit-operator.fullname" -}}
+{{- define "fluent-operator.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -24,19 +24,30 @@ If release name contains chart name it will be used as a full name.
 {{- end }}
 {{- end }}
 
+{{/*
+Allow the release namespace to be overridden for multi-namespace deployments in combined charts
+*/}}
+{{- define "fluent-operator.namespace" -}}
+  {{- if .Values.namespaceOverride -}}
+    {{- .Values.namespaceOverride -}}
+  {{- else -}}
+    {{- .Release.Namespace -}}
+  {{- end -}}
+{{- end -}}
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "fluentbit-operator.chart" -}}
+{{- define "fluent-operator.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "fluentbit-operator.labels" -}}
-helm.sh/chart: {{ include "fluentbit-operator.chart" . }}
-{{ include "fluentbit-operator.selectorLabels" . }}
+{{- define "fluent-operator.labels" -}}
+helm.sh/chart: {{ include "fluent-operator.chart" . }}
+{{ include "fluent-operator.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -46,17 +57,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "fluentbit-operator.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "fluentbit-operator.name" . }}
+{{- define "fluent-operator.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "fluent-operator.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "fluentbit-operator.serviceAccountName" -}}
+{{- define "fluent-operator.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "fluentbit-operator.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "fluent-operator.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}

From 9b4e764674c2c18144a4967505b926250e533c6c Mon Sep 17 00:00:00 2001
From: dehaocheng <dehaocheng@kubesphere.io>
Date: Wed, 7 Jun 2023 18:36:24 +0800
Subject: [PATCH 66/78] Upgrade fluentbit-operator to fluent-operator

Signed-off-by: dehaocheng <dehaocheng@kubesphere.io>
---
 cmd/upgrade/upgrade.sh | 80 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 cmd/upgrade/upgrade.sh

diff --git a/cmd/upgrade/upgrade.sh b/cmd/upgrade/upgrade.sh
new file mode 100644
index 000000000..0a75f0466
--- /dev/null
+++ b/cmd/upgrade/upgrade.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+namespace=kubesphere-logging-system
+deployment="fluentbit-operator"
+
+function error_exit {
+  echo "$1" 1>&2
+  exit 1
+}
+
+function converting(){
+## Converting an existing configuration to a new one
+local resource=$1
+local kind=$2
+local list=$(kubectl get  $resource.logging.kubesphere.io -A -o json) || error_exit "Cannot get resource $reresource"
+local name=($(echo $list | jq -r '.items[].metadata.name | @json'))
+local labels=($(echo $list | jq -r '.items[].metadata.labels | @json'))
+local spec=($(echo $list | jq -r '.items[].spec | @json'))
+local ns=($(echo $list | jq -r '.items[].metadata.namespace | @json'))
+local size=${#spec[*]}
+echo "Number of original $resource configuration files:$size"
+for((i=0;i<${size};i++));do
+if [[ "${kind}" = "fluentbits" ]]; then
+cluster_resource_list[i]="{
+\"apiVersion\": \"fluentbit.fluent.io/v1alpha2\",
+\"kind\": \"${kind}\",
+\"metadata\": {
+\"name\": ${name[i]},
+\"labels\": ${labels[i]},
+\"namespace\": \"${ns}\"
+},
+\"spec\": ${spec[i]}
+}"
+else
+cluster_resource_list[i]="{
+\"apiVersion\": \"fluentbit.fluent.io/v1alpha2\",
+\"kind\": \"${kind}\",
+\"metadata\": {
+\"name\": ${name[i]},
+\"labels\": ${labels[i]}
+},
+\"spec\": ${spec[i]}
+}"
+fi
+done
+
+## Uninstall the fluentbit-operator and the original configuration
+for((i=0;i<${size};i++));do
+echo "${name[i]}"
+  temp=$(echo ${name[i]} | sed 's/"//g')
+  echo "$temp"
+   kubectl delete  $resource.logging.kubesphere.io $temp -n ${namespace}
+done
+
+for((i=0;i<${size};i++));do
+echo ${cluster_resource_list[i]} | kubectl apply -f - || error_exit "Cannot apply resource $reresource"
+done
+}
+
+converting "inputs" "ClusterInput"
+converting "parsers" "ClusterParser"
+converting "filters" "ClusterFilter"
+converting "outputs" "ClusterOutput"
+converting "fluentbitconfigs" "ClusterFluentBitConfig"
+converting "fluentbits" "FluentBit"
+
+# Determine if Deployment exists
+if kubectl get deployment -n $namespace $deployment >/dev/null 2>&1; then
+    # Delete Deployment if it exists
+    kubectl delete deployment -n $namespace $deployment
+    kubectl delete clusterrolebinding kubesphere:operator:fluentbit-operator
+    kubectl delete clusterrole kubesphere:operator:fluentbit-operator
+    kubectl delete serviceaccount fluentbit-operator -n $namespace
+    echo "Deployment $deployment deleted"
+else
+    # If it does not exist, output the message
+    echo "Deployment $deployment does not exist"
+fi
+
+## Delete the old crd
+kubectl get crd -o=jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' | grep "logging.kubesphere.io" | xargs -I crd_name kubectl delete crd crd_name
\ No newline at end of file

From 5779839a3dc46d36a73145ecf0bbf130fa98c4d7 Mon Sep 17 00:00:00 2001
From: Elon Cheng <995729579@qq.com>
Date: Tue, 4 Jul 2023 20:10:17 +0800
Subject: [PATCH 67/78] Update upgrade.sh

---
 cmd/upgrade/upgrade.sh | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/cmd/upgrade/upgrade.sh b/cmd/upgrade/upgrade.sh
index 0a75f0466..20333aabf 100644
--- a/cmd/upgrade/upgrade.sh
+++ b/cmd/upgrade/upgrade.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 namespace=kubesphere-logging-system
-deployment="fluentbit-operator"
+FluentbitOperator="fluentbit-operator"
 
 function error_exit {
   echo "$1" 1>&2
@@ -9,20 +9,20 @@ function error_exit {
 
 function converting(){
 ## Converting an existing configuration to a new one
-local resource=$1
-local kind=$2
-local list=$(kubectl get  $resource.logging.kubesphere.io -A -o json) || error_exit "Cannot get resource $reresource"
+local oldKind=$1
+local newKind=$2
+local list=$(kubectl get  $oldKind.logging.kubesphere.io -A -o json) || error_exit "Cannot get resource $oldKind"
 local name=($(echo $list | jq -r '.items[].metadata.name | @json'))
 local labels=($(echo $list | jq -r '.items[].metadata.labels | @json'))
 local spec=($(echo $list | jq -r '.items[].spec | @json'))
 local ns=($(echo $list | jq -r '.items[].metadata.namespace | @json'))
 local size=${#spec[*]}
-echo "Number of original $resource configuration files:$size"
+echo "Number of original $oldKind configuration files:$size"
 for((i=0;i<${size};i++));do
 if [[ "${kind}" = "fluentbits" ]]; then
 cluster_resource_list[i]="{
 \"apiVersion\": \"fluentbit.fluent.io/v1alpha2\",
-\"kind\": \"${kind}\",
+\"kind\": \"${newKind}\",
 \"metadata\": {
 \"name\": ${name[i]},
 \"labels\": ${labels[i]},
@@ -48,33 +48,33 @@ for((i=0;i<${size};i++));do
 echo "${name[i]}"
   temp=$(echo ${name[i]} | sed 's/"//g')
   echo "$temp"
-   kubectl delete  $resource.logging.kubesphere.io $temp -n ${namespace}
+   kubectl delete  $oldKind.logging.kubesphere.io $temp -n ${namespace}
 done
 
 for((i=0;i<${size};i++));do
-echo ${cluster_resource_list[i]} | kubectl apply -f - || error_exit "Cannot apply resource $reresource"
+echo ${cluster_resource_list[i]} | kubectl apply -f - || error_exit "Cannot apply resource $oldKind"
 done
 }
 
-converting "inputs" "ClusterInput"
-converting "parsers" "ClusterParser"
-converting "filters" "ClusterFilter"
-converting "outputs" "ClusterOutput"
-converting "fluentbitconfigs" "ClusterFluentBitConfig"
-converting "fluentbits" "FluentBit"
+converting "Input" "ClusterInput"
+converting "Parser" "ClusterParser"
+converting "Filter" "ClusterFilter"
+converting "Output" "ClusterOutput"
+converting "FluentbitConfig" "ClusterFluentBitConfig"
+converting "FluentBit" "FluentBit"
 
 # Determine if Deployment exists
-if kubectl get deployment -n $namespace $deployment >/dev/null 2>&1; then
+if kubectl get deployment -n $namespace $FluentbitOperator >/dev/null 2>&1; then
     # Delete Deployment if it exists
-    kubectl delete deployment -n $namespace $deployment
+    kubectl delete deployment -n $namespace $FluentbitOperator
     kubectl delete clusterrolebinding kubesphere:operator:fluentbit-operator
     kubectl delete clusterrole kubesphere:operator:fluentbit-operator
     kubectl delete serviceaccount fluentbit-operator -n $namespace
-    echo "Deployment $deployment deleted"
+    echo "Deployment $FluentbitOperator deleted"
 else
     # If it does not exist, output the message
-    echo "Deployment $deployment does not exist"
+    echo "Deployment $FluentbitOperator does not exist"
 fi
 
 ## Delete the old crd
-kubectl get crd -o=jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' | grep "logging.kubesphere.io" | xargs -I crd_name kubectl delete crd crd_name
\ No newline at end of file
+kubectl get crd -o=jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' | grep "logging.kubesphere.io" | xargs -I crd_name kubectl delete crd crd_name

From 12f4190a5bebe89f45617854c24c95cbbcd29608 Mon Sep 17 00:00:00 2001
From: Elon Cheng <dehaocheng@kubesphere.io>
Date: Wed, 5 Jul 2023 09:33:33 +0800
Subject: [PATCH 68/78] Update upgrade.sh

Change function name
---
 cmd/upgrade/upgrade.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmd/upgrade/upgrade.sh b/cmd/upgrade/upgrade.sh
index 20333aabf..76ee81b4c 100644
--- a/cmd/upgrade/upgrade.sh
+++ b/cmd/upgrade/upgrade.sh
@@ -7,7 +7,7 @@ function error_exit {
   exit 1
 }
 
-function converting(){
+function migrate(){
 ## Converting an existing configuration to a new one
 local oldKind=$1
 local newKind=$2
@@ -56,12 +56,12 @@ echo ${cluster_resource_list[i]} | kubectl apply -f - || error_exit "Cannot appl
 done
 }
 
-converting "Input" "ClusterInput"
-converting "Parser" "ClusterParser"
-converting "Filter" "ClusterFilter"
-converting "Output" "ClusterOutput"
-converting "FluentbitConfig" "ClusterFluentBitConfig"
-converting "FluentBit" "FluentBit"
+migrate "Input" "ClusterInput"
+migrate "Parser" "ClusterParser"
+migrate "Filter" "ClusterFilter"
+migrate "Output" "ClusterOutput"
+migrate "FluentbitConfig" "ClusterFluentBitConfig"
+migrate "FluentBit" "FluentBit"
 
 # Determine if Deployment exists
 if kubectl get deployment -n $namespace $FluentbitOperator >/dev/null 2>&1; then

From ad95a05ba8ba8ef5693bd517339b94dc3a0e47e3 Mon Sep 17 00:00:00 2001
From: Edmund Rhudy <erhudy@users.noreply.github.com>
Date: Thu, 6 Jul 2023 12:12:30 -0400
Subject: [PATCH 69/78] fix: incorrect field names in fluentd buffer plugin

Signed-off-by: Edmund Rhudy <erhudy@users.noreply.github.com>
---
 apis/fluentd/v1alpha1/plugins/common/buffer_types.go |  4 ++--
 .../tests/expected/duplicate-removal-cr-specs.cfg    | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apis/fluentd/v1alpha1/plugins/common/buffer_types.go b/apis/fluentd/v1alpha1/plugins/common/buffer_types.go
index 8b4f59338..65cc9a324 100644
--- 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
index 16a9a1552..967686492 100644
--- 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>
\ No newline at end of file

From abbb7eff0e771cc0c524e601e87683ccbbd8ea6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 9 Jul 2023 10:58:20 +0800
Subject: [PATCH 70/78] build(deps): Bump github.com/go-openapi/errors from
 0.20.3 to 0.20.4 (#795)

Bumps [github.com/go-openapi/errors](https://github.com/go-openapi/errors) from 0.20.3 to 0.20.4.
- [Commits](https://github.com/go-openapi/errors/compare/v0.20.3...v0.20.4)

---
updated-dependencies:
- dependency-name: github.com/go-openapi/errors
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index b8ff43e8b..49e7cc142 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/go-kit/kit v0.12.0
 	github.com/go-kit/log v0.2.1
 	github.com/go-logr/logr v1.2.4
-	github.com/go-openapi/errors v0.20.3
+	github.com/go-openapi/errors v0.20.4
 	github.com/joho/godotenv v1.5.1
 	github.com/oklog/run v1.1.0
 	github.com/onsi/ginkgo v1.16.5
diff --git a/go.sum b/go.sum
index 5268da82a..74a4d0108 100644
--- a/go.sum
+++ b/go.sum
@@ -96,8 +96,8 @@ github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
 github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4=
-github.com/go-openapi/errors v0.20.3 h1:rz6kiC84sqNQoqrtulzaL/VERgkoCyB6WdEkc2ujzUc=
-github.com/go-openapi/errors v0.20.3/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk=
+github.com/go-openapi/errors v0.20.4 h1:unTcVm6PispJsMECE3zWgvG4xTiKda1LIR5rCRWLG6M=
+github.com/go-openapi/errors v0.20.4/go.mod h1:Z3FlZ4I8jEGxjUK+bugx3on2mIAk4txuAOhlsB1FSgk=
 github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
 github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
 github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8=

From cdd17b8cc06bb619f7f24347ae7026d95e17b5b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 9 Jul 2023 10:59:01 +0800
Subject: [PATCH 71/78] build(deps): Bump github.com/onsi/gomega from 1.27.7 to
 1.27.8 (#794)

Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.27.7 to 1.27.8.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.27.7...v1.27.8)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index 49e7cc142..a8b213f0e 100644
--- a/go.mod
+++ b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/joho/godotenv v1.5.1
 	github.com/oklog/run v1.1.0
 	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.27.7
+	github.com/onsi/gomega v1.27.8
 	k8s.io/api v0.26.3
 	k8s.io/apimachinery v0.27.2
 	k8s.io/client-go v0.26.3
diff --git a/go.sum b/go.sum
index 74a4d0108..bc5b31c72 100644
--- a/go.sum
+++ b/go.sum
@@ -234,11 +234,11 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
+github.com/onsi/ginkgo/v2 v2.9.7 h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
-github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4=
+github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
+github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

From 9b917a7df496a8b80ef91be3d756fe90941d0e9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 9 Jul 2023 11:01:14 +0800
Subject: [PATCH 72/78] build(deps): Bump golang in /cmd/fluent-manager (#783)

Bumps golang from 1.20.4-alpine3.17 to 1.20.5-alpine3.17.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 cmd/fluent-manager/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/fluent-manager/Dockerfile b/cmd/fluent-manager/Dockerfile
index 6a8ff6561..50a702a14 100644
--- a/cmd/fluent-manager/Dockerfile
+++ b/cmd/fluent-manager/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.20.4-alpine3.17 as builder
+FROM --platform=$BUILDPLATFORM golang:1.20.5-alpine3.17 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

From 88ab30b4b9fd488f70b6d59506707a10babc4a72 Mon Sep 17 00:00:00 2001
From: karan k <karan.k@oracle.com>
Date: Fri, 7 Jul 2023 15:54:27 +0530
Subject: [PATCH 73/78] Support system layer in service section of fluenbit

Signed-off-by: karan k <karan.k@oracle.com>
---
 .../v1alpha2/clusterfluentbitconfig_types.go  |  46 ++++
 .../v1alpha2/plugins/input/systemd_types.go   |  12 ++
 .../v1alpha2/plugins/input/tail_types.go      |  12 ++
 .../plugins/output/open_search_types.go       |   5 +
 ...bit.fluent.io_clusterfluentbitconfigs.yaml |  52 +++++
 .../fluentbit.fluent.io_clusterinputs.yaml    |  30 +++
 .../fluentbit.fluent.io_clusteroutputs.yaml   |  60 +++---
 .../crds/fluentbit.fluent.io_outputs.yaml     |  60 +++---
 .../crds/fluentd.fluent.io_fluentds.yaml      |   2 +-
 .../fluentbit-clusterinput-systemd.yaml       |   4 +
 .../fluentbit-clusterinput-tail.yaml          |   4 +
 .../fluentbitconfig-fluentBitConfig.yaml      |   4 +
 charts/fluent-operator/values.yaml            |  26 +++
 ...bit.fluent.io_clusterfluentbitconfigs.yaml |  52 +++++
 .../fluentbit.fluent.io_clusterinputs.yaml    |  30 +++
 .../fluentbit.fluent.io_clusteroutputs.yaml   |  60 +++---
 .../bases/fluentbit.fluent.io_outputs.yaml    |  60 +++---
 .../crd/bases/fluentd.fluent.io_fluentds.yaml |   2 +-
 manifests/setup/fluent-operator-crd.yaml      | 204 +++++++++++++-----
 manifests/setup/setup.yaml                    | 204 +++++++++++++-----
 20 files changed, 701 insertions(+), 228 deletions(-)

diff --git a/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go b/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go
index 2740cd9ea..7cb30d32e 100644
--- a/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go
+++ b/apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go
@@ -46,6 +46,27 @@ type FluentBitConfigSpec struct {
 	Namespace *string `json:"namespace,omitempty"`
 }
 
+type Storage struct {
+	// Select an optional location in the file system to store streams and chunks of data/
+	Path string `json:"path,omitempty"`
+	// Configure the synchronization mode used to store the data into the file system
+	// +kubebuilder:validation:Enum:=normal;full
+	Sync string `json:"sync,omitempty"`
+	// Enable the data integrity check when writing and reading data from the filesystem
+	// +kubebuilder:validation:Enum:=on;off
+	Checksum string `json:"checksum,omitempty"`
+	// This option configure a hint of maximum value of memory to use when processing these records
+	BacklogMemLimit string `json:"backlogMemLimit,omitempty"`
+	// If the input plugin has enabled filesystem storage type, this property sets the maximum number of Chunks that can be up in memory
+	MaxChunksUp *int64 `json:"maxChunksUp,omitempty"`
+	// If http_server option has been enabled in the Service section, this option registers a new endpoint where internal metrics of the storage layer can be consumed
+	// +kubebuilder:validation:Enum:=on;off
+	Metrics string `json:"metrics,omitempty"`
+	// When enabled, irrecoverable chunks will be deleted during runtime, and any other irrecoverable chunk located in the configured storage path directory will be deleted when Fluent-Bit starts.
+	// +kubebuilder:validation:Enum:=on;off
+	DeleteIrrecoverableChunks string `json:"deleteIrrecoverableChunks,omitempty"`
+}
+
 type Service struct {
 	// If true go to background on start
 	Daemon *bool `json:"daemon,omitempty"`
@@ -80,6 +101,8 @@ type Service struct {
 	LogLevel string `json:"logLevel,omitempty"`
 	// Optional 'parsers' config file (can be multiple)
 	ParsersFile string `json:"parsersFile,omitempty"`
+	// Configure a global environment for the storage layer in Service. It is recommended to configure the volume and volumeMount separately for this storage. The hostPath type should be used for that Volume in Fluentbit daemon set.
+	Storage *Storage `json:"storage,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -149,6 +172,29 @@ func (s *Service) Params() *params.KVs {
 	if s.ParsersFile != "" {
 		m.Insert("Parsers_File", s.ParsersFile)
 	}
+	if s.Storage != nil {
+		if s.Storage.Path != "" {
+			m.Insert("storage.path", s.Storage.Path)
+		}
+		if s.Storage.Sync != "" {
+			m.Insert("storage.sync", s.Storage.Sync)
+		}
+		if s.Storage.Checksum != "" {
+			m.Insert("storage.checksum", s.Storage.Checksum)
+		}
+		if s.Storage.BacklogMemLimit != "" {
+			m.Insert("storage.backlog.mem_limit", s.Storage.BacklogMemLimit)
+		}
+		if s.Storage.Metrics != "" {
+			m.Insert("storage.metrics", s.Storage.Metrics)
+		}
+		if s.Storage.MaxChunksUp != nil {
+			m.Insert("storage.max_chunks_up", fmt.Sprint(*s.Storage.MaxChunksUp))
+		}
+		if s.Storage.DeleteIrrecoverableChunks != "" {
+			m.Insert("storage.delete_irrecoverable_chunks", s.Storage.DeleteIrrecoverableChunks)
+		}
+	}
 	return m
 }
 
diff --git a/apis/fluentbit/v1alpha2/plugins/input/systemd_types.go b/apis/fluentbit/v1alpha2/plugins/input/systemd_types.go
index 5d4ffac6b..5e86575b2 100644
--- a/apis/fluentbit/v1alpha2/plugins/input/systemd_types.go
+++ b/apis/fluentbit/v1alpha2/plugins/input/systemd_types.go
@@ -44,6 +44,12 @@ type Systemd struct {
 	// Remove the leading underscore of the Journald field (key). For example the Journald field _PID becomes the key PID.
 	// +kubebuilder:validation:Enum:=on;off
 	StripUnderscores string `json:"stripUnderscores,omitempty"`
+	// Specify the buffering mechanism to use. It can be memory or filesystem
+	// +kubebuilder:validation:Enum:=filesystem;memory
+	StorageType string `json:"storageType,omitempty"`
+	// Specifies if the input plugin should be paused (stop ingesting new data) when the storage.max_chunks_up value is reached.
+	// +kubebuilder:validation:Enum:=on;off
+	PauseOnChunksOverlimit string `json:"pauseOnChunksOverlimit,omitempty"`
 }
 
 func (_ *Systemd) Name() string {
@@ -85,6 +91,12 @@ func (s *Systemd) Params(_ plugins.SecretLoader) (*params.KVs, error) {
 	if s.StripUnderscores != "" {
 		kvs.Insert("Strip_Underscores", s.StripUnderscores)
 	}
+	if s.StorageType != "" {
+		kvs.Insert("storage.type", s.StorageType)
+	}
+	if s.PauseOnChunksOverlimit != "" {
+		kvs.Insert("storage.pause_on_chunks_overlimit", s.PauseOnChunksOverlimit)
+	}
 
 	return kvs, nil
 }
diff --git a/apis/fluentbit/v1alpha2/plugins/input/tail_types.go b/apis/fluentbit/v1alpha2/plugins/input/tail_types.go
index 149af9546..6ca911470 100644
--- a/apis/fluentbit/v1alpha2/plugins/input/tail_types.go
+++ b/apis/fluentbit/v1alpha2/plugins/input/tail_types.go
@@ -93,6 +93,12 @@ type Tail struct {
 	// This will help to reassembly multiline messages originally split by Docker or CRI
 	//Specify one or Multiline Parser definition to apply to the content.
 	MultilineParser string `json:"multilineParser,omitempty"`
+	// Specify the buffering mechanism to use. It can be memory or filesystem
+	// +kubebuilder:validation:Enum:=filesystem;memory
+	StorageType string `json:"storageType,omitempty"`
+	// Specifies if the input plugin should be paused (stop ingesting new data) when the storage.max_chunks_up value is reached.
+	// +kubebuilder:validation:Enum:=on;off
+	PauseOnChunksOverlimit string `json:"pauseOnChunksOverlimit,omitempty"`
 }
 
 func (_ *Tail) Name() string {
@@ -179,5 +185,11 @@ func (t *Tail) Params(_ plugins.SecretLoader) (*params.KVs, error) {
 	if t.MultilineParser != "" {
 		kvs.Insert("multiline.parser", t.MultilineParser)
 	}
+	if t.StorageType != "" {
+		kvs.Insert("storage.type", t.StorageType)
+	}
+	if t.PauseOnChunksOverlimit != "" {
+		kvs.Insert("storage.pause_on_chunks_overlimit", t.PauseOnChunksOverlimit)
+	}
 	return kvs, nil
 }
diff --git a/apis/fluentbit/v1alpha2/plugins/output/open_search_types.go b/apis/fluentbit/v1alpha2/plugins/output/open_search_types.go
index 7bdfa40ce..cbbf98111 100644
--- a/apis/fluentbit/v1alpha2/plugins/output/open_search_types.go
+++ b/apis/fluentbit/v1alpha2/plugins/output/open_search_types.go
@@ -94,6 +94,8 @@ type OpenSearch struct {
 	// Enables dedicated thread(s) for this output. Default value is set since version 1.8.13. For previous versions is 0.
 	Workers      *int32 `json:"Workers,omitempty"`
 	*plugins.TLS `json:"tls,omitempty"`
+	// Limit the maximum number of Chunks in the filesystem for the current output logical destination.
+	TotalLimitSize string `json:"totalLimitSize,omitempty"`
 }
 
 // Name implement Section() method
@@ -215,5 +217,8 @@ func (o *OpenSearch) Params(sl plugins.SecretLoader) (*params.KVs, error) {
 		}
 		kvs.Merge(tls)
 	}
+	if o.TotalLimitSize != "" {
+		kvs.Insert("storage.total_limit_size", o.TotalLimitSize)
+	}
 	return kvs, nil
 }
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
index 43c89effe..31d611b98 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
@@ -297,6 +297,58 @@ spec:
                   parsersFile:
                     description: Optional 'parsers' config file (can be multiple)
                     type: string
+                  storage:
+                    description: Configure a global environment for the storage layer
+                      in Service. It is recommended to configure the volume and volumeMount
+                      separately for this storage. The hostPath type should be used
+                      for that Volume in Fluentbit daemon set.
+                    properties:
+                      backlogMemLimit:
+                        description: This option configure a hint of maximum value
+                          of memory to use when processing these records
+                        type: string
+                      checksum:
+                        description: Enable the data integrity check when writing
+                          and reading data from the filesystem
+                        enum:
+                        - "on"
+                        - "off"
+                        type: string
+                      deleteIrrecoverableChunks:
+                        description: When enabled, irrecoverable chunks will be deleted
+                          during runtime, and any other irrecoverable chunk located
+                          in the configured storage path directory will be deleted
+                          when Fluent-Bit starts.
+                        enum:
+                        - "on"
+                        - "off"
+                        type: string
+                      maxChunksUp:
+                        description: If the input plugin has enabled filesystem storage
+                          type, this property sets the maximum number of Chunks that
+                          can be up in memory
+                        format: int64
+                        type: integer
+                      metrics:
+                        description: If http_server option has been enabled in the
+                          Service section, this option registers a new endpoint where
+                          internal metrics of the storage layer can be consumed
+                        enum:
+                        - "on"
+                        - "off"
+                        type: string
+                      path:
+                        description: Select an optional location in the file system
+                          to store streams and chunks of data/
+                        type: string
+                      sync:
+                        description: Configure the synchronization mode used to store
+                          the data into the file system
+                        enum:
+                        - normal
+                        - full
+                        type: string
+                    type: object
                 type: object
             type: object
         type: object
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml
index fdf86612b..44a71dbf4 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusterinputs.yaml
@@ -176,6 +176,14 @@ spec:
                       not set, the plugin will use default paths to read local-only
                       logs.
                     type: string
+                  pauseOnChunksOverlimit:
+                    description: Specifies if the input plugin should be paused (stop
+                      ingesting new data) when the storage.max_chunks_up value is
+                      reached.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   readFromTail:
                     description: Start reading new entries. Skip entries already stored
                       in Journald.
@@ -183,6 +191,13 @@ spec:
                     - "on"
                     - "off"
                     type: string
+                  storageType:
+                    description: Specify the buffering mechanism to use. It can be
+                      memory or filesystem
+                    enum:
+                    - filesystem
+                    - memory
+                    type: string
                   stripUnderscores:
                     description: Remove the leading underscore of the Journald field
                       (key). For example the Journald field _PID becomes the key PID.
@@ -328,6 +343,14 @@ spec:
                       file as part of the record. The value assigned becomes the key
                       in the map.
                     type: string
+                  pauseOnChunksOverlimit:
+                    description: Specifies if the input plugin should be paused (stop
+                      ingesting new data) when the storage.max_chunks_up value is
+                      reached.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   readFromHead:
                     description: For new discovered files on start (without a database
                       offset/position), read the content from the head of the file,
@@ -350,6 +373,13 @@ spec:
                       behavior and instruct Fluent Bit to skip long lines and continue
                       processing other lines that fits into the buffer size.
                     type: boolean
+                  storageType:
+                    description: Specify the buffering mechanism to use. It can be
+                      memory or filesystem
+                    enum:
+                    - filesystem
+                    - memory
+                    type: string
                   tag:
                     description: Set a tag (with regex-extract fields) that will be
                       placed on lines read. E.g. kube.<namespace_name>.<pod_name>.<container_name>
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
index ee10b9518..d0e9acc37 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
@@ -1846,6 +1846,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                   traceError:
                     description: When enabled print the elasticsearch API calls to
                       stdout when elasticsearch returns an error
@@ -2214,116 +2218,116 @@ spec:
               s3:
                 description: S3 defines S3 Output configuration.
                 properties:
-                  auto_retry_requests:
+                  AutoRetryRequests:
                     description: Immediately retry failed requests to AWS services
                       once.
                     type: boolean
-                  bucket:
+                  Bucket:
                     description: S3 Bucket name
                     type: string
-                  canned_acl:
+                  CannedAcl:
                     description: Predefined Canned ACL Policy for S3 objects.
                     type: string
-                  compression:
+                  Compression:
                     description: Compression type for S3 objects.
                     type: string
-                  content_type:
+                  ContentType:
                     description: A standard MIME type for the S3 object; this will
                       be set as the Content-Type HTTP header.
                     type: string
-                  endpoint:
+                  Endpoint:
                     description: Custom endpoint for the S3 API.
                     type: string
-                  external_id:
+                  ExternalId:
                     description: Specify an external ID for the STS API, can be used
                       with the role_arn parameter if your role requires an external
                       ID.
                     type: string
-                  json_date_format:
+                  JsonDateFormat:
                     description: 'Specify the format of the date. Supported formats
                       are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
                       and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
                     type: string
-                  json_date_key:
+                  JsonDateKey:
                     description: Specify the name of the time key in the output record.
                       To disable the time key just set the value to false.
                     type: string
-                  log_key:
+                  LogKey:
                     description: By default, the whole log record will be sent to
                       S3. If you specify a key name with this option, then only the
                       value of that key will be sent to S3.
                     type: string
-                  preserve_data_ordering:
+                  PreserveDataOrdering:
                     description: Normally, when an upload request fails, there is
                       a high chance for the last received chunk to be swapped with
                       a later chunk, resulting in data shuffling. This feature prevents
                       this shuffling by using a queue logic for uploads.
                     type: boolean
-                  region:
+                  Region:
                     description: The AWS region of your S3 bucket
                     type: string
-                  retry_limit:
+                  RetryLimit:
                     description: Integer value to set the maximum number of retries
                       allowed.
                     format: int32
                     type: integer
-                  role_arn:
+                  RoleArn:
                     description: ARN of an IAM role to assume
                     type: string
-                  s3_key_format:
+                  S3KeyFormat:
                     description: Format string for keys in S3.
                     type: string
-                  s3_key_format_tag_delimiters:
+                  S3KeyFormatTagDelimiters:
                     description: A series of characters which will be used to split
                       the tag into 'parts' for use with the s3_key_format option.
                     type: string
-                  send_content_md5:
+                  SendContentMd5:
                     description: Send the Content-MD5 header with PutObject and UploadPart
                       requests, as is required when Object Lock is enabled.
                     type: boolean
-                  static_file_path:
+                  StaticFilePath:
                     description: Disables behavior where UUID string is automatically
                       appended to end of S3 key name when $UUID is not provided in
                       s3_key_format. $UUID, time formatters, $TAG, and other dynamic
                       key formatters all work as expected while this feature is set
                       to true.
                     type: boolean
-                  storage_class:
+                  StorageClass:
                     description: Specify the storage class for S3 objects. If this
                       option is not specified, objects will be stored with the default
                       'STANDARD' storage class.
                     type: string
-                  store_dir:
+                  StoreDir:
                     description: Directory to locally buffer data before sending.
                     type: string
-                  store_dir_limit_size:
+                  StoreDirLimitSize:
                     description: The size of the limitation for disk usage in S3.
                     type: string
-                  sts_endpoint:
+                  StsEndpoint:
                     description: Custom endpoint for the STS API.
                     type: string
-                  total_file_size:
+                  TotalFileSize:
                     description: Specifies the size of files in S3. Minimum size is
                       1M. With use_put_object On the maximum size is 1G. With multipart
                       upload mode, the maximum size is 50G.
                     type: string
-                  upload_chunk_size:
+                  UploadChunkSize:
                     description: 'The size of each ''part'' for multipart uploads.
                       Max: 50M'
                     type: string
-                  upload_timeout:
+                  UploadTimeout:
                     description: Whenever this amount of time has elapsed, Fluent
                       Bit will complete an upload and create a new file in S3. For
                       example, set this value to 60m and you will get a new file every
                       hour.
                     type: string
-                  use_put_object:
+                  UsePutObject:
                     description: Use the S3 PutObject API, instead of the multipart
                       upload API.
                     type: boolean
                 required:
-                - bucket
-                - region
+                - Bucket
+                - Region
                 type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
index 9b52e800c..e460042bb 100644
--- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
+++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
@@ -1846,6 +1846,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                   traceError:
                     description: When enabled print the elasticsearch API calls to
                       stdout when elasticsearch returns an error
@@ -2214,116 +2218,116 @@ spec:
               s3:
                 description: S3 defines S3 Output configuration.
                 properties:
-                  auto_retry_requests:
+                  AutoRetryRequests:
                     description: Immediately retry failed requests to AWS services
                       once.
                     type: boolean
-                  bucket:
+                  Bucket:
                     description: S3 Bucket name
                     type: string
-                  canned_acl:
+                  CannedAcl:
                     description: Predefined Canned ACL Policy for S3 objects.
                     type: string
-                  compression:
+                  Compression:
                     description: Compression type for S3 objects.
                     type: string
-                  content_type:
+                  ContentType:
                     description: A standard MIME type for the S3 object; this will
                       be set as the Content-Type HTTP header.
                     type: string
-                  endpoint:
+                  Endpoint:
                     description: Custom endpoint for the S3 API.
                     type: string
-                  external_id:
+                  ExternalId:
                     description: Specify an external ID for the STS API, can be used
                       with the role_arn parameter if your role requires an external
                       ID.
                     type: string
-                  json_date_format:
+                  JsonDateFormat:
                     description: 'Specify the format of the date. Supported formats
                       are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
                       and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
                     type: string
-                  json_date_key:
+                  JsonDateKey:
                     description: Specify the name of the time key in the output record.
                       To disable the time key just set the value to false.
                     type: string
-                  log_key:
+                  LogKey:
                     description: By default, the whole log record will be sent to
                       S3. If you specify a key name with this option, then only the
                       value of that key will be sent to S3.
                     type: string
-                  preserve_data_ordering:
+                  PreserveDataOrdering:
                     description: Normally, when an upload request fails, there is
                       a high chance for the last received chunk to be swapped with
                       a later chunk, resulting in data shuffling. This feature prevents
                       this shuffling by using a queue logic for uploads.
                     type: boolean
-                  region:
+                  Region:
                     description: The AWS region of your S3 bucket
                     type: string
-                  retry_limit:
+                  RetryLimit:
                     description: Integer value to set the maximum number of retries
                       allowed.
                     format: int32
                     type: integer
-                  role_arn:
+                  RoleArn:
                     description: ARN of an IAM role to assume
                     type: string
-                  s3_key_format:
+                  S3KeyFormat:
                     description: Format string for keys in S3.
                     type: string
-                  s3_key_format_tag_delimiters:
+                  S3KeyFormatTagDelimiters:
                     description: A series of characters which will be used to split
                       the tag into 'parts' for use with the s3_key_format option.
                     type: string
-                  send_content_md5:
+                  SendContentMd5:
                     description: Send the Content-MD5 header with PutObject and UploadPart
                       requests, as is required when Object Lock is enabled.
                     type: boolean
-                  static_file_path:
+                  StaticFilePath:
                     description: Disables behavior where UUID string is automatically
                       appended to end of S3 key name when $UUID is not provided in
                       s3_key_format. $UUID, time formatters, $TAG, and other dynamic
                       key formatters all work as expected while this feature is set
                       to true.
                     type: boolean
-                  storage_class:
+                  StorageClass:
                     description: Specify the storage class for S3 objects. If this
                       option is not specified, objects will be stored with the default
                       'STANDARD' storage class.
                     type: string
-                  store_dir:
+                  StoreDir:
                     description: Directory to locally buffer data before sending.
                     type: string
-                  store_dir_limit_size:
+                  StoreDirLimitSize:
                     description: The size of the limitation for disk usage in S3.
                     type: string
-                  sts_endpoint:
+                  StsEndpoint:
                     description: Custom endpoint for the STS API.
                     type: string
-                  total_file_size:
+                  TotalFileSize:
                     description: Specifies the size of files in S3. Minimum size is
                       1M. With use_put_object On the maximum size is 1G. With multipart
                       upload mode, the maximum size is 50G.
                     type: string
-                  upload_chunk_size:
+                  UploadChunkSize:
                     description: 'The size of each ''part'' for multipart uploads.
                       Max: 50M'
                     type: string
-                  upload_timeout:
+                  UploadTimeout:
                     description: Whenever this amount of time has elapsed, Fluent
                       Bit will complete an upload and create a new file in S3. For
                       example, set this value to 60m and you will get a new file every
                       hour.
                     type: string
-                  use_put_object:
+                  UsePutObject:
                     description: Use the S3 PutObject API, instead of the multipart
                       upload API.
                     type: boolean
                 required:
-                - bucket
-                - region
+                - Bucket
+                - Region
                 type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
index 952415f70..91728355e 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
@@ -1310,7 +1310,7 @@ spec:
                 x-kubernetes-map-type: atomic
               defaultOutputSelector:
                 description: Select cluster output plugins used to send all logs that
-                  did not match a route to the matching outputs
+                  did not match any route to the matching outputs
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
diff --git a/charts/fluent-operator/templates/fluentbit-clusterinput-systemd.yaml b/charts/fluent-operator/templates/fluentbit-clusterinput-systemd.yaml
index 6e27b641e..5ed37d645 100644
--- a/charts/fluent-operator/templates/fluentbit-clusterinput-systemd.yaml
+++ b/charts/fluent-operator/templates/fluentbit-clusterinput-systemd.yaml
@@ -25,6 +25,10 @@ spec:
 {{- toYaml .Values.fluentbit.input.systemd.systemdFilter.filters | nindent 6 }}
       {{- end }}
 {{- end }}
+    storageType: {{ .Values.fluentbit.input.systemd.storageType }}
+   {{- if eq .Values.fluentbit.input.systemd.storageType "filesystem" }}
+    pauseOnChunksOverlimit: {{ .Values.fluentbit.input.systemd.pauseOnChunksOverlimit | quote }}
+   {{- end }}
 {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml b/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml
index d2c36e323..76fd07387 100644
--- a/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml
+++ b/charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml
@@ -25,6 +25,10 @@ spec:
     skipLongLines: {{ .Values.fluentbit.input.tail.skipLongLines }}
     db: /fluent-bit/tail/pos.db
     dbSync: Normal
+    storageType: {{ .Values.fluentbit.input.tail.storageType }}
+    {{- if eq .Values.fluentbit.input.tail.storageType "filesystem" }}
+    pauseOnChunksOverlimit: {{ .Values.fluentbit.input.tail.pauseOnChunksOverlimit | quote }}
+    {{- end }}
 {{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/fluent-operator/templates/fluentbitconfig-fluentBitConfig.yaml b/charts/fluent-operator/templates/fluentbitconfig-fluentBitConfig.yaml
index c7abf3faf..f5d44908c 100644
--- a/charts/fluent-operator/templates/fluentbitconfig-fluentBitConfig.yaml
+++ b/charts/fluent-operator/templates/fluentbitconfig-fluentBitConfig.yaml
@@ -9,6 +9,10 @@ metadata:
 spec:
   service:
     parsersFile: parsers.conf
+{{- if .Values.fluentbit.service.storage }}
+    storage:
+{{ toYaml .Values.fluentbit.service.storage | indent 6 }}
+{{- end }}
   inputSelector:
     matchLabels:
       fluentbit.fluent.io/enabled: "true"
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index c3bfe88f8..fad472c21 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -134,6 +134,10 @@ fluentbit:
   #   - name: hostSys
   #     hostPath:
   #       path: /sys/
+  # Uncomment the code if you intend to create the volume for buffer storage in case the storage type "filesystem" is being used in the configuration of the fluentbit service.
+  #   - name: hostBuffer
+  #     hostPath:
+  #       path: /tmp/fluent-bit-buffer
   # additionalVolumesMounts:
   #   - mountPath: /host/sys
   #     mountPropagation: HostToContainer
@@ -143,6 +147,11 @@ fluentbit:
   #     mountPropagation: HostToContainer
   #     name: hostProc
   #     readOnly: true
+  # Uncomment the code if you intend to mount the volume for buffer storage in case the storage type "filesystem" is being used in the configuration of the fluentbit service.
+  #   - mountPath: /host/fluent-bit-buffer
+  #     mountPropagation: HostToContainer
+  #     name: hostBuffer
+
 
   namespaceFluentBitCfgSelector: {}
 
@@ -160,6 +169,9 @@ fluentbit:
       path: "/var/log/containers/*.log"
       skipLongLines: true
       readFromHead: false
+      # Use storageType as "filesystem" if you want to use filesystem as the buffering mechanism for tail input.
+      storageType: memory
+      pauseOnChunksOverlimit: "off"
     systemd:
       enable: true
       systemdFilter:
@@ -168,6 +180,9 @@ fluentbit:
       path: "/var/log/journal"
       includeKubelet: true
       stripUnderscores: "off"
+      # Use storageType as "filesystem" if you want to use filesystem as the buffering mechanism for systemd input.
+      storageType: memory
+      pauseOnChunksOverlimit: "off"
     nodeExporterMetrics: {}
     # uncomment below nodeExporterMetrics section if you want to collect node exporter metrics
   #   nodeExporterMetrics:
@@ -213,6 +228,17 @@ fluentbit:
     # You can configure the opensearch-related configuration here
     stdout:
       enable: false
+  service:
+    storage: {}
+# Remove the above storage section and uncomment below section if you want to configure file-system as storage for buffer
+#    storage:
+#      path: "/host/fluent-bit-buffer/"
+#      backlogMemLimit: "50MB"
+#      checksum: "off"
+#      deleteIrrecoverableChunks: "on"
+#      maxChunksUp: 128
+#      metrics: "on"
+#      sync: normal
 
   # Configure the default filters in FluentBit.
   # The `filter` will filter and parse the collected log information and output the logs into a uniform format. You can choose whether to turn this on or not.
diff --git a/config/crd/bases/fluentbit.fluent.io_clusterfluentbitconfigs.yaml b/config/crd/bases/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
index 43c89effe..31d611b98 100644
--- a/config/crd/bases/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_clusterfluentbitconfigs.yaml
@@ -297,6 +297,58 @@ spec:
                   parsersFile:
                     description: Optional 'parsers' config file (can be multiple)
                     type: string
+                  storage:
+                    description: Configure a global environment for the storage layer
+                      in Service. It is recommended to configure the volume and volumeMount
+                      separately for this storage. The hostPath type should be used
+                      for that Volume in Fluentbit daemon set.
+                    properties:
+                      backlogMemLimit:
+                        description: This option configure a hint of maximum value
+                          of memory to use when processing these records
+                        type: string
+                      checksum:
+                        description: Enable the data integrity check when writing
+                          and reading data from the filesystem
+                        enum:
+                        - "on"
+                        - "off"
+                        type: string
+                      deleteIrrecoverableChunks:
+                        description: When enabled, irrecoverable chunks will be deleted
+                          during runtime, and any other irrecoverable chunk located
+                          in the configured storage path directory will be deleted
+                          when Fluent-Bit starts.
+                        enum:
+                        - "on"
+                        - "off"
+                        type: string
+                      maxChunksUp:
+                        description: If the input plugin has enabled filesystem storage
+                          type, this property sets the maximum number of Chunks that
+                          can be up in memory
+                        format: int64
+                        type: integer
+                      metrics:
+                        description: If http_server option has been enabled in the
+                          Service section, this option registers a new endpoint where
+                          internal metrics of the storage layer can be consumed
+                        enum:
+                        - "on"
+                        - "off"
+                        type: string
+                      path:
+                        description: Select an optional location in the file system
+                          to store streams and chunks of data/
+                        type: string
+                      sync:
+                        description: Configure the synchronization mode used to store
+                          the data into the file system
+                        enum:
+                        - normal
+                        - full
+                        type: string
+                    type: object
                 type: object
             type: object
         type: object
diff --git a/config/crd/bases/fluentbit.fluent.io_clusterinputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusterinputs.yaml
index fdf86612b..44a71dbf4 100644
--- a/config/crd/bases/fluentbit.fluent.io_clusterinputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_clusterinputs.yaml
@@ -176,6 +176,14 @@ spec:
                       not set, the plugin will use default paths to read local-only
                       logs.
                     type: string
+                  pauseOnChunksOverlimit:
+                    description: Specifies if the input plugin should be paused (stop
+                      ingesting new data) when the storage.max_chunks_up value is
+                      reached.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   readFromTail:
                     description: Start reading new entries. Skip entries already stored
                       in Journald.
@@ -183,6 +191,13 @@ spec:
                     - "on"
                     - "off"
                     type: string
+                  storageType:
+                    description: Specify the buffering mechanism to use. It can be
+                      memory or filesystem
+                    enum:
+                    - filesystem
+                    - memory
+                    type: string
                   stripUnderscores:
                     description: Remove the leading underscore of the Journald field
                       (key). For example the Journald field _PID becomes the key PID.
@@ -328,6 +343,14 @@ spec:
                       file as part of the record. The value assigned becomes the key
                       in the map.
                     type: string
+                  pauseOnChunksOverlimit:
+                    description: Specifies if the input plugin should be paused (stop
+                      ingesting new data) when the storage.max_chunks_up value is
+                      reached.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   readFromHead:
                     description: For new discovered files on start (without a database
                       offset/position), read the content from the head of the file,
@@ -350,6 +373,13 @@ spec:
                       behavior and instruct Fluent Bit to skip long lines and continue
                       processing other lines that fits into the buffer size.
                     type: boolean
+                  storageType:
+                    description: Specify the buffering mechanism to use. It can be
+                      memory or filesystem
+                    enum:
+                    - filesystem
+                    - memory
+                    type: string
                   tag:
                     description: Set a tag (with regex-extract fields) that will be
                       placed on lines read. E.g. kube.<namespace_name>.<pod_name>.<container_name>
diff --git a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
index ee10b9518..d0e9acc37 100644
--- a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
@@ -1846,6 +1846,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                   traceError:
                     description: When enabled print the elasticsearch API calls to
                       stdout when elasticsearch returns an error
@@ -2214,116 +2218,116 @@ spec:
               s3:
                 description: S3 defines S3 Output configuration.
                 properties:
-                  auto_retry_requests:
+                  AutoRetryRequests:
                     description: Immediately retry failed requests to AWS services
                       once.
                     type: boolean
-                  bucket:
+                  Bucket:
                     description: S3 Bucket name
                     type: string
-                  canned_acl:
+                  CannedAcl:
                     description: Predefined Canned ACL Policy for S3 objects.
                     type: string
-                  compression:
+                  Compression:
                     description: Compression type for S3 objects.
                     type: string
-                  content_type:
+                  ContentType:
                     description: A standard MIME type for the S3 object; this will
                       be set as the Content-Type HTTP header.
                     type: string
-                  endpoint:
+                  Endpoint:
                     description: Custom endpoint for the S3 API.
                     type: string
-                  external_id:
+                  ExternalId:
                     description: Specify an external ID for the STS API, can be used
                       with the role_arn parameter if your role requires an external
                       ID.
                     type: string
-                  json_date_format:
+                  JsonDateFormat:
                     description: 'Specify the format of the date. Supported formats
                       are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
                       and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
                     type: string
-                  json_date_key:
+                  JsonDateKey:
                     description: Specify the name of the time key in the output record.
                       To disable the time key just set the value to false.
                     type: string
-                  log_key:
+                  LogKey:
                     description: By default, the whole log record will be sent to
                       S3. If you specify a key name with this option, then only the
                       value of that key will be sent to S3.
                     type: string
-                  preserve_data_ordering:
+                  PreserveDataOrdering:
                     description: Normally, when an upload request fails, there is
                       a high chance for the last received chunk to be swapped with
                       a later chunk, resulting in data shuffling. This feature prevents
                       this shuffling by using a queue logic for uploads.
                     type: boolean
-                  region:
+                  Region:
                     description: The AWS region of your S3 bucket
                     type: string
-                  retry_limit:
+                  RetryLimit:
                     description: Integer value to set the maximum number of retries
                       allowed.
                     format: int32
                     type: integer
-                  role_arn:
+                  RoleArn:
                     description: ARN of an IAM role to assume
                     type: string
-                  s3_key_format:
+                  S3KeyFormat:
                     description: Format string for keys in S3.
                     type: string
-                  s3_key_format_tag_delimiters:
+                  S3KeyFormatTagDelimiters:
                     description: A series of characters which will be used to split
                       the tag into 'parts' for use with the s3_key_format option.
                     type: string
-                  send_content_md5:
+                  SendContentMd5:
                     description: Send the Content-MD5 header with PutObject and UploadPart
                       requests, as is required when Object Lock is enabled.
                     type: boolean
-                  static_file_path:
+                  StaticFilePath:
                     description: Disables behavior where UUID string is automatically
                       appended to end of S3 key name when $UUID is not provided in
                       s3_key_format. $UUID, time formatters, $TAG, and other dynamic
                       key formatters all work as expected while this feature is set
                       to true.
                     type: boolean
-                  storage_class:
+                  StorageClass:
                     description: Specify the storage class for S3 objects. If this
                       option is not specified, objects will be stored with the default
                       'STANDARD' storage class.
                     type: string
-                  store_dir:
+                  StoreDir:
                     description: Directory to locally buffer data before sending.
                     type: string
-                  store_dir_limit_size:
+                  StoreDirLimitSize:
                     description: The size of the limitation for disk usage in S3.
                     type: string
-                  sts_endpoint:
+                  StsEndpoint:
                     description: Custom endpoint for the STS API.
                     type: string
-                  total_file_size:
+                  TotalFileSize:
                     description: Specifies the size of files in S3. Minimum size is
                       1M. With use_put_object On the maximum size is 1G. With multipart
                       upload mode, the maximum size is 50G.
                     type: string
-                  upload_chunk_size:
+                  UploadChunkSize:
                     description: 'The size of each ''part'' for multipart uploads.
                       Max: 50M'
                     type: string
-                  upload_timeout:
+                  UploadTimeout:
                     description: Whenever this amount of time has elapsed, Fluent
                       Bit will complete an upload and create a new file in S3. For
                       example, set this value to 60m and you will get a new file every
                       hour.
                     type: string
-                  use_put_object:
+                  UsePutObject:
                     description: Use the S3 PutObject API, instead of the multipart
                       upload API.
                     type: boolean
                 required:
-                - bucket
-                - region
+                - Bucket
+                - Region
                 type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
diff --git a/config/crd/bases/fluentbit.fluent.io_outputs.yaml b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
index 9b52e800c..e460042bb 100644
--- a/config/crd/bases/fluentbit.fluent.io_outputs.yaml
+++ b/config/crd/bases/fluentbit.fluent.io_outputs.yaml
@@ -1846,6 +1846,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                   traceError:
                     description: When enabled print the elasticsearch API calls to
                       stdout when elasticsearch returns an error
@@ -2214,116 +2218,116 @@ spec:
               s3:
                 description: S3 defines S3 Output configuration.
                 properties:
-                  auto_retry_requests:
+                  AutoRetryRequests:
                     description: Immediately retry failed requests to AWS services
                       once.
                     type: boolean
-                  bucket:
+                  Bucket:
                     description: S3 Bucket name
                     type: string
-                  canned_acl:
+                  CannedAcl:
                     description: Predefined Canned ACL Policy for S3 objects.
                     type: string
-                  compression:
+                  Compression:
                     description: Compression type for S3 objects.
                     type: string
-                  content_type:
+                  ContentType:
                     description: A standard MIME type for the S3 object; this will
                       be set as the Content-Type HTTP header.
                     type: string
-                  endpoint:
+                  Endpoint:
                     description: Custom endpoint for the S3 API.
                     type: string
-                  external_id:
+                  ExternalId:
                     description: Specify an external ID for the STS API, can be used
                       with the role_arn parameter if your role requires an external
                       ID.
                     type: string
-                  json_date_format:
+                  JsonDateFormat:
                     description: 'Specify the format of the date. Supported formats
                       are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
                       and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
                     type: string
-                  json_date_key:
+                  JsonDateKey:
                     description: Specify the name of the time key in the output record.
                       To disable the time key just set the value to false.
                     type: string
-                  log_key:
+                  LogKey:
                     description: By default, the whole log record will be sent to
                       S3. If you specify a key name with this option, then only the
                       value of that key will be sent to S3.
                     type: string
-                  preserve_data_ordering:
+                  PreserveDataOrdering:
                     description: Normally, when an upload request fails, there is
                       a high chance for the last received chunk to be swapped with
                       a later chunk, resulting in data shuffling. This feature prevents
                       this shuffling by using a queue logic for uploads.
                     type: boolean
-                  region:
+                  Region:
                     description: The AWS region of your S3 bucket
                     type: string
-                  retry_limit:
+                  RetryLimit:
                     description: Integer value to set the maximum number of retries
                       allowed.
                     format: int32
                     type: integer
-                  role_arn:
+                  RoleArn:
                     description: ARN of an IAM role to assume
                     type: string
-                  s3_key_format:
+                  S3KeyFormat:
                     description: Format string for keys in S3.
                     type: string
-                  s3_key_format_tag_delimiters:
+                  S3KeyFormatTagDelimiters:
                     description: A series of characters which will be used to split
                       the tag into 'parts' for use with the s3_key_format option.
                     type: string
-                  send_content_md5:
+                  SendContentMd5:
                     description: Send the Content-MD5 header with PutObject and UploadPart
                       requests, as is required when Object Lock is enabled.
                     type: boolean
-                  static_file_path:
+                  StaticFilePath:
                     description: Disables behavior where UUID string is automatically
                       appended to end of S3 key name when $UUID is not provided in
                       s3_key_format. $UUID, time formatters, $TAG, and other dynamic
                       key formatters all work as expected while this feature is set
                       to true.
                     type: boolean
-                  storage_class:
+                  StorageClass:
                     description: Specify the storage class for S3 objects. If this
                       option is not specified, objects will be stored with the default
                       'STANDARD' storage class.
                     type: string
-                  store_dir:
+                  StoreDir:
                     description: Directory to locally buffer data before sending.
                     type: string
-                  store_dir_limit_size:
+                  StoreDirLimitSize:
                     description: The size of the limitation for disk usage in S3.
                     type: string
-                  sts_endpoint:
+                  StsEndpoint:
                     description: Custom endpoint for the STS API.
                     type: string
-                  total_file_size:
+                  TotalFileSize:
                     description: Specifies the size of files in S3. Minimum size is
                       1M. With use_put_object On the maximum size is 1G. With multipart
                       upload mode, the maximum size is 50G.
                     type: string
-                  upload_chunk_size:
+                  UploadChunkSize:
                     description: 'The size of each ''part'' for multipart uploads.
                       Max: 50M'
                     type: string
-                  upload_timeout:
+                  UploadTimeout:
                     description: Whenever this amount of time has elapsed, Fluent
                       Bit will complete an upload and create a new file in S3. For
                       example, set this value to 60m and you will get a new file every
                       hour.
                     type: string
-                  use_put_object:
+                  UsePutObject:
                     description: Use the S3 PutObject API, instead of the multipart
                       upload API.
                     type: boolean
                 required:
-                - bucket
-                - region
+                - Bucket
+                - Region
                 type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
index 952415f70..91728355e 100644
--- a/config/crd/bases/fluentd.fluent.io_fluentds.yaml
+++ b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
@@ -1310,7 +1310,7 @@ spec:
                 x-kubernetes-map-type: atomic
               defaultOutputSelector:
                 description: Select cluster output plugins used to send all logs that
-                  did not match a route to the matching outputs
+                  did not match any route to the matching outputs
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index b681a0519..552aae100 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -1462,6 +1462,58 @@ spec:
                   parsersFile:
                     description: Optional 'parsers' config file (can be multiple)
                     type: string
+                  storage:
+                    description: Configure a global environment for the storage layer
+                      in Service. It is recommended to configure the volume and volumeMount
+                      separately for this storage. The hostPath type should be used
+                      for that Volume in Fluentbit daemon set.
+                    properties:
+                      backlogMemLimit:
+                        description: This option configure a hint of maximum value
+                          of memory to use when processing these records
+                        type: string
+                      checksum:
+                        description: Enable the data integrity check when writing
+                          and reading data from the filesystem
+                        enum:
+                        - "on"
+                        - "off"
+                        type: string
+                      deleteIrrecoverableChunks:
+                        description: When enabled, irrecoverable chunks will be deleted
+                          during runtime, and any other irrecoverable chunk located
+                          in the configured storage path directory will be deleted
+                          when Fluent-Bit starts.
+                        enum:
+                        - "on"
+                        - "off"
+                        type: string
+                      maxChunksUp:
+                        description: If the input plugin has enabled filesystem storage
+                          type, this property sets the maximum number of Chunks that
+                          can be up in memory
+                        format: int64
+                        type: integer
+                      metrics:
+                        description: If http_server option has been enabled in the
+                          Service section, this option registers a new endpoint where
+                          internal metrics of the storage layer can be consumed
+                        enum:
+                        - "on"
+                        - "off"
+                        type: string
+                      path:
+                        description: Select an optional location in the file system
+                          to store streams and chunks of data/
+                        type: string
+                      sync:
+                        description: Configure the synchronization mode used to store
+                          the data into the file system
+                        enum:
+                        - normal
+                        - full
+                        type: string
+                    type: object
                 type: object
             type: object
         type: object
@@ -1826,6 +1878,14 @@ spec:
                       not set, the plugin will use default paths to read local-only
                       logs.
                     type: string
+                  pauseOnChunksOverlimit:
+                    description: Specifies if the input plugin should be paused (stop
+                      ingesting new data) when the storage.max_chunks_up value is
+                      reached.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   readFromTail:
                     description: Start reading new entries. Skip entries already stored
                       in Journald.
@@ -1833,6 +1893,13 @@ spec:
                     - "on"
                     - "off"
                     type: string
+                  storageType:
+                    description: Specify the buffering mechanism to use. It can be
+                      memory or filesystem
+                    enum:
+                    - filesystem
+                    - memory
+                    type: string
                   stripUnderscores:
                     description: Remove the leading underscore of the Journald field
                       (key). For example the Journald field _PID becomes the key PID.
@@ -1978,6 +2045,14 @@ spec:
                       file as part of the record. The value assigned becomes the key
                       in the map.
                     type: string
+                  pauseOnChunksOverlimit:
+                    description: Specifies if the input plugin should be paused (stop
+                      ingesting new data) when the storage.max_chunks_up value is
+                      reached.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   readFromHead:
                     description: For new discovered files on start (without a database
                       offset/position), read the content from the head of the file,
@@ -2000,6 +2075,13 @@ spec:
                       behavior and instruct Fluent Bit to skip long lines and continue
                       processing other lines that fits into the buffer size.
                     type: boolean
+                  storageType:
+                    description: Specify the buffering mechanism to use. It can be
+                      memory or filesystem
+                    enum:
+                    - filesystem
+                    - memory
+                    type: string
                   tag:
                     description: Set a tag (with regex-extract fields) that will be
                       placed on lines read. E.g. kube.<namespace_name>.<pod_name>.<container_name>
@@ -3859,6 +3941,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                   traceError:
                     description: When enabled print the elasticsearch API calls to
                       stdout when elasticsearch returns an error
@@ -4227,116 +4313,116 @@ spec:
               s3:
                 description: S3 defines S3 Output configuration.
                 properties:
-                  auto_retry_requests:
+                  AutoRetryRequests:
                     description: Immediately retry failed requests to AWS services
                       once.
                     type: boolean
-                  bucket:
+                  Bucket:
                     description: S3 Bucket name
                     type: string
-                  canned_acl:
+                  CannedAcl:
                     description: Predefined Canned ACL Policy for S3 objects.
                     type: string
-                  compression:
+                  Compression:
                     description: Compression type for S3 objects.
                     type: string
-                  content_type:
+                  ContentType:
                     description: A standard MIME type for the S3 object; this will
                       be set as the Content-Type HTTP header.
                     type: string
-                  endpoint:
+                  Endpoint:
                     description: Custom endpoint for the S3 API.
                     type: string
-                  external_id:
+                  ExternalId:
                     description: Specify an external ID for the STS API, can be used
                       with the role_arn parameter if your role requires an external
                       ID.
                     type: string
-                  json_date_format:
+                  JsonDateFormat:
                     description: 'Specify the format of the date. Supported formats
                       are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
                       and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
                     type: string
-                  json_date_key:
+                  JsonDateKey:
                     description: Specify the name of the time key in the output record.
                       To disable the time key just set the value to false.
                     type: string
-                  log_key:
+                  LogKey:
                     description: By default, the whole log record will be sent to
                       S3. If you specify a key name with this option, then only the
                       value of that key will be sent to S3.
                     type: string
-                  preserve_data_ordering:
+                  PreserveDataOrdering:
                     description: Normally, when an upload request fails, there is
                       a high chance for the last received chunk to be swapped with
                       a later chunk, resulting in data shuffling. This feature prevents
                       this shuffling by using a queue logic for uploads.
                     type: boolean
-                  region:
+                  Region:
                     description: The AWS region of your S3 bucket
                     type: string
-                  retry_limit:
+                  RetryLimit:
                     description: Integer value to set the maximum number of retries
                       allowed.
                     format: int32
                     type: integer
-                  role_arn:
+                  RoleArn:
                     description: ARN of an IAM role to assume
                     type: string
-                  s3_key_format:
+                  S3KeyFormat:
                     description: Format string for keys in S3.
                     type: string
-                  s3_key_format_tag_delimiters:
+                  S3KeyFormatTagDelimiters:
                     description: A series of characters which will be used to split
                       the tag into 'parts' for use with the s3_key_format option.
                     type: string
-                  send_content_md5:
+                  SendContentMd5:
                     description: Send the Content-MD5 header with PutObject and UploadPart
                       requests, as is required when Object Lock is enabled.
                     type: boolean
-                  static_file_path:
+                  StaticFilePath:
                     description: Disables behavior where UUID string is automatically
                       appended to end of S3 key name when $UUID is not provided in
                       s3_key_format. $UUID, time formatters, $TAG, and other dynamic
                       key formatters all work as expected while this feature is set
                       to true.
                     type: boolean
-                  storage_class:
+                  StorageClass:
                     description: Specify the storage class for S3 objects. If this
                       option is not specified, objects will be stored with the default
                       'STANDARD' storage class.
                     type: string
-                  store_dir:
+                  StoreDir:
                     description: Directory to locally buffer data before sending.
                     type: string
-                  store_dir_limit_size:
+                  StoreDirLimitSize:
                     description: The size of the limitation for disk usage in S3.
                     type: string
-                  sts_endpoint:
+                  StsEndpoint:
                     description: Custom endpoint for the STS API.
                     type: string
-                  total_file_size:
+                  TotalFileSize:
                     description: Specifies the size of files in S3. Minimum size is
                       1M. With use_put_object On the maximum size is 1G. With multipart
                       upload mode, the maximum size is 50G.
                     type: string
-                  upload_chunk_size:
+                  UploadChunkSize:
                     description: 'The size of each ''part'' for multipart uploads.
                       Max: 50M'
                     type: string
-                  upload_timeout:
+                  UploadTimeout:
                     description: Whenever this amount of time has elapsed, Fluent
                       Bit will complete an upload and create a new file in S3. For
                       example, set this value to 60m and you will get a new file every
                       hour.
                     type: string
-                  use_put_object:
+                  UsePutObject:
                     description: Use the S3 PutObject API, instead of the multipart
                       upload API.
                     type: boolean
                 required:
-                - bucket
-                - region
+                - Bucket
+                - Region
                 type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
@@ -19376,7 +19462,7 @@ spec:
                 x-kubernetes-map-type: atomic
               defaultOutputSelector:
                 description: Select cluster output plugins used to send all logs that
-                  did not match a route to the matching outputs
+                  did not match any route to the matching outputs
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
@@ -24488,6 +24574,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                   traceError:
                     description: When enabled print the elasticsearch API calls to
                       stdout when elasticsearch returns an error
@@ -24856,116 +24946,116 @@ spec:
               s3:
                 description: S3 defines S3 Output configuration.
                 properties:
-                  auto_retry_requests:
+                  AutoRetryRequests:
                     description: Immediately retry failed requests to AWS services
                       once.
                     type: boolean
-                  bucket:
+                  Bucket:
                     description: S3 Bucket name
                     type: string
-                  canned_acl:
+                  CannedAcl:
                     description: Predefined Canned ACL Policy for S3 objects.
                     type: string
-                  compression:
+                  Compression:
                     description: Compression type for S3 objects.
                     type: string
-                  content_type:
+                  ContentType:
                     description: A standard MIME type for the S3 object; this will
                       be set as the Content-Type HTTP header.
                     type: string
-                  endpoint:
+                  Endpoint:
                     description: Custom endpoint for the S3 API.
                     type: string
-                  external_id:
+                  ExternalId:
                     description: Specify an external ID for the STS API, can be used
                       with the role_arn parameter if your role requires an external
                       ID.
                     type: string
-                  json_date_format:
+                  JsonDateFormat:
                     description: 'Specify the format of the date. Supported formats
                       are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
                       and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
                     type: string
-                  json_date_key:
+                  JsonDateKey:
                     description: Specify the name of the time key in the output record.
                       To disable the time key just set the value to false.
                     type: string
-                  log_key:
+                  LogKey:
                     description: By default, the whole log record will be sent to
                       S3. If you specify a key name with this option, then only the
                       value of that key will be sent to S3.
                     type: string
-                  preserve_data_ordering:
+                  PreserveDataOrdering:
                     description: Normally, when an upload request fails, there is
                       a high chance for the last received chunk to be swapped with
                       a later chunk, resulting in data shuffling. This feature prevents
                       this shuffling by using a queue logic for uploads.
                     type: boolean
-                  region:
+                  Region:
                     description: The AWS region of your S3 bucket
                     type: string
-                  retry_limit:
+                  RetryLimit:
                     description: Integer value to set the maximum number of retries
                       allowed.
                     format: int32
                     type: integer
-                  role_arn:
+                  RoleArn:
                     description: ARN of an IAM role to assume
                     type: string
-                  s3_key_format:
+                  S3KeyFormat:
                     description: Format string for keys in S3.
                     type: string
-                  s3_key_format_tag_delimiters:
+                  S3KeyFormatTagDelimiters:
                     description: A series of characters which will be used to split
                       the tag into 'parts' for use with the s3_key_format option.
                     type: string
-                  send_content_md5:
+                  SendContentMd5:
                     description: Send the Content-MD5 header with PutObject and UploadPart
                       requests, as is required when Object Lock is enabled.
                     type: boolean
-                  static_file_path:
+                  StaticFilePath:
                     description: Disables behavior where UUID string is automatically
                       appended to end of S3 key name when $UUID is not provided in
                       s3_key_format. $UUID, time formatters, $TAG, and other dynamic
                       key formatters all work as expected while this feature is set
                       to true.
                     type: boolean
-                  storage_class:
+                  StorageClass:
                     description: Specify the storage class for S3 objects. If this
                       option is not specified, objects will be stored with the default
                       'STANDARD' storage class.
                     type: string
-                  store_dir:
+                  StoreDir:
                     description: Directory to locally buffer data before sending.
                     type: string
-                  store_dir_limit_size:
+                  StoreDirLimitSize:
                     description: The size of the limitation for disk usage in S3.
                     type: string
-                  sts_endpoint:
+                  StsEndpoint:
                     description: Custom endpoint for the STS API.
                     type: string
-                  total_file_size:
+                  TotalFileSize:
                     description: Specifies the size of files in S3. Minimum size is
                       1M. With use_put_object On the maximum size is 1G. With multipart
                       upload mode, the maximum size is 50G.
                     type: string
-                  upload_chunk_size:
+                  UploadChunkSize:
                     description: 'The size of each ''part'' for multipart uploads.
                       Max: 50M'
                     type: string
-                  upload_timeout:
+                  UploadTimeout:
                     description: Whenever this amount of time has elapsed, Fluent
                       Bit will complete an upload and create a new file in S3. For
                       example, set this value to 60m and you will get a new file every
                       hour.
                     type: string
-                  use_put_object:
+                  UsePutObject:
                     description: Use the S3 PutObject API, instead of the multipart
                       upload API.
                     type: boolean
                 required:
-                - bucket
-                - region
+                - Bucket
+                - Region
                 type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index a51e4e9a8..4a2575e6a 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -1462,6 +1462,58 @@ spec:
                   parsersFile:
                     description: Optional 'parsers' config file (can be multiple)
                     type: string
+                  storage:
+                    description: Configure a global environment for the storage layer
+                      in Service. It is recommended to configure the volume and volumeMount
+                      separately for this storage. The hostPath type should be used
+                      for that Volume in Fluentbit daemon set.
+                    properties:
+                      backlogMemLimit:
+                        description: This option configure a hint of maximum value
+                          of memory to use when processing these records
+                        type: string
+                      checksum:
+                        description: Enable the data integrity check when writing
+                          and reading data from the filesystem
+                        enum:
+                        - "on"
+                        - "off"
+                        type: string
+                      deleteIrrecoverableChunks:
+                        description: When enabled, irrecoverable chunks will be deleted
+                          during runtime, and any other irrecoverable chunk located
+                          in the configured storage path directory will be deleted
+                          when Fluent-Bit starts.
+                        enum:
+                        - "on"
+                        - "off"
+                        type: string
+                      maxChunksUp:
+                        description: If the input plugin has enabled filesystem storage
+                          type, this property sets the maximum number of Chunks that
+                          can be up in memory
+                        format: int64
+                        type: integer
+                      metrics:
+                        description: If http_server option has been enabled in the
+                          Service section, this option registers a new endpoint where
+                          internal metrics of the storage layer can be consumed
+                        enum:
+                        - "on"
+                        - "off"
+                        type: string
+                      path:
+                        description: Select an optional location in the file system
+                          to store streams and chunks of data/
+                        type: string
+                      sync:
+                        description: Configure the synchronization mode used to store
+                          the data into the file system
+                        enum:
+                        - normal
+                        - full
+                        type: string
+                    type: object
                 type: object
             type: object
         type: object
@@ -1826,6 +1878,14 @@ spec:
                       not set, the plugin will use default paths to read local-only
                       logs.
                     type: string
+                  pauseOnChunksOverlimit:
+                    description: Specifies if the input plugin should be paused (stop
+                      ingesting new data) when the storage.max_chunks_up value is
+                      reached.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   readFromTail:
                     description: Start reading new entries. Skip entries already stored
                       in Journald.
@@ -1833,6 +1893,13 @@ spec:
                     - "on"
                     - "off"
                     type: string
+                  storageType:
+                    description: Specify the buffering mechanism to use. It can be
+                      memory or filesystem
+                    enum:
+                    - filesystem
+                    - memory
+                    type: string
                   stripUnderscores:
                     description: Remove the leading underscore of the Journald field
                       (key). For example the Journald field _PID becomes the key PID.
@@ -1978,6 +2045,14 @@ spec:
                       file as part of the record. The value assigned becomes the key
                       in the map.
                     type: string
+                  pauseOnChunksOverlimit:
+                    description: Specifies if the input plugin should be paused (stop
+                      ingesting new data) when the storage.max_chunks_up value is
+                      reached.
+                    enum:
+                    - "on"
+                    - "off"
+                    type: string
                   readFromHead:
                     description: For new discovered files on start (without a database
                       offset/position), read the content from the head of the file,
@@ -2000,6 +2075,13 @@ spec:
                       behavior and instruct Fluent Bit to skip long lines and continue
                       processing other lines that fits into the buffer size.
                     type: boolean
+                  storageType:
+                    description: Specify the buffering mechanism to use. It can be
+                      memory or filesystem
+                    enum:
+                    - filesystem
+                    - memory
+                    type: string
                   tag:
                     description: Set a tag (with regex-extract fields) that will be
                       placed on lines read. E.g. kube.<namespace_name>.<pod_name>.<container_name>
@@ -3859,6 +3941,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                   traceError:
                     description: When enabled print the elasticsearch API calls to
                       stdout when elasticsearch returns an error
@@ -4227,116 +4313,116 @@ spec:
               s3:
                 description: S3 defines S3 Output configuration.
                 properties:
-                  auto_retry_requests:
+                  AutoRetryRequests:
                     description: Immediately retry failed requests to AWS services
                       once.
                     type: boolean
-                  bucket:
+                  Bucket:
                     description: S3 Bucket name
                     type: string
-                  canned_acl:
+                  CannedAcl:
                     description: Predefined Canned ACL Policy for S3 objects.
                     type: string
-                  compression:
+                  Compression:
                     description: Compression type for S3 objects.
                     type: string
-                  content_type:
+                  ContentType:
                     description: A standard MIME type for the S3 object; this will
                       be set as the Content-Type HTTP header.
                     type: string
-                  endpoint:
+                  Endpoint:
                     description: Custom endpoint for the S3 API.
                     type: string
-                  external_id:
+                  ExternalId:
                     description: Specify an external ID for the STS API, can be used
                       with the role_arn parameter if your role requires an external
                       ID.
                     type: string
-                  json_date_format:
+                  JsonDateFormat:
                     description: 'Specify the format of the date. Supported formats
                       are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
                       and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
                     type: string
-                  json_date_key:
+                  JsonDateKey:
                     description: Specify the name of the time key in the output record.
                       To disable the time key just set the value to false.
                     type: string
-                  log_key:
+                  LogKey:
                     description: By default, the whole log record will be sent to
                       S3. If you specify a key name with this option, then only the
                       value of that key will be sent to S3.
                     type: string
-                  preserve_data_ordering:
+                  PreserveDataOrdering:
                     description: Normally, when an upload request fails, there is
                       a high chance for the last received chunk to be swapped with
                       a later chunk, resulting in data shuffling. This feature prevents
                       this shuffling by using a queue logic for uploads.
                     type: boolean
-                  region:
+                  Region:
                     description: The AWS region of your S3 bucket
                     type: string
-                  retry_limit:
+                  RetryLimit:
                     description: Integer value to set the maximum number of retries
                       allowed.
                     format: int32
                     type: integer
-                  role_arn:
+                  RoleArn:
                     description: ARN of an IAM role to assume
                     type: string
-                  s3_key_format:
+                  S3KeyFormat:
                     description: Format string for keys in S3.
                     type: string
-                  s3_key_format_tag_delimiters:
+                  S3KeyFormatTagDelimiters:
                     description: A series of characters which will be used to split
                       the tag into 'parts' for use with the s3_key_format option.
                     type: string
-                  send_content_md5:
+                  SendContentMd5:
                     description: Send the Content-MD5 header with PutObject and UploadPart
                       requests, as is required when Object Lock is enabled.
                     type: boolean
-                  static_file_path:
+                  StaticFilePath:
                     description: Disables behavior where UUID string is automatically
                       appended to end of S3 key name when $UUID is not provided in
                       s3_key_format. $UUID, time formatters, $TAG, and other dynamic
                       key formatters all work as expected while this feature is set
                       to true.
                     type: boolean
-                  storage_class:
+                  StorageClass:
                     description: Specify the storage class for S3 objects. If this
                       option is not specified, objects will be stored with the default
                       'STANDARD' storage class.
                     type: string
-                  store_dir:
+                  StoreDir:
                     description: Directory to locally buffer data before sending.
                     type: string
-                  store_dir_limit_size:
+                  StoreDirLimitSize:
                     description: The size of the limitation for disk usage in S3.
                     type: string
-                  sts_endpoint:
+                  StsEndpoint:
                     description: Custom endpoint for the STS API.
                     type: string
-                  total_file_size:
+                  TotalFileSize:
                     description: Specifies the size of files in S3. Minimum size is
                       1M. With use_put_object On the maximum size is 1G. With multipart
                       upload mode, the maximum size is 50G.
                     type: string
-                  upload_chunk_size:
+                  UploadChunkSize:
                     description: 'The size of each ''part'' for multipart uploads.
                       Max: 50M'
                     type: string
-                  upload_timeout:
+                  UploadTimeout:
                     description: Whenever this amount of time has elapsed, Fluent
                       Bit will complete an upload and create a new file in S3. For
                       example, set this value to 60m and you will get a new file every
                       hour.
                     type: string
-                  use_put_object:
+                  UsePutObject:
                     description: Use the S3 PutObject API, instead of the multipart
                       upload API.
                     type: boolean
                 required:
-                - bucket
-                - region
+                - Bucket
+                - Region
                 type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration
@@ -19376,7 +19462,7 @@ spec:
                 x-kubernetes-map-type: atomic
               defaultOutputSelector:
                 description: Select cluster output plugins used to send all logs that
-                  did not match a route to the matching outputs
+                  did not match any route to the matching outputs
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
@@ -24488,6 +24574,10 @@ spec:
                         description: Hostname to be used for TLS SNI extension
                         type: string
                     type: object
+                  totalLimitSize:
+                    description: Limit the maximum number of Chunks in the filesystem
+                      for the current output logical destination.
+                    type: string
                   traceError:
                     description: When enabled print the elasticsearch API calls to
                       stdout when elasticsearch returns an error
@@ -24856,116 +24946,116 @@ spec:
               s3:
                 description: S3 defines S3 Output configuration.
                 properties:
-                  auto_retry_requests:
+                  AutoRetryRequests:
                     description: Immediately retry failed requests to AWS services
                       once.
                     type: boolean
-                  bucket:
+                  Bucket:
                     description: S3 Bucket name
                     type: string
-                  canned_acl:
+                  CannedAcl:
                     description: Predefined Canned ACL Policy for S3 objects.
                     type: string
-                  compression:
+                  Compression:
                     description: Compression type for S3 objects.
                     type: string
-                  content_type:
+                  ContentType:
                     description: A standard MIME type for the S3 object; this will
                       be set as the Content-Type HTTP header.
                     type: string
-                  endpoint:
+                  Endpoint:
                     description: Custom endpoint for the S3 API.
                     type: string
-                  external_id:
+                  ExternalId:
                     description: Specify an external ID for the STS API, can be used
                       with the role_arn parameter if your role requires an external
                       ID.
                     type: string
-                  json_date_format:
+                  JsonDateFormat:
                     description: 'Specify the format of the date. Supported formats
                       are double, epoch, iso8601 (eg: 2018-05-30T09:39:52.000681Z)
                       and java_sql_timestamp (eg: 2018-05-30 09:39:52.000681)'
                     type: string
-                  json_date_key:
+                  JsonDateKey:
                     description: Specify the name of the time key in the output record.
                       To disable the time key just set the value to false.
                     type: string
-                  log_key:
+                  LogKey:
                     description: By default, the whole log record will be sent to
                       S3. If you specify a key name with this option, then only the
                       value of that key will be sent to S3.
                     type: string
-                  preserve_data_ordering:
+                  PreserveDataOrdering:
                     description: Normally, when an upload request fails, there is
                       a high chance for the last received chunk to be swapped with
                       a later chunk, resulting in data shuffling. This feature prevents
                       this shuffling by using a queue logic for uploads.
                     type: boolean
-                  region:
+                  Region:
                     description: The AWS region of your S3 bucket
                     type: string
-                  retry_limit:
+                  RetryLimit:
                     description: Integer value to set the maximum number of retries
                       allowed.
                     format: int32
                     type: integer
-                  role_arn:
+                  RoleArn:
                     description: ARN of an IAM role to assume
                     type: string
-                  s3_key_format:
+                  S3KeyFormat:
                     description: Format string for keys in S3.
                     type: string
-                  s3_key_format_tag_delimiters:
+                  S3KeyFormatTagDelimiters:
                     description: A series of characters which will be used to split
                       the tag into 'parts' for use with the s3_key_format option.
                     type: string
-                  send_content_md5:
+                  SendContentMd5:
                     description: Send the Content-MD5 header with PutObject and UploadPart
                       requests, as is required when Object Lock is enabled.
                     type: boolean
-                  static_file_path:
+                  StaticFilePath:
                     description: Disables behavior where UUID string is automatically
                       appended to end of S3 key name when $UUID is not provided in
                       s3_key_format. $UUID, time formatters, $TAG, and other dynamic
                       key formatters all work as expected while this feature is set
                       to true.
                     type: boolean
-                  storage_class:
+                  StorageClass:
                     description: Specify the storage class for S3 objects. If this
                       option is not specified, objects will be stored with the default
                       'STANDARD' storage class.
                     type: string
-                  store_dir:
+                  StoreDir:
                     description: Directory to locally buffer data before sending.
                     type: string
-                  store_dir_limit_size:
+                  StoreDirLimitSize:
                     description: The size of the limitation for disk usage in S3.
                     type: string
-                  sts_endpoint:
+                  StsEndpoint:
                     description: Custom endpoint for the STS API.
                     type: string
-                  total_file_size:
+                  TotalFileSize:
                     description: Specifies the size of files in S3. Minimum size is
                       1M. With use_put_object On the maximum size is 1G. With multipart
                       upload mode, the maximum size is 50G.
                     type: string
-                  upload_chunk_size:
+                  UploadChunkSize:
                     description: 'The size of each ''part'' for multipart uploads.
                       Max: 50M'
                     type: string
-                  upload_timeout:
+                  UploadTimeout:
                     description: Whenever this amount of time has elapsed, Fluent
                       Bit will complete an upload and create a new file in S3. For
                       example, set this value to 60m and you will get a new file every
                       hour.
                     type: string
-                  use_put_object:
+                  UsePutObject:
                     description: Use the S3 PutObject API, instead of the multipart
                       upload API.
                     type: boolean
                 required:
-                - bucket
-                - region
+                - Bucket
+                - Region
                 type: object
               splunk:
                 description: Splunk defines Splunk Output Configuration

From 2dfdc190b3d1aabef637004900bfb09f9b964434 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:15:07 +0800
Subject: [PATCH 74/78] build(deps): Bump k8s.io/apimachinery from 0.27.2 to
 0.27.3 (#828)

Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.27.2 to 0.27.3.
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.27.2...v0.27.3)

---
updated-dependencies:
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod |  6 +-----
 go.sum | 15 ++-------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/go.mod b/go.mod
index a8b213f0e..d1ce8e4bb 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.27.8
 	k8s.io/api v0.26.3
-	k8s.io/apimachinery v0.27.2
+	k8s.io/apimachinery v0.27.3
 	k8s.io/client-go v0.26.3
 	k8s.io/klog/v2 v2.100.1
 	sigs.k8s.io/controller-runtime v0.14.6
@@ -58,14 +58,12 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/mod v0.10.0 // indirect
 	golang.org/x/net v0.10.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
 	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/term v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.9.1 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
@@ -74,9 +72,7 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
-	k8s.io/code-generator v0.26.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
-	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
 	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
diff --git a/go.sum b/go.sum
index bc5b31c72..641313c9a 100644
--- a/go.sum
+++ b/go.sum
@@ -89,7 +89,6 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
-github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -350,8 +349,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 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.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -506,7 +503,6 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -517,7 +513,6 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
-golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -641,17 +636,12 @@ k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU=
 k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE=
 k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI=
 k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM=
-k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg=
-k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
+k8s.io/apimachinery v0.27.3 h1:Ubye8oBufD04l9QnNtW05idcOe9Z3GQN8+7PqmuVcUM=
+k8s.io/apimachinery v0.27.3/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
 k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
 k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
-k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo=
-k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I=
 k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
 k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
-k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
-k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
 k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
@@ -667,6 +657,5 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

From 95955c5a6a0edf004d9ef0ffa2e4752a36c5dedd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:16:30 +0800
Subject: [PATCH 75/78] build(deps): Bump golang in /cmd/fluent-manager (#830)

Bumps golang from 1.20.5-alpine3.17 to 1.20.6-alpine3.17.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 cmd/fluent-manager/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/fluent-manager/Dockerfile b/cmd/fluent-manager/Dockerfile
index 50a702a14..dad8fcf22 100644
--- a/cmd/fluent-manager/Dockerfile
+++ b/cmd/fluent-manager/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.20.5-alpine3.17 as builder
+FROM --platform=$BUILDPLATFORM golang:1.20.6-alpine3.17 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

From 9085a2cc1bb8e6060bc1b9daa0c304ecdb5a2a6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:18:55 +0800
Subject: [PATCH 76/78] build(deps): Bump golang in
 /docs/best-practice/forwarding-logs-via-http (#831)

Bumps golang from 1.20.4 to 1.20.6.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 docs/best-practice/forwarding-logs-via-http/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/best-practice/forwarding-logs-via-http/Dockerfile b/docs/best-practice/forwarding-logs-via-http/Dockerfile
index e038d57a1..a115ba20d 100644
--- a/docs/best-practice/forwarding-logs-via-http/Dockerfile
+++ b/docs/best-practice/forwarding-logs-via-http/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.20.4 as builder
+FROM golang:1.20.6 as builder
 
 WORKDIR /
 COPY main.go /go/src/main.go

From 8534c470309ff1d138bd8ddcdd68e2e51f4fb84c Mon Sep 17 00:00:00 2001
From: dehaocheng <dehaocheng@kubesphere.io>
Date: Thu, 13 Jul 2023 14:09:07 +0800
Subject: [PATCH 77/78] Fluent-bit upgrade to v2.1.6

Signed-off-by: dehaocheng <dehaocheng@kubesphere.io>
---
 .github/workflows/build-fb-image.yaml            | 4 ++--
 Makefile                                         | 4 ++--
 charts/fluent-operator/values.yaml               | 2 +-
 cmd/fluent-watcher/fluentbit/Dockerfile          | 2 +-
 cmd/fluent-watcher/fluentbit/Dockerfile.debug    | 2 +-
 manifests/kubeedge/fluentbit-fluentbit-edge.yaml | 2 +-
 manifests/logging-stack/fluentbit-fluentBit.yaml | 2 +-
 manifests/quick-start/fluentbit.yaml             | 2 +-
 manifests/regex-parser/fluentbit-fluentBit.yaml  | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml
index 7248a3078..ba818cf35 100644
--- a/.github/workflows/build-fb-image.yaml
+++ b/.github/workflows/build-fb-image.yaml
@@ -13,8 +13,8 @@ on:
       - "pkg/filenotify/**"
 
 env:
-  FB_IMG: 'kubesphere/fluent-bit:v2.1.4'
-  FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.1.4-debug'
+  FB_IMG: 'kubesphere/fluent-bit:v2.1.6'
+  FB_IMG_DEBUG: 'kubesphere/fluent-bit:v2.1.6-debug'
 
 jobs:
   build:
diff --git a/Makefile b/Makefile
index 3cd740757..7b7522316 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION?=$(shell cat VERSION | tr -d " \t\n\r")
 # Image URL to use all building/pushing image targets
-FB_IMG ?= kubesphere/fluent-bit:v2.1.4
-FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.1.4-debug
+FB_IMG ?= kubesphere/fluent-bit:v2.1.6
+FB_IMG_DEBUG ?= kubesphere/fluent-bit:v2.1.6-debug
 FD_IMG ?= kubesphere/fluentd:v1.15.3
 FO_IMG ?= kubesphere/fluent-operator:$(VERSION)
 FD_IMG_BASE ?= kubesphere/fluentd:v1.15.3-arm64-base
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index fad472c21..93244719e 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -71,7 +71,7 @@ fluentbit:
   enable: true
   image:
     repository: "kubesphere/fluent-bit"
-    tag: "v2.1.4"
+    tag: "v2.1.6"
   # fluentbit resources. If you do want to specify resources, adjust them as necessary
   # You can adjust it based on the log volume.
   resources:
diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile b/cmd/fluent-watcher/fluentbit/Dockerfile
index b87cba03d..d43d26c8d 100644
--- a/cmd/fluent-watcher/fluentbit/Dockerfile
+++ b/cmd/fluent-watcher/fluentbit/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /code
 RUN echo $(ls -al /code)
 RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
 
-FROM fluent/fluent-bit:2.1.4
+FROM fluent/fluent-bit:2.1.6
 LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0"
 
 COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/
diff --git a/cmd/fluent-watcher/fluentbit/Dockerfile.debug b/cmd/fluent-watcher/fluentbit/Dockerfile.debug
index 045f40481..cf335818e 100644
--- a/cmd/fluent-watcher/fluentbit/Dockerfile.debug
+++ b/cmd/fluent-watcher/fluentbit/Dockerfile.debug
@@ -6,7 +6,7 @@ WORKDIR /code
 RUN echo $(ls -al /code)
 RUN CGO_ENABLED=0 go build -ldflags '-w -s' -o /fluent-bit/fluent-bit /code/cmd/fluent-watcher/fluentbit/main.go
 
-FROM fluent/fluent-bit:2.1.4-debug
+FROM fluent/fluent-bit:2.1.6-debug
 LABEL Description="Fluent Bit docker image" Vendor="Fluent" Version="1.0"
 
 COPY conf/fluent-bit.conf conf/parsers.conf /fluent-bit/etc/
diff --git a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml
index 6cd76ee5a..22afeea48 100644
--- a/manifests/kubeedge/fluentbit-fluentbit-edge.yaml
+++ b/manifests/kubeedge/fluentbit-fluentbit-edge.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.1.4
+  image: kubesphere/fluent-bit:v2.1.6
   positionDB:
     hostPath:
       path: /var/lib/fluent-bit/
diff --git a/manifests/logging-stack/fluentbit-fluentBit.yaml b/manifests/logging-stack/fluentbit-fluentBit.yaml
index 19eca277e..89b34f955 100644
--- a/manifests/logging-stack/fluentbit-fluentBit.yaml
+++ b/manifests/logging-stack/fluentbit-fluentBit.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.1.4
+  image: kubesphere/fluent-bit:v2.1.6
   positionDB:
     hostPath:
       path: /var/lib/fluent-bit/
diff --git a/manifests/quick-start/fluentbit.yaml b/manifests/quick-start/fluentbit.yaml
index 0167c4c08..a2139a4e0 100644
--- a/manifests/quick-start/fluentbit.yaml
+++ b/manifests/quick-start/fluentbit.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.1.4
+  image: kubesphere/fluent-bit:v2.1.6
   fluentBitConfigName: fluent-bit-config
 
 ---
diff --git a/manifests/regex-parser/fluentbit-fluentBit.yaml b/manifests/regex-parser/fluentbit-fluentBit.yaml
index 0a79930ad..70abede08 100644
--- a/manifests/regex-parser/fluentbit-fluentBit.yaml
+++ b/manifests/regex-parser/fluentbit-fluentBit.yaml
@@ -6,5 +6,5 @@ metadata:
   labels:
     app.kubernetes.io/name: fluent-bit
 spec:
-  image: kubesphere/fluent-bit:v2.1.4
+  image: kubesphere/fluent-bit:v2.1.6
   fluentBitConfigName: fluent-bit-config

From 42023bed3ac4df157f412f5836f3b13af8b71634 Mon Sep 17 00:00:00 2001
From: karan k <karan.k@oracle.com>
Date: Mon, 17 Jul 2023 13:27:53 +0530
Subject: [PATCH 78/78] add support to run fluentbit as daemonset

Signed-off-by: karan k <karan.k@oracle.com>
---
 .../v1alpha2/zz_generated.deepcopy.go         |   25 +
 apis/fluentd/v1alpha1/fluentd_types.go        |   11 +
 .../fluentd/v1alpha1/zz_generated.deepcopy.go |    6 +
 .../crds/fluentd.fluent.io_fluentds.yaml      | 1716 ++++++++++++++++-
 .../templates/fluentd-fluentd.yaml            |    1 +
 charts/fluent-operator/values.yaml            |    6 +
 .../crd/bases/fluentd.fluent.io_fluentds.yaml | 1716 ++++++++++++++++-
 controllers/consts.go                         |    1 +
 controllers/fluent_controller_finalizer.go    |   22 +-
 controllers/fluentd_controller.go             |   58 +-
 go.mod                                        |    4 +
 go.sum                                        |   11 +
 manifests/setup/fluent-operator-crd.yaml      | 1716 ++++++++++++++++-
 manifests/setup/setup.yaml                    | 1716 ++++++++++++++++-
 pkg/operator/fluentd-daemonset.go             |  195 ++
 pkg/operator/sts.go                           |    6 +-
 16 files changed, 7195 insertions(+), 15 deletions(-)
 create mode 100644 pkg/operator/fluentd-daemonset.go

diff --git a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
index 4ba987718..8cb4a4675 100644
--- a/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
+++ b/apis/fluentbit/v1alpha2/zz_generated.deepcopy.go
@@ -1501,6 +1501,11 @@ func (in *Service) DeepCopyInto(out *Service) {
 		*out = new(bool)
 		**out = **in
 	}
+	if in.Storage != nil {
+		in, out := &in.Storage, &out.Storage
+		*out = new(Storage)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Service.
@@ -1512,3 +1517,23 @@ func (in *Service) DeepCopy() *Service {
 	in.DeepCopyInto(out)
 	return out
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Storage) DeepCopyInto(out *Storage) {
+	*out = *in
+	if in.MaxChunksUp != nil {
+		in, out := &in.MaxChunksUp, &out.MaxChunksUp
+		*out = new(int64)
+		**out = **in
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Storage.
+func (in *Storage) DeepCopy() *Storage {
+	if in == nil {
+		return nil
+	}
+	out := new(Storage)
+	in.DeepCopyInto(out)
+	return out
+}
diff --git a/apis/fluentd/v1alpha1/fluentd_types.go b/apis/fluentd/v1alpha1/fluentd_types.go
index 7697d9fbf..e86abd699 100644
--- a/apis/fluentd/v1alpha1/fluentd_types.go
+++ b/apis/fluentd/v1alpha1/fluentd_types.go
@@ -43,6 +43,7 @@ type FluentdSpec struct {
 	// By default will build the related service according to the globalinputs definition.
 	DisableService bool `json:"disableService,omitempty"`
 	// Numbers of the Fluentd instance
+	// Applicable when the mode is "collector", and will be ignored when the mode is "agent"
 	Replicas *int32 `json:"replicas,omitempty"`
 	// Numbers of the workers in Fluentd instance
 	Workers *int32 `json:"workers,omitempty"`
@@ -92,6 +93,7 @@ type FluentdSpec struct {
 	// claims in a way that maintains the identity of a pod. Every claim in
 	// this list must have at least one matching (by name) volumeMount in one
 	// container in the template.
+	// Applicable when the mode is "collector", and will be ignored when the mode is "agent"
 	VolumeClaimTemplates []corev1.PersistentVolumeClaim `json:"volumeClaimTemplates,omitempty"`
 	// Service represents configurations on the fluentd service.
 	Service FluentDService `json:"service,omitempty"`
@@ -99,6 +101,15 @@ type FluentdSpec struct {
 	SecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"`
 	// SchedulerName represents the desired scheduler for fluentd pods.
 	SchedulerName string `json:"schedulerName,omitempty"`
+	// Mode to determine whether to run Fluentd as collector or agent.
+	// +kubebuilder:validation:Enum:=collector;agent
+	// +kubebuilder:default:=collector
+	Mode string `json:"mode,omitempty"`
+	// ContainerSecurityContext represents the security context for the fluentd container.
+	ContainerSecurityContext *corev1.SecurityContext `json:"containerSecurityContext,omitempty"`
+	// Storage for position db. You will use it if tail input is enabled.
+	// Applicable when the mode is "agent", and will be ignored when the mode is "collector"
+	PositionDB corev1.VolumeSource `json:"positionDB,omitempty"`
 }
 
 // FluentDService the service of the FluentD
diff --git a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
index 4720d5b6e..261ed1915 100644
--- a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
@@ -805,6 +805,12 @@ func (in *FluentdSpec) DeepCopyInto(out *FluentdSpec) {
 		*out = new(corev1.PodSecurityContext)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.ContainerSecurityContext != nil {
+		in, out := &in.ContainerSecurityContext, &out.ContainerSecurityContext
+		*out = new(corev1.SecurityContext)
+		(*in).DeepCopyInto(*out)
+	}
+	in.PositionDB.DeepCopyInto(&out.PositionDB)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FluentdSpec.
diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
index 91728355e..bd48cd838 100644
--- a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
+++ b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
@@ -1262,6 +1262,166 @@ spec:
                         type: object
                     type: object
                 type: object
+              containerSecurityContext:
+                description: ContainerSecurityContext represents the security context
+                  for the fluentd container.
+                properties:
+                  allowPrivilegeEscalation:
+                    description: 'AllowPrivilegeEscalation controls whether a process
+                      can gain more privileges than its parent process. This bool
+                      directly controls if the no_new_privs flag will be set on the
+                      container process. AllowPrivilegeEscalation is true always when
+                      the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN
+                      Note that this field cannot be set when spec.os.name is windows.'
+                    type: boolean
+                  capabilities:
+                    description: The capabilities to add/drop when running containers.
+                      Defaults to the default set of capabilities granted by the container
+                      runtime. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    properties:
+                      add:
+                        description: Added capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                      drop:
+                        description: Removed capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                    type: object
+                  privileged:
+                    description: Run container in privileged mode. Processes in privileged
+                      containers are essentially equivalent to root on the host. Defaults
+                      to false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  procMount:
+                    description: procMount denotes the type of proc mount to use for
+                      the containers. The default is DefaultProcMount which uses the
+                      container runtime defaults for readonly paths and masked paths.
+                      This requires the ProcMountType feature flag to be enabled.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  readOnlyRootFilesystem:
+                    description: Whether this container has a read-only root filesystem.
+                      Default is false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  runAsGroup:
+                    description: The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: Indicates that the container must run as a non-root
+                      user. If true, the Kubelet will validate the image at runtime
+                      to ensure that it does not run as UID 0 (root) and fail to start
+                      the container if it does. If unset or false, no such validation
+                      will be performed. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in PodSecurityContext.  If set in both SecurityContext
+                      and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    description: The SELinux context to be applied to the container.
+                      If unspecified, the container runtime will allocate a random
+                      SELinux context for each container.  May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: The seccomp options to use by this container. If
+                      seccomp options are provided at both the pod & container level,
+                      the container options override the pod options. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: localhostProfile indicates a profile defined
+                          in a file on the node should be used. The profile must be
+                          preconfigured on the node to work. Must be a descending
+                          path, relative to the kubelet's configured seccomp profile
+                          location. Must only be set if type is "Localhost".
+                        type: string
+                      type:
+                        description: "type indicates which kind of seccomp profile
+                          will be applied. Valid options are: \n Localhost - a profile
+                          defined in a file on the node should be used. RuntimeDefault
+                          - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied."
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  windowsOptions:
+                    description: The Windows specific settings applied to all containers.
+                      If unspecified, the options from the PodSecurityContext will
+                      be used. If set in both SecurityContext and PodSecurityContext,
+                      the value specified in SecurityContext takes precedence. Note
+                      that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: GMSACredentialSpec is where the GMSA admission
+                          webhook (https://github.com/kubernetes-sigs/windows-gmsa)
+                          inlines the contents of the GMSA credential spec named by
+                          the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: HostProcess determines if a container should
+                          be run as a 'Host Process' container. This field is alpha-level
+                          and will only be honored by components that enable the WindowsHostProcessContainers
+                          feature flag. Setting this field without the feature flag
+                          will result in errors when validating the Pod. All of a
+                          Pod's containers must have the same effective HostProcess
+                          value (it is not allowed to have a mix of HostProcess containers
+                          and non-HostProcess containers).  In addition, if HostProcess
+                          is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: The UserName in Windows to run the entrypoint
+                          of the container process. Defaults to the user specified
+                          in image metadata if unspecified. May also be set in PodSecurityContext.
+                          If set in both SecurityContext and PodSecurityContext, the
+                          value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
               defaultFilterSelector:
                 description: Select cluster filter plugins used to filter for the
                   default cluster output
@@ -2243,11 +2403,1562 @@ spec:
                 - debug
                 - trace
                 type: string
+              mode:
+                default: collector
+                description: Mode to determine whether to run Fluentd as collector
+                  or agent.
+                enum:
+                - collector
+                - agent
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string
                 description: NodeSelector
                 type: object
+              positionDB:
+                description: Storage for position db. You will use it if tail input
+                  is enabled. Applicable when the mode is "agent", and will be ignored
+                  when the mode is "collector"
+                properties:
+                  awsElasticBlockStore:
+                    description: 'awsElasticBlockStore represents an AWS Disk resource
+                      that is attached to a kubelet''s host machine and then exposed
+                      to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type of the volume
+                          that you want to mount. Tip: Ensure that the filesystem
+                          type is supported by the host operating system. Examples:
+                          "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      partition:
+                        description: 'partition is the partition in the volume that
+                          you want to mount. If omitted, the default is to mount by
+                          volume name. Examples: For volume /dev/sda1, you specify
+                          the partition as "1". Similarly, the volume partition for
+                          /dev/sda is "0" (or you can leave the property empty).'
+                        format: int32
+                        type: integer
+                      readOnly:
+                        description: 'readOnly value true will force the readOnly
+                          setting in VolumeMounts. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                        type: boolean
+                      volumeID:
+                        description: 'volumeID is unique ID of the persistent disk
+                          resource in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                        type: string
+                    required:
+                    - volumeID
+                    type: object
+                  azureDisk:
+                    description: azureDisk represents an Azure Data Disk mount on
+                      the host and bind mount to the pod.
+                    properties:
+                      cachingMode:
+                        description: 'cachingMode is the Host Caching mode: None,
+                          Read Only, Read Write.'
+                        type: string
+                      diskName:
+                        description: diskName is the Name of the data disk in the
+                          blob storage
+                        type: string
+                      diskURI:
+                        description: diskURI is the URI of data disk in the blob storage
+                        type: string
+                      fsType:
+                        description: fsType is Filesystem type to mount. Must be a
+                          filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      kind:
+                        description: 'kind expected values are Shared: multiple blob
+                          disks per storage account  Dedicated: single blob disk per
+                          storage account  Managed: azure managed data disk (only
+                          in managed availability set). defaults to shared'
+                        type: string
+                      readOnly:
+                        description: readOnly Defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                    required:
+                    - diskName
+                    - diskURI
+                    type: object
+                  azureFile:
+                    description: azureFile represents an Azure File Service mount
+                      on the host and bind mount to the pod.
+                    properties:
+                      readOnly:
+                        description: readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      secretName:
+                        description: secretName is the  name of secret that contains
+                          Azure Storage Account Name and Key
+                        type: string
+                      shareName:
+                        description: shareName is the azure share Name
+                        type: string
+                    required:
+                    - secretName
+                    - shareName
+                    type: object
+                  cephfs:
+                    description: cephFS represents a Ceph FS mount on the host that
+                      shares a pod's lifetime
+                    properties:
+                      monitors:
+                        description: 'monitors is Required: Monitors is a collection
+                          of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        items:
+                          type: string
+                        type: array
+                      path:
+                        description: 'path is Optional: Used as the mounted root,
+                          rather than the full Ceph tree, default is /'
+                        type: string
+                      readOnly:
+                        description: 'readOnly is Optional: Defaults to false (read/write).
+                          ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                          More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        type: boolean
+                      secretFile:
+                        description: 'secretFile is Optional: SecretFile is the path
+                          to key ring for User, default is /etc/ceph/user.secret More
+                          info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        type: string
+                      secretRef:
+                        description: 'secretRef is Optional: SecretRef is reference
+                          to the authentication secret for User, default is empty.
+                          More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      user:
+                        description: 'user is optional: User is the rados user name,
+                          default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        type: string
+                    required:
+                    - monitors
+                    type: object
+                  cinder:
+                    description: 'cinder represents a cinder volume attached and mounted
+                      on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Examples: "ext4", "xfs", "ntfs". Implicitly inferred to
+                          be "ext4" if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                        type: string
+                      readOnly:
+                        description: 'readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts. More
+                          info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                        type: boolean
+                      secretRef:
+                        description: 'secretRef is optional: points to a secret object
+                          containing parameters used to connect to OpenStack.'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      volumeID:
+                        description: 'volumeID used to identify the volume in cinder.
+                          More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                        type: string
+                    required:
+                    - volumeID
+                    type: object
+                  configMap:
+                    description: configMap represents a configMap that should populate
+                      this volume
+                    properties:
+                      defaultMode:
+                        description: 'defaultMode is optional: mode bits used to set
+                          permissions on created files by default. Must be an octal
+                          value between 0000 and 0777 or a decimal value between 0
+                          and 511. YAML accepts both octal and decimal values, JSON
+                          requires decimal values for mode bits. Defaults to 0644.
+                          Directories within the path are not affected by this setting.
+                          This might be in conflict with other options that affect
+                          the file mode, like fsGroup, and the result can be other
+                          mode bits set.'
+                        format: int32
+                        type: integer
+                      items:
+                        description: items if unspecified, each key-value pair in
+                          the Data field of the referenced ConfigMap will be projected
+                          into the volume as a file whose name is the key and content
+                          is the value. If specified, the listed keys will be projected
+                          into the specified paths, and unlisted keys will not be
+                          present. If a key is specified which is not present in the
+                          ConfigMap, the volume setup will error unless it is marked
+                          optional. Paths must be relative and may not contain the
+                          '..' path or start with '..'.
+                        items:
+                          description: Maps a string key to a path within a volume.
+                          properties:
+                            key:
+                              description: key is the key to project.
+                              type: string
+                            mode:
+                              description: 'mode is Optional: mode bits used to set
+                                permissions on this file. Must be an octal value between
+                                0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires
+                                decimal values for mode bits. If not specified, the
+                                volume defaultMode will be used. This might be in
+                                conflict with other options that affect the file mode,
+                                like fsGroup, and the result can be other mode bits
+                                set.'
+                              format: int32
+                              type: integer
+                            path:
+                              description: path is the relative path of the file to
+                                map the key to. May not be an absolute path. May not
+                                contain the path element '..'. May not start with
+                                the string '..'.
+                              type: string
+                          required:
+                          - key
+                          - path
+                          type: object
+                        type: array
+                      name:
+                        description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          TODO: Add other useful fields. apiVersion, kind, uid?'
+                        type: string
+                      optional:
+                        description: optional specify whether the ConfigMap or its
+                          keys must be defined
+                        type: boolean
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  csi:
+                    description: csi (Container Storage Interface) represents ephemeral
+                      storage that is handled by certain external CSI drivers (Beta
+                      feature).
+                    properties:
+                      driver:
+                        description: driver is the name of the CSI driver that handles
+                          this volume. Consult with your admin for the correct name
+                          as registered in the cluster.
+                        type: string
+                      fsType:
+                        description: fsType to mount. Ex. "ext4", "xfs", "ntfs". If
+                          not provided, the empty value is passed to the associated
+                          CSI driver which will determine the default filesystem to
+                          apply.
+                        type: string
+                      nodePublishSecretRef:
+                        description: nodePublishSecretRef is a reference to the secret
+                          object containing sensitive information to pass to the CSI
+                          driver to complete the CSI NodePublishVolume and NodeUnpublishVolume
+                          calls. This field is optional, and  may be empty if no secret
+                          is required. If the secret object contains more than one
+                          secret, all secret references are passed.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      readOnly:
+                        description: readOnly specifies a read-only configuration
+                          for the volume. Defaults to false (read/write).
+                        type: boolean
+                      volumeAttributes:
+                        additionalProperties:
+                          type: string
+                        description: volumeAttributes stores driver-specific properties
+                          that are passed to the CSI driver. Consult your driver's
+                          documentation for supported values.
+                        type: object
+                    required:
+                    - driver
+                    type: object
+                  downwardAPI:
+                    description: downwardAPI represents downward API about the pod
+                      that should populate this volume
+                    properties:
+                      defaultMode:
+                        description: 'Optional: mode bits to use on created files
+                          by default. Must be a Optional: mode bits used to set permissions
+                          on created files by default. Must be an octal value between
+                          0000 and 0777 or a decimal value between 0 and 511. YAML
+                          accepts both octal and decimal values, JSON requires decimal
+                          values for mode bits. Defaults to 0644. Directories within
+                          the path are not affected by this setting. This might be
+                          in conflict with other options that affect the file mode,
+                          like fsGroup, and the result can be other mode bits set.'
+                        format: int32
+                        type: integer
+                      items:
+                        description: Items is a list of downward API volume file
+                        items:
+                          description: DownwardAPIVolumeFile represents information
+                            to create the file containing the pod field
+                          properties:
+                            fieldRef:
+                              description: 'Required: Selects a field of the pod:
+                                only annotations, labels, name and namespace are supported.'
+                              properties:
+                                apiVersion:
+                                  description: Version of the schema the FieldPath
+                                    is written in terms of, defaults to "v1".
+                                  type: string
+                                fieldPath:
+                                  description: Path of the field to select in the
+                                    specified API version.
+                                  type: string
+                              required:
+                              - fieldPath
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            mode:
+                              description: 'Optional: mode bits used to set permissions
+                                on this file, must be an octal value between 0000
+                                and 0777 or a decimal value between 0 and 511. YAML
+                                accepts both octal and decimal values, JSON requires
+                                decimal values for mode bits. If not specified, the
+                                volume defaultMode will be used. This might be in
+                                conflict with other options that affect the file mode,
+                                like fsGroup, and the result can be other mode bits
+                                set.'
+                              format: int32
+                              type: integer
+                            path:
+                              description: 'Required: Path is  the relative path name
+                                of the file to be created. Must not be absolute or
+                                contain the ''..'' path. Must be utf-8 encoded. The
+                                first item of the relative path must not start with
+                                ''..'''
+                              type: string
+                            resourceFieldRef:
+                              description: 'Selects a resource of the container: only
+                                resources limits and requests (limits.cpu, limits.memory,
+                                requests.cpu and requests.memory) are currently supported.'
+                              properties:
+                                containerName:
+                                  description: 'Container name: required for volumes,
+                                    optional for env vars'
+                                  type: string
+                                divisor:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: Specifies the output format of the
+                                    exposed resources, defaults to "1"
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                resource:
+                                  description: 'Required: resource to select'
+                                  type: string
+                              required:
+                              - resource
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          required:
+                          - path
+                          type: object
+                        type: array
+                    type: object
+                  emptyDir:
+                    description: 'emptyDir represents a temporary directory that shares
+                      a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                    properties:
+                      medium:
+                        description: 'medium represents what type of storage medium
+                          should back this directory. The default is "" which means
+                          to use the node''s default medium. Must be an empty string
+                          (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                        type: string
+                      sizeLimit:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        description: 'sizeLimit is the total amount of local storage
+                          required for this EmptyDir volume. The size limit is also
+                          applicable for memory medium. The maximum usage on memory
+                          medium EmptyDir would be the minimum value between the SizeLimit
+                          specified here and the sum of memory limits of all containers
+                          in a pod. The default is nil which means that the limit
+                          is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir'
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
+                    type: object
+                  ephemeral:
+                    description: "ephemeral represents a volume that is handled by
+                      a cluster storage driver. The volume's lifecycle is tied to
+                      the pod that defines it - it will be created before the pod
+                      starts, and deleted when the pod is removed. \n Use this if:
+                      a) the volume is only needed while the pod runs, b) features
+                      of normal volumes like restoring from snapshot or capacity tracking
+                      are needed, c) the storage driver is specified through a storage
+                      class, and d) the storage driver supports dynamic volume provisioning
+                      through a PersistentVolumeClaim (see EphemeralVolumeSource for
+                      more information on the connection between this volume type
+                      and PersistentVolumeClaim). \n Use PersistentVolumeClaim or
+                      one of the vendor-specific APIs for volumes that persist for
+                      longer than the lifecycle of an individual pod. \n Use CSI for
+                      light-weight local ephemeral volumes if the CSI driver is meant
+                      to be used that way - see the documentation of the driver for
+                      more information. \n A pod can use both types of ephemeral volumes
+                      and persistent volumes at the same time."
+                    properties:
+                      volumeClaimTemplate:
+                        description: "Will be used to create a stand-alone PVC to
+                          provision the volume. The pod in which this EphemeralVolumeSource
+                          is embedded will be the owner of the PVC, i.e. the PVC will
+                          be deleted together with the pod.  The name of the PVC will
+                          be `<pod name>-<volume name>` where `<volume name>` is the
+                          name from the `PodSpec.Volumes` array entry. Pod validation
+                          will reject the pod if the concatenated name is not valid
+                          for a PVC (for example, too long). \n An existing PVC with
+                          that name that is not owned by the pod will *not* be used
+                          for the pod to avoid using an unrelated volume by mistake.
+                          Starting the pod is then blocked until the unrelated PVC
+                          is removed. If such a pre-created PVC is meant to be used
+                          by the pod, the PVC has to updated with an owner reference
+                          to the pod once the pod exists. Normally this should not
+                          be necessary, but it may be useful when manually reconstructing
+                          a broken cluster. \n This field is read-only and no changes
+                          will be made by Kubernetes to the PVC after it has been
+                          created. \n Required, must not be nil."
+                        properties:
+                          metadata:
+                            description: May contain labels and annotations that will
+                              be copied into the PVC when creating it. No other fields
+                              are allowed and will be rejected during validation.
+                            properties:
+                              annotations:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              finalizers:
+                                items:
+                                  type: string
+                                type: array
+                              labels:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              name:
+                                type: string
+                              namespace:
+                                type: string
+                            type: object
+                          spec:
+                            description: The specification for the PersistentVolumeClaim.
+                              The entire content is copied unchanged into the PVC
+                              that gets created from this template. The same fields
+                              as in a PersistentVolumeClaim are also valid here.
+                            properties:
+                              accessModes:
+                                description: 'accessModes contains the desired access
+                                  modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1'
+                                items:
+                                  type: string
+                                type: array
+                              dataSource:
+                                description: 'dataSource field can be used to specify
+                                  either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                  * An existing PVC (PersistentVolumeClaim) If the
+                                  provisioner or an external controller can support
+                                  the specified data source, it will create a new
+                                  volume based on the contents of the specified data
+                                  source. When the AnyVolumeDataSource feature gate
+                                  is enabled, dataSource contents will be copied to
+                                  dataSourceRef, and dataSourceRef contents will be
+                                  copied to dataSource when dataSourceRef.namespace
+                                  is not specified. If the namespace is specified,
+                                  then dataSourceRef will not be copied to dataSource.'
+                                properties:
+                                  apiGroup:
+                                    description: APIGroup is the group for the resource
+                                      being referenced. If APIGroup is not specified,
+                                      the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is
+                                      required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              dataSourceRef:
+                                description: 'dataSourceRef specifies the object from
+                                  which to populate the volume with data, if a non-empty
+                                  volume is desired. This may be any object from a
+                                  non-empty API group (non core object) or a PersistentVolumeClaim
+                                  object. When this field is specified, volume binding
+                                  will only succeed if the type of the specified object
+                                  matches some installed volume populator or dynamic
+                                  provisioner. This field will replace the functionality
+                                  of the dataSource field and as such if both fields
+                                  are non-empty, they must have the same value. For
+                                  backwards compatibility, when namespace isn''t specified
+                                  in dataSourceRef, both fields (dataSource and dataSourceRef)
+                                  will be set to the same value automatically if one
+                                  of them is empty and the other is non-empty. When
+                                  namespace is specified in dataSourceRef, dataSource
+                                  isn''t set to the same value and must be empty.
+                                  There are three important differences between dataSource
+                                  and dataSourceRef: * While dataSource only allows
+                                  two specific types of objects, dataSourceRef allows
+                                  any non-core object, as well as PersistentVolumeClaim
+                                  objects. * While dataSource ignores disallowed values
+                                  (dropping them), dataSourceRef preserves all values,
+                                  and generates an error if a disallowed value is
+                                  specified. * While dataSource only allows local
+                                  objects, dataSourceRef allows objects in any namespaces.
+                                  (Beta) Using this field requires the AnyVolumeDataSource
+                                  feature gate to be enabled. (Alpha) Using the namespace
+                                  field of dataSourceRef requires the CrossNamespaceVolumeDataSource
+                                  feature gate to be enabled.'
+                                properties:
+                                  apiGroup:
+                                    description: APIGroup is the group for the resource
+                                      being referenced. If APIGroup is not specified,
+                                      the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is
+                                      required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                  namespace:
+                                    description: Namespace is the namespace of resource
+                                      being referenced Note that when a namespace
+                                      is specified, a gateway.networking.k8s.io/ReferenceGrant
+                                      object is required in the referent namespace
+                                      to allow that namespace's owner to accept the
+                                      reference. See the ReferenceGrant documentation
+                                      for details. (Alpha) This field requires the
+                                      CrossNamespaceVolumeDataSource feature gate
+                                      to be enabled.
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                              resources:
+                                description: 'resources represents the minimum resources
+                                  the volume should have. If RecoverVolumeExpansionFailure
+                                  feature is enabled users are allowed to specify
+                                  resource requirements that are lower than previous
+                                  value but must still be higher than capacity recorded
+                                  in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
+                                properties:
+                                  claims:
+                                    description: "Claims lists the names of resources,
+                                      defined in spec.resourceClaims, that are used
+                                      by this container. \n This is an alpha field
+                                      and requires enabling the DynamicResourceAllocation
+                                      feature gate. \n This field is immutable. It
+                                      can only be set for containers."
+                                    items:
+                                      description: ResourceClaim references one entry
+                                        in PodSpec.ResourceClaims.
+                                      properties:
+                                        name:
+                                          description: Name must match the name of
+                                            one entry in pod.spec.resourceClaims of
+                                            the Pod where this field is used. It makes
+                                            that resource available inside a container.
+                                          type: string
+                                      required:
+                                      - name
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-map-keys:
+                                    - name
+                                    x-kubernetes-list-type: map
+                                  limits:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: 'Limits describes the maximum amount
+                                      of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                    type: object
+                                  requests:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: 'Requests describes the minimum amount
+                                      of compute resources required. If Requests is
+                                      omitted for a container, it defaults to Limits
+                                      if that is explicitly specified, otherwise to
+                                      an implementation-defined value. More info:
+                                      https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                    type: object
+                                type: object
+                              selector:
+                                description: selector is a label query over volumes
+                                  to consider for binding.
+                                properties:
+                                  matchExpressions:
+                                    description: matchExpressions is a list of label
+                                      selector requirements. The requirements are
+                                      ANDed.
+                                    items:
+                                      description: A label selector requirement is
+                                        a selector that contains values, a key, and
+                                        an operator that relates the key and values.
+                                      properties:
+                                        key:
+                                          description: key is the label key that the
+                                            selector applies to.
+                                          type: string
+                                        operator:
+                                          description: operator represents a key's
+                                            relationship to a set of values. Valid
+                                            operators are In, NotIn, Exists and DoesNotExist.
+                                          type: string
+                                        values:
+                                          description: values is an array of string
+                                            values. If the operator is In or NotIn,
+                                            the values array must be non-empty. If
+                                            the operator is Exists or DoesNotExist,
+                                            the values array must be empty. This array
+                                            is replaced during a strategic merge patch.
+                                          items:
+                                            type: string
+                                          type: array
+                                      required:
+                                      - key
+                                      - operator
+                                      type: object
+                                    type: array
+                                  matchLabels:
+                                    additionalProperties:
+                                      type: string
+                                    description: matchLabels is a map of {key,value}
+                                      pairs. A single {key,value} in the matchLabels
+                                      map is equivalent to an element of matchExpressions,
+                                      whose key field is "key", the operator is "In",
+                                      and the values array contains only "value".
+                                      The requirements are ANDed.
+                                    type: object
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              storageClassName:
+                                description: 'storageClassName is the name of the
+                                  StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
+                                type: string
+                              volumeMode:
+                                description: volumeMode defines what type of volume
+                                  is required by the claim. Value of Filesystem is
+                                  implied when not included in claim spec.
+                                type: string
+                              volumeName:
+                                description: volumeName is the binding reference to
+                                  the PersistentVolume backing this claim.
+                                type: string
+                            type: object
+                        required:
+                        - spec
+                        type: object
+                    type: object
+                  fc:
+                    description: fc represents a Fibre Channel resource that is attached
+                      to a kubelet's host machine and then exposed to the pod.
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. TODO: how do we prevent errors in the filesystem
+                          from compromising the machine'
+                        type: string
+                      lun:
+                        description: 'lun is Optional: FC target lun number'
+                        format: int32
+                        type: integer
+                      readOnly:
+                        description: 'readOnly is Optional: Defaults to false (read/write).
+                          ReadOnly here will force the ReadOnly setting in VolumeMounts.'
+                        type: boolean
+                      targetWWNs:
+                        description: 'targetWWNs is Optional: FC target worldwide
+                          names (WWNs)'
+                        items:
+                          type: string
+                        type: array
+                      wwids:
+                        description: 'wwids Optional: FC volume world wide identifiers
+                          (wwids) Either wwids or combination of targetWWNs and lun
+                          must be set, but not both simultaneously.'
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                  flexVolume:
+                    description: flexVolume represents a generic volume resource that
+                      is provisioned/attached using an exec based plugin.
+                    properties:
+                      driver:
+                        description: driver is the name of the driver to use for this
+                          volume.
+                        type: string
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". The default filesystem depends
+                          on FlexVolume script.
+                        type: string
+                      options:
+                        additionalProperties:
+                          type: string
+                        description: 'options is Optional: this field holds extra
+                          command options if any.'
+                        type: object
+                      readOnly:
+                        description: 'readOnly is Optional: defaults to false (read/write).
+                          ReadOnly here will force the ReadOnly setting in VolumeMounts.'
+                        type: boolean
+                      secretRef:
+                        description: 'secretRef is Optional: secretRef is reference
+                          to the secret object containing sensitive information to
+                          pass to the plugin scripts. This may be empty if no secret
+                          object is specified. If the secret object contains more
+                          than one secret, all secrets are passed to the plugin scripts.'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    required:
+                    - driver
+                    type: object
+                  flocker:
+                    description: flocker represents a Flocker volume attached to a
+                      kubelet's host machine. This depends on the Flocker control
+                      service being running
+                    properties:
+                      datasetName:
+                        description: datasetName is Name of the dataset stored as
+                          metadata -> name on the dataset for Flocker should be considered
+                          as deprecated
+                        type: string
+                      datasetUUID:
+                        description: datasetUUID is the UUID of the dataset. This
+                          is unique identifier of a Flocker dataset
+                        type: string
+                    type: object
+                  gcePersistentDisk:
+                    description: 'gcePersistentDisk represents a GCE Disk resource
+                      that is attached to a kubelet''s host machine and then exposed
+                      to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                    properties:
+                      fsType:
+                        description: 'fsType is filesystem type of the volume that
+                          you want to mount. Tip: Ensure that the filesystem type
+                          is supported by the host operating system. Examples: "ext4",
+                          "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      partition:
+                        description: 'partition is the partition in the volume that
+                          you want to mount. If omitted, the default is to mount by
+                          volume name. Examples: For volume /dev/sda1, you specify
+                          the partition as "1". Similarly, the volume partition for
+                          /dev/sda is "0" (or you can leave the property empty). More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                        format: int32
+                        type: integer
+                      pdName:
+                        description: 'pdName is unique name of the PD resource in
+                          GCE. Used to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the ReadOnly setting
+                          in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                        type: boolean
+                    required:
+                    - pdName
+                    type: object
+                  gitRepo:
+                    description: 'gitRepo represents a git repository at a particular
+                      revision. DEPRECATED: GitRepo is deprecated. To provision a
+                      container with a git repo, mount an EmptyDir into an InitContainer
+                      that clones the repo using git, then mount the EmptyDir into
+                      the Pod''s container.'
+                    properties:
+                      directory:
+                        description: directory is the target directory name. Must
+                          not contain or start with '..'.  If '.' is supplied, the
+                          volume directory will be the git repository.  Otherwise,
+                          if specified, the volume will contain the git repository
+                          in the subdirectory with the given name.
+                        type: string
+                      repository:
+                        description: repository is the URL
+                        type: string
+                      revision:
+                        description: revision is the commit hash for the specified
+                          revision.
+                        type: string
+                    required:
+                    - repository
+                    type: object
+                  glusterfs:
+                    description: 'glusterfs represents a Glusterfs mount on the host
+                      that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md'
+                    properties:
+                      endpoints:
+                        description: 'endpoints is the endpoint name that details
+                          Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                        type: string
+                      path:
+                        description: 'path is the Glusterfs volume path. More info:
+                          https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the Glusterfs volume
+                          to be mounted with read-only permissions. Defaults to false.
+                          More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                        type: boolean
+                    required:
+                    - endpoints
+                    - path
+                    type: object
+                  hostPath:
+                    description: 'hostPath represents a pre-existing file or directory
+                      on the host machine that is directly exposed to the container.
+                      This is generally used for system agents or other privileged
+                      things that are allowed to see the host machine. Most containers
+                      will NOT need this. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                      --- TODO(jonesdl) We need to restrict who can use host directory
+                      mounts and who can/can not mount host directories as read/write.'
+                    properties:
+                      path:
+                        description: 'path of the directory on the host. If the path
+                          is a symlink, it will follow the link to the real path.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                        type: string
+                      type:
+                        description: 'type for HostPath Volume Defaults to "" More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                        type: string
+                    required:
+                    - path
+                    type: object
+                  iscsi:
+                    description: 'iscsi represents an ISCSI Disk resource that is
+                      attached to a kubelet''s host machine and then exposed to the
+                      pod. More info: https://examples.k8s.io/volumes/iscsi/README.md'
+                    properties:
+                      chapAuthDiscovery:
+                        description: chapAuthDiscovery defines whether support iSCSI
+                          Discovery CHAP authentication
+                        type: boolean
+                      chapAuthSession:
+                        description: chapAuthSession defines whether support iSCSI
+                          Session CHAP authentication
+                        type: boolean
+                      fsType:
+                        description: 'fsType is the filesystem type of the volume
+                          that you want to mount. Tip: Ensure that the filesystem
+                          type is supported by the host operating system. Examples:
+                          "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      initiatorName:
+                        description: initiatorName is the custom iSCSI Initiator Name.
+                          If initiatorName is specified with iscsiInterface simultaneously,
+                          new iSCSI interface <target portal>:<volume name> will be
+                          created for the connection.
+                        type: string
+                      iqn:
+                        description: iqn is the target iSCSI Qualified Name.
+                        type: string
+                      iscsiInterface:
+                        description: iscsiInterface is the interface Name that uses
+                          an iSCSI transport. Defaults to 'default' (tcp).
+                        type: string
+                      lun:
+                        description: lun represents iSCSI Target Lun number.
+                        format: int32
+                        type: integer
+                      portals:
+                        description: portals is the iSCSI Target Portal List. The
+                          portal is either an IP or ip_addr:port if the port is other
+                          than default (typically TCP ports 860 and 3260).
+                        items:
+                          type: string
+                        type: array
+                      readOnly:
+                        description: readOnly here will force the ReadOnly setting
+                          in VolumeMounts. Defaults to false.
+                        type: boolean
+                      secretRef:
+                        description: secretRef is the CHAP Secret for iSCSI target
+                          and initiator authentication
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      targetPortal:
+                        description: targetPortal is iSCSI Target Portal. The Portal
+                          is either an IP or ip_addr:port if the port is other than
+                          default (typically TCP ports 860 and 3260).
+                        type: string
+                    required:
+                    - iqn
+                    - lun
+                    - targetPortal
+                    type: object
+                  nfs:
+                    description: 'nfs represents an NFS mount on the host that shares
+                      a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                    properties:
+                      path:
+                        description: 'path that is exported by the NFS server. More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the NFS export to be
+                          mounted with read-only permissions. Defaults to false. More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                        type: boolean
+                      server:
+                        description: 'server is the hostname or IP address of the
+                          NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                        type: string
+                    required:
+                    - path
+                    - server
+                    type: object
+                  persistentVolumeClaim:
+                    description: 'persistentVolumeClaimVolumeSource represents a reference
+                      to a PersistentVolumeClaim in the same namespace. More info:
+                      https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                    properties:
+                      claimName:
+                        description: 'claimName is the name of a PersistentVolumeClaim
+                          in the same namespace as the pod using this volume. More
+                          info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                        type: string
+                      readOnly:
+                        description: readOnly Will force the ReadOnly setting in VolumeMounts.
+                          Default false.
+                        type: boolean
+                    required:
+                    - claimName
+                    type: object
+                  photonPersistentDisk:
+                    description: photonPersistentDisk represents a PhotonController
+                      persistent disk attached and mounted on kubelets host machine
+                    properties:
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      pdID:
+                        description: pdID is the ID that identifies Photon Controller
+                          persistent disk
+                        type: string
+                    required:
+                    - pdID
+                    type: object
+                  portworxVolume:
+                    description: portworxVolume represents a portworx volume attached
+                      and mounted on kubelets host machine
+                    properties:
+                      fsType:
+                        description: fSType represents the filesystem type to mount
+                          Must be a filesystem type supported by the host operating
+                          system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      readOnly:
+                        description: readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      volumeID:
+                        description: volumeID uniquely identifies a Portworx volume
+                        type: string
+                    required:
+                    - volumeID
+                    type: object
+                  projected:
+                    description: projected items for all in one resources secrets,
+                      configmaps, and downward API
+                    properties:
+                      defaultMode:
+                        description: defaultMode are the mode bits used to set permissions
+                          on created files by default. Must be an octal value between
+                          0000 and 0777 or a decimal value between 0 and 511. YAML
+                          accepts both octal and decimal values, JSON requires decimal
+                          values for mode bits. Directories within the path are not
+                          affected by this setting. This might be in conflict with
+                          other options that affect the file mode, like fsGroup, and
+                          the result can be other mode bits set.
+                        format: int32
+                        type: integer
+                      sources:
+                        description: sources is the list of volume projections
+                        items:
+                          description: Projection that may be projected along with
+                            other supported volume types
+                          properties:
+                            configMap:
+                              description: configMap information about the configMap
+                                data to project
+                              properties:
+                                items:
+                                  description: items if unspecified, each key-value
+                                    pair in the Data field of the referenced ConfigMap
+                                    will be projected into the volume as a file whose
+                                    name is the key and content is the value. If specified,
+                                    the listed keys will be projected into the specified
+                                    paths, and unlisted keys will not be present.
+                                    If a key is specified which is not present in
+                                    the ConfigMap, the volume setup will error unless
+                                    it is marked optional. Paths must be relative
+                                    and may not contain the '..' path or start with
+                                    '..'.
+                                  items:
+                                    description: Maps a string key to a path within
+                                      a volume.
+                                    properties:
+                                      key:
+                                        description: key is the key to project.
+                                        type: string
+                                      mode:
+                                        description: 'mode is Optional: mode bits
+                                          used to set permissions on this file. Must
+                                          be an octal value between 0000 and 0777
+                                          or a decimal value between 0 and 511. YAML
+                                          accepts both octal and decimal values, JSON
+                                          requires decimal values for mode bits. If
+                                          not specified, the volume defaultMode will
+                                          be used. This might be in conflict with
+                                          other options that affect the file mode,
+                                          like fsGroup, and the result can be other
+                                          mode bits set.'
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        description: path is the relative path of
+                                          the file to map the key to. May not be an
+                                          absolute path. May not contain the path
+                                          element '..'. May not start with the string
+                                          '..'.
+                                        type: string
+                                    required:
+                                    - key
+                                    - path
+                                    type: object
+                                  type: array
+                                name:
+                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    TODO: Add other useful fields. apiVersion, kind,
+                                    uid?'
+                                  type: string
+                                optional:
+                                  description: optional specify whether the ConfigMap
+                                    or its keys must be defined
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            downwardAPI:
+                              description: downwardAPI information about the downwardAPI
+                                data to project
+                              properties:
+                                items:
+                                  description: Items is a list of DownwardAPIVolume
+                                    file
+                                  items:
+                                    description: DownwardAPIVolumeFile represents
+                                      information to create the file containing the
+                                      pod field
+                                    properties:
+                                      fieldRef:
+                                        description: 'Required: Selects a field of
+                                          the pod: only annotations, labels, name
+                                          and namespace are supported.'
+                                        properties:
+                                          apiVersion:
+                                            description: Version of the schema the
+                                              FieldPath is written in terms of, defaults
+                                              to "v1".
+                                            type: string
+                                          fieldPath:
+                                            description: Path of the field to select
+                                              in the specified API version.
+                                            type: string
+                                        required:
+                                        - fieldPath
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      mode:
+                                        description: 'Optional: mode bits used to
+                                          set permissions on this file, must be an
+                                          octal value between 0000 and 0777 or a decimal
+                                          value between 0 and 511. YAML accepts both
+                                          octal and decimal values, JSON requires
+                                          decimal values for mode bits. If not specified,
+                                          the volume defaultMode will be used. This
+                                          might be in conflict with other options
+                                          that affect the file mode, like fsGroup,
+                                          and the result can be other mode bits set.'
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        description: 'Required: Path is  the relative
+                                          path name of the file to be created. Must
+                                          not be absolute or contain the ''..'' path.
+                                          Must be utf-8 encoded. The first item of
+                                          the relative path must not start with ''..'''
+                                        type: string
+                                      resourceFieldRef:
+                                        description: 'Selects a resource of the container:
+                                          only resources limits and requests (limits.cpu,
+                                          limits.memory, requests.cpu and requests.memory)
+                                          are currently supported.'
+                                        properties:
+                                          containerName:
+                                            description: 'Container name: required
+                                              for volumes, optional for env vars'
+                                            type: string
+                                          divisor:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            description: Specifies the output format
+                                              of the exposed resources, defaults to
+                                              "1"
+                                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                            x-kubernetes-int-or-string: true
+                                          resource:
+                                            description: 'Required: resource to select'
+                                            type: string
+                                        required:
+                                        - resource
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    required:
+                                    - path
+                                    type: object
+                                  type: array
+                              type: object
+                            secret:
+                              description: secret information about the secret data
+                                to project
+                              properties:
+                                items:
+                                  description: items if unspecified, each key-value
+                                    pair in the Data field of the referenced Secret
+                                    will be projected into the volume as a file whose
+                                    name is the key and content is the value. If specified,
+                                    the listed keys will be projected into the specified
+                                    paths, and unlisted keys will not be present.
+                                    If a key is specified which is not present in
+                                    the Secret, the volume setup will error unless
+                                    it is marked optional. Paths must be relative
+                                    and may not contain the '..' path or start with
+                                    '..'.
+                                  items:
+                                    description: Maps a string key to a path within
+                                      a volume.
+                                    properties:
+                                      key:
+                                        description: key is the key to project.
+                                        type: string
+                                      mode:
+                                        description: 'mode is Optional: mode bits
+                                          used to set permissions on this file. Must
+                                          be an octal value between 0000 and 0777
+                                          or a decimal value between 0 and 511. YAML
+                                          accepts both octal and decimal values, JSON
+                                          requires decimal values for mode bits. If
+                                          not specified, the volume defaultMode will
+                                          be used. This might be in conflict with
+                                          other options that affect the file mode,
+                                          like fsGroup, and the result can be other
+                                          mode bits set.'
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        description: path is the relative path of
+                                          the file to map the key to. May not be an
+                                          absolute path. May not contain the path
+                                          element '..'. May not start with the string
+                                          '..'.
+                                        type: string
+                                    required:
+                                    - key
+                                    - path
+                                    type: object
+                                  type: array
+                                name:
+                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    TODO: Add other useful fields. apiVersion, kind,
+                                    uid?'
+                                  type: string
+                                optional:
+                                  description: optional field specify whether the
+                                    Secret or its key must be defined
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            serviceAccountToken:
+                              description: serviceAccountToken is information about
+                                the serviceAccountToken data to project
+                              properties:
+                                audience:
+                                  description: audience is the intended audience of
+                                    the token. A recipient of a token must identify
+                                    itself with an identifier specified in the audience
+                                    of the token, and otherwise should reject the
+                                    token. The audience defaults to the identifier
+                                    of the apiserver.
+                                  type: string
+                                expirationSeconds:
+                                  description: expirationSeconds is the requested
+                                    duration of validity of the service account token.
+                                    As the token approaches expiration, the kubelet
+                                    volume plugin will proactively rotate the service
+                                    account token. The kubelet will start trying to
+                                    rotate the token if the token is older than 80
+                                    percent of its time to live or if the token is
+                                    older than 24 hours.Defaults to 1 hour and must
+                                    be at least 10 minutes.
+                                  format: int64
+                                  type: integer
+                                path:
+                                  description: path is the path relative to the mount
+                                    point of the file to project the token into.
+                                  type: string
+                              required:
+                              - path
+                              type: object
+                          type: object
+                        type: array
+                    type: object
+                  quobyte:
+                    description: quobyte represents a Quobyte mount on the host that
+                      shares a pod's lifetime
+                    properties:
+                      group:
+                        description: group to map volume access to Default is no group
+                        type: string
+                      readOnly:
+                        description: readOnly here will force the Quobyte volume to
+                          be mounted with read-only permissions. Defaults to false.
+                        type: boolean
+                      registry:
+                        description: registry represents a single or multiple Quobyte
+                          Registry services specified as a string as host:port pair
+                          (multiple entries are separated with commas) which acts
+                          as the central registry for volumes
+                        type: string
+                      tenant:
+                        description: tenant owning the given Quobyte volume in the
+                          Backend Used with dynamically provisioned Quobyte volumes,
+                          value is set by the plugin
+                        type: string
+                      user:
+                        description: user to map volume access to Defaults to serivceaccount
+                          user
+                        type: string
+                      volume:
+                        description: volume is a string that references an already
+                          created Quobyte volume by name.
+                        type: string
+                    required:
+                    - registry
+                    - volume
+                    type: object
+                  rbd:
+                    description: 'rbd represents a Rados Block Device mount on the
+                      host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md'
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type of the volume
+                          that you want to mount. Tip: Ensure that the filesystem
+                          type is supported by the host operating system. Examples:
+                          "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      image:
+                        description: 'image is the rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                      keyring:
+                        description: 'keyring is the path to key ring for RBDUser.
+                          Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                      monitors:
+                        description: 'monitors is a collection of Ceph monitors. More
+                          info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        items:
+                          type: string
+                        type: array
+                      pool:
+                        description: 'pool is the rados pool name. Default is rbd.
+                          More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the ReadOnly setting
+                          in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: boolean
+                      secretRef:
+                        description: 'secretRef is name of the authentication secret
+                          for RBDUser. If provided overrides keyring. Default is nil.
+                          More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      user:
+                        description: 'user is the rados user name. Default is admin.
+                          More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                    required:
+                    - image
+                    - monitors
+                    type: object
+                  scaleIO:
+                    description: scaleIO represents a ScaleIO persistent volume attached
+                      and mounted on Kubernetes nodes.
+                    properties:
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Default is "xfs".
+                        type: string
+                      gateway:
+                        description: gateway is the host address of the ScaleIO API
+                          Gateway.
+                        type: string
+                      protectionDomain:
+                        description: protectionDomain is the name of the ScaleIO Protection
+                          Domain for the configured storage.
+                        type: string
+                      readOnly:
+                        description: readOnly Defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      secretRef:
+                        description: secretRef references to the secret for ScaleIO
+                          user and other sensitive information. If this is not provided,
+                          Login operation will fail.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      sslEnabled:
+                        description: sslEnabled Flag enable/disable SSL communication
+                          with Gateway, default false
+                        type: boolean
+                      storageMode:
+                        description: storageMode indicates whether the storage for
+                          a volume should be ThickProvisioned or ThinProvisioned.
+                          Default is ThinProvisioned.
+                        type: string
+                      storagePool:
+                        description: storagePool is the ScaleIO Storage Pool associated
+                          with the protection domain.
+                        type: string
+                      system:
+                        description: system is the name of the storage system as configured
+                          in ScaleIO.
+                        type: string
+                      volumeName:
+                        description: volumeName is the name of a volume already created
+                          in the ScaleIO system that is associated with this volume
+                          source.
+                        type: string
+                    required:
+                    - gateway
+                    - secretRef
+                    - system
+                    type: object
+                  secret:
+                    description: 'secret represents a secret that should populate
+                      this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                    properties:
+                      defaultMode:
+                        description: 'defaultMode is Optional: mode bits used to set
+                          permissions on created files by default. Must be an octal
+                          value between 0000 and 0777 or a decimal value between 0
+                          and 511. YAML accepts both octal and decimal values, JSON
+                          requires decimal values for mode bits. Defaults to 0644.
+                          Directories within the path are not affected by this setting.
+                          This might be in conflict with other options that affect
+                          the file mode, like fsGroup, and the result can be other
+                          mode bits set.'
+                        format: int32
+                        type: integer
+                      items:
+                        description: items If unspecified, each key-value pair in
+                          the Data field of the referenced Secret will be projected
+                          into the volume as a file whose name is the key and content
+                          is the value. If specified, the listed keys will be projected
+                          into the specified paths, and unlisted keys will not be
+                          present. If a key is specified which is not present in the
+                          Secret, the volume setup will error unless it is marked
+                          optional. Paths must be relative and may not contain the
+                          '..' path or start with '..'.
+                        items:
+                          description: Maps a string key to a path within a volume.
+                          properties:
+                            key:
+                              description: key is the key to project.
+                              type: string
+                            mode:
+                              description: 'mode is Optional: mode bits used to set
+                                permissions on this file. Must be an octal value between
+                                0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires
+                                decimal values for mode bits. If not specified, the
+                                volume defaultMode will be used. This might be in
+                                conflict with other options that affect the file mode,
+                                like fsGroup, and the result can be other mode bits
+                                set.'
+                              format: int32
+                              type: integer
+                            path:
+                              description: path is the relative path of the file to
+                                map the key to. May not be an absolute path. May not
+                                contain the path element '..'. May not start with
+                                the string '..'.
+                              type: string
+                          required:
+                          - key
+                          - path
+                          type: object
+                        type: array
+                      optional:
+                        description: optional field specify whether the Secret or
+                          its keys must be defined
+                        type: boolean
+                      secretName:
+                        description: 'secretName is the name of the secret in the
+                          pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                        type: string
+                    type: object
+                  storageos:
+                    description: storageOS represents a StorageOS volume attached
+                      and mounted on Kubernetes nodes.
+                    properties:
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      readOnly:
+                        description: readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      secretRef:
+                        description: secretRef specifies the secret to use for obtaining
+                          the StorageOS API credentials.  If not specified, default
+                          values will be attempted.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      volumeName:
+                        description: volumeName is the human-readable name of the
+                          StorageOS volume.  Volume names are only unique within a
+                          namespace.
+                        type: string
+                      volumeNamespace:
+                        description: volumeNamespace specifies the scope of the volume
+                          within StorageOS.  If no namespace is specified then the
+                          Pod's namespace will be used.  This allows the Kubernetes
+                          name scoping to be mirrored within StorageOS for tighter
+                          integration. Set VolumeName to any name to override the
+                          default behaviour. Set to "default" if you are not using
+                          namespaces within StorageOS. Namespaces that do not pre-exist
+                          within StorageOS will be created.
+                        type: string
+                    type: object
+                  vsphereVolume:
+                    description: vsphereVolume represents a vSphere volume attached
+                      and mounted on kubelets host machine
+                    properties:
+                      fsType:
+                        description: fsType is filesystem type to mount. Must be a
+                          filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      storagePolicyID:
+                        description: storagePolicyID is the storage Policy Based Management
+                          (SPBM) profile ID associated with the StoragePolicyName.
+                        type: string
+                      storagePolicyName:
+                        description: storagePolicyName is the storage Policy Based
+                          Management (SPBM) profile name.
+                        type: string
+                      volumePath:
+                        description: volumePath is the path that identifies vSphere
+                          volume vmdk
+                        type: string
+                    required:
+                    - volumePath
+                    type: object
+                type: object
               priorityClassName:
                 description: PriorityClassName represents the pod's priority class.
                 type: string
@@ -2303,7 +4014,8 @@ spec:
                   type: object
                 type: array
               replicas:
-                description: Numbers of the Fluentd instance
+                description: Numbers of the Fluentd instance Applicable when the mode
+                  is "collector", and will be ignored when the mode is "agent"
                 format: int32
                 type: integer
               resources:
@@ -2597,6 +4309,8 @@ spec:
                   for mapping network identities to claims in a way that maintains
                   the identity of a pod. Every claim in this list must have at least
                   one matching (by name) volumeMount in one container in the template.
+                  Applicable when the mode is "collector", and will be ignored when
+                  the mode is "agent"
                 items:
                   description: PersistentVolumeClaim is a user's request for and claim
                     to a persistent volume
diff --git a/charts/fluent-operator/templates/fluentd-fluentd.yaml b/charts/fluent-operator/templates/fluentd-fluentd.yaml
index 5f5199cb1..29c772018 100644
--- a/charts/fluent-operator/templates/fluentd-fluentd.yaml
+++ b/charts/fluent-operator/templates/fluentd-fluentd.yaml
@@ -13,6 +13,7 @@ spec:
         port: {{ .Values.fluentd.port }}
   replicas: {{ .Values.fluentd.replicas }}
   image: {{ .Values.fluentd.image.repository }}:{{ .Values.fluentd.image.tag }}
+  mode: {{ .Values.fluentd.mode }}
   resources:
   {{- toYaml .Values.fluentd.resources | nindent 4  }}
   fluentdCfgSelector:
diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
index 93244719e..41996c41a 100644
--- a/charts/fluent-operator/values.yaml
+++ b/charts/fluent-operator/values.yaml
@@ -268,10 +268,16 @@ fluentd:
   crdsEnable: true
   enable: false
   name: fluentd
+  # Valid modes include "collector" and "agent".
+  # The "collector" mode will deploy Fluentd as a StatefulSet as before.
+  # The new "agent" mode will deploy Fluentd as a DaemonSet.
+  mode: "collector"
   port: 24224
   image:
     repository: "kubesphere/fluentd"
     tag: "v1.15.3"
+  # Numbers of the Fluentd instance
+  # Applicable when the mode is "collector", and will be ignored when the mode is "agent"
   replicas: 1
   forward:
     port: 24224
diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
index 91728355e..bd48cd838 100644
--- a/config/crd/bases/fluentd.fluent.io_fluentds.yaml
+++ b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
@@ -1262,6 +1262,166 @@ spec:
                         type: object
                     type: object
                 type: object
+              containerSecurityContext:
+                description: ContainerSecurityContext represents the security context
+                  for the fluentd container.
+                properties:
+                  allowPrivilegeEscalation:
+                    description: 'AllowPrivilegeEscalation controls whether a process
+                      can gain more privileges than its parent process. This bool
+                      directly controls if the no_new_privs flag will be set on the
+                      container process. AllowPrivilegeEscalation is true always when
+                      the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN
+                      Note that this field cannot be set when spec.os.name is windows.'
+                    type: boolean
+                  capabilities:
+                    description: The capabilities to add/drop when running containers.
+                      Defaults to the default set of capabilities granted by the container
+                      runtime. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    properties:
+                      add:
+                        description: Added capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                      drop:
+                        description: Removed capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                    type: object
+                  privileged:
+                    description: Run container in privileged mode. Processes in privileged
+                      containers are essentially equivalent to root on the host. Defaults
+                      to false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  procMount:
+                    description: procMount denotes the type of proc mount to use for
+                      the containers. The default is DefaultProcMount which uses the
+                      container runtime defaults for readonly paths and masked paths.
+                      This requires the ProcMountType feature flag to be enabled.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  readOnlyRootFilesystem:
+                    description: Whether this container has a read-only root filesystem.
+                      Default is false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  runAsGroup:
+                    description: The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: Indicates that the container must run as a non-root
+                      user. If true, the Kubelet will validate the image at runtime
+                      to ensure that it does not run as UID 0 (root) and fail to start
+                      the container if it does. If unset or false, no such validation
+                      will be performed. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in PodSecurityContext.  If set in both SecurityContext
+                      and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    description: The SELinux context to be applied to the container.
+                      If unspecified, the container runtime will allocate a random
+                      SELinux context for each container.  May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: The seccomp options to use by this container. If
+                      seccomp options are provided at both the pod & container level,
+                      the container options override the pod options. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: localhostProfile indicates a profile defined
+                          in a file on the node should be used. The profile must be
+                          preconfigured on the node to work. Must be a descending
+                          path, relative to the kubelet's configured seccomp profile
+                          location. Must only be set if type is "Localhost".
+                        type: string
+                      type:
+                        description: "type indicates which kind of seccomp profile
+                          will be applied. Valid options are: \n Localhost - a profile
+                          defined in a file on the node should be used. RuntimeDefault
+                          - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied."
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  windowsOptions:
+                    description: The Windows specific settings applied to all containers.
+                      If unspecified, the options from the PodSecurityContext will
+                      be used. If set in both SecurityContext and PodSecurityContext,
+                      the value specified in SecurityContext takes precedence. Note
+                      that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: GMSACredentialSpec is where the GMSA admission
+                          webhook (https://github.com/kubernetes-sigs/windows-gmsa)
+                          inlines the contents of the GMSA credential spec named by
+                          the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: HostProcess determines if a container should
+                          be run as a 'Host Process' container. This field is alpha-level
+                          and will only be honored by components that enable the WindowsHostProcessContainers
+                          feature flag. Setting this field without the feature flag
+                          will result in errors when validating the Pod. All of a
+                          Pod's containers must have the same effective HostProcess
+                          value (it is not allowed to have a mix of HostProcess containers
+                          and non-HostProcess containers).  In addition, if HostProcess
+                          is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: The UserName in Windows to run the entrypoint
+                          of the container process. Defaults to the user specified
+                          in image metadata if unspecified. May also be set in PodSecurityContext.
+                          If set in both SecurityContext and PodSecurityContext, the
+                          value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
               defaultFilterSelector:
                 description: Select cluster filter plugins used to filter for the
                   default cluster output
@@ -2243,11 +2403,1562 @@ spec:
                 - debug
                 - trace
                 type: string
+              mode:
+                default: collector
+                description: Mode to determine whether to run Fluentd as collector
+                  or agent.
+                enum:
+                - collector
+                - agent
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string
                 description: NodeSelector
                 type: object
+              positionDB:
+                description: Storage for position db. You will use it if tail input
+                  is enabled. Applicable when the mode is "agent", and will be ignored
+                  when the mode is "collector"
+                properties:
+                  awsElasticBlockStore:
+                    description: 'awsElasticBlockStore represents an AWS Disk resource
+                      that is attached to a kubelet''s host machine and then exposed
+                      to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type of the volume
+                          that you want to mount. Tip: Ensure that the filesystem
+                          type is supported by the host operating system. Examples:
+                          "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      partition:
+                        description: 'partition is the partition in the volume that
+                          you want to mount. If omitted, the default is to mount by
+                          volume name. Examples: For volume /dev/sda1, you specify
+                          the partition as "1". Similarly, the volume partition for
+                          /dev/sda is "0" (or you can leave the property empty).'
+                        format: int32
+                        type: integer
+                      readOnly:
+                        description: 'readOnly value true will force the readOnly
+                          setting in VolumeMounts. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                        type: boolean
+                      volumeID:
+                        description: 'volumeID is unique ID of the persistent disk
+                          resource in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                        type: string
+                    required:
+                    - volumeID
+                    type: object
+                  azureDisk:
+                    description: azureDisk represents an Azure Data Disk mount on
+                      the host and bind mount to the pod.
+                    properties:
+                      cachingMode:
+                        description: 'cachingMode is the Host Caching mode: None,
+                          Read Only, Read Write.'
+                        type: string
+                      diskName:
+                        description: diskName is the Name of the data disk in the
+                          blob storage
+                        type: string
+                      diskURI:
+                        description: diskURI is the URI of data disk in the blob storage
+                        type: string
+                      fsType:
+                        description: fsType is Filesystem type to mount. Must be a
+                          filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      kind:
+                        description: 'kind expected values are Shared: multiple blob
+                          disks per storage account  Dedicated: single blob disk per
+                          storage account  Managed: azure managed data disk (only
+                          in managed availability set). defaults to shared'
+                        type: string
+                      readOnly:
+                        description: readOnly Defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                    required:
+                    - diskName
+                    - diskURI
+                    type: object
+                  azureFile:
+                    description: azureFile represents an Azure File Service mount
+                      on the host and bind mount to the pod.
+                    properties:
+                      readOnly:
+                        description: readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      secretName:
+                        description: secretName is the  name of secret that contains
+                          Azure Storage Account Name and Key
+                        type: string
+                      shareName:
+                        description: shareName is the azure share Name
+                        type: string
+                    required:
+                    - secretName
+                    - shareName
+                    type: object
+                  cephfs:
+                    description: cephFS represents a Ceph FS mount on the host that
+                      shares a pod's lifetime
+                    properties:
+                      monitors:
+                        description: 'monitors is Required: Monitors is a collection
+                          of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        items:
+                          type: string
+                        type: array
+                      path:
+                        description: 'path is Optional: Used as the mounted root,
+                          rather than the full Ceph tree, default is /'
+                        type: string
+                      readOnly:
+                        description: 'readOnly is Optional: Defaults to false (read/write).
+                          ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                          More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        type: boolean
+                      secretFile:
+                        description: 'secretFile is Optional: SecretFile is the path
+                          to key ring for User, default is /etc/ceph/user.secret More
+                          info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        type: string
+                      secretRef:
+                        description: 'secretRef is Optional: SecretRef is reference
+                          to the authentication secret for User, default is empty.
+                          More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      user:
+                        description: 'user is optional: User is the rados user name,
+                          default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        type: string
+                    required:
+                    - monitors
+                    type: object
+                  cinder:
+                    description: 'cinder represents a cinder volume attached and mounted
+                      on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Examples: "ext4", "xfs", "ntfs". Implicitly inferred to
+                          be "ext4" if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                        type: string
+                      readOnly:
+                        description: 'readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts. More
+                          info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                        type: boolean
+                      secretRef:
+                        description: 'secretRef is optional: points to a secret object
+                          containing parameters used to connect to OpenStack.'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      volumeID:
+                        description: 'volumeID used to identify the volume in cinder.
+                          More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                        type: string
+                    required:
+                    - volumeID
+                    type: object
+                  configMap:
+                    description: configMap represents a configMap that should populate
+                      this volume
+                    properties:
+                      defaultMode:
+                        description: 'defaultMode is optional: mode bits used to set
+                          permissions on created files by default. Must be an octal
+                          value between 0000 and 0777 or a decimal value between 0
+                          and 511. YAML accepts both octal and decimal values, JSON
+                          requires decimal values for mode bits. Defaults to 0644.
+                          Directories within the path are not affected by this setting.
+                          This might be in conflict with other options that affect
+                          the file mode, like fsGroup, and the result can be other
+                          mode bits set.'
+                        format: int32
+                        type: integer
+                      items:
+                        description: items if unspecified, each key-value pair in
+                          the Data field of the referenced ConfigMap will be projected
+                          into the volume as a file whose name is the key and content
+                          is the value. If specified, the listed keys will be projected
+                          into the specified paths, and unlisted keys will not be
+                          present. If a key is specified which is not present in the
+                          ConfigMap, the volume setup will error unless it is marked
+                          optional. Paths must be relative and may not contain the
+                          '..' path or start with '..'.
+                        items:
+                          description: Maps a string key to a path within a volume.
+                          properties:
+                            key:
+                              description: key is the key to project.
+                              type: string
+                            mode:
+                              description: 'mode is Optional: mode bits used to set
+                                permissions on this file. Must be an octal value between
+                                0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires
+                                decimal values for mode bits. If not specified, the
+                                volume defaultMode will be used. This might be in
+                                conflict with other options that affect the file mode,
+                                like fsGroup, and the result can be other mode bits
+                                set.'
+                              format: int32
+                              type: integer
+                            path:
+                              description: path is the relative path of the file to
+                                map the key to. May not be an absolute path. May not
+                                contain the path element '..'. May not start with
+                                the string '..'.
+                              type: string
+                          required:
+                          - key
+                          - path
+                          type: object
+                        type: array
+                      name:
+                        description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          TODO: Add other useful fields. apiVersion, kind, uid?'
+                        type: string
+                      optional:
+                        description: optional specify whether the ConfigMap or its
+                          keys must be defined
+                        type: boolean
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  csi:
+                    description: csi (Container Storage Interface) represents ephemeral
+                      storage that is handled by certain external CSI drivers (Beta
+                      feature).
+                    properties:
+                      driver:
+                        description: driver is the name of the CSI driver that handles
+                          this volume. Consult with your admin for the correct name
+                          as registered in the cluster.
+                        type: string
+                      fsType:
+                        description: fsType to mount. Ex. "ext4", "xfs", "ntfs". If
+                          not provided, the empty value is passed to the associated
+                          CSI driver which will determine the default filesystem to
+                          apply.
+                        type: string
+                      nodePublishSecretRef:
+                        description: nodePublishSecretRef is a reference to the secret
+                          object containing sensitive information to pass to the CSI
+                          driver to complete the CSI NodePublishVolume and NodeUnpublishVolume
+                          calls. This field is optional, and  may be empty if no secret
+                          is required. If the secret object contains more than one
+                          secret, all secret references are passed.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      readOnly:
+                        description: readOnly specifies a read-only configuration
+                          for the volume. Defaults to false (read/write).
+                        type: boolean
+                      volumeAttributes:
+                        additionalProperties:
+                          type: string
+                        description: volumeAttributes stores driver-specific properties
+                          that are passed to the CSI driver. Consult your driver's
+                          documentation for supported values.
+                        type: object
+                    required:
+                    - driver
+                    type: object
+                  downwardAPI:
+                    description: downwardAPI represents downward API about the pod
+                      that should populate this volume
+                    properties:
+                      defaultMode:
+                        description: 'Optional: mode bits to use on created files
+                          by default. Must be a Optional: mode bits used to set permissions
+                          on created files by default. Must be an octal value between
+                          0000 and 0777 or a decimal value between 0 and 511. YAML
+                          accepts both octal and decimal values, JSON requires decimal
+                          values for mode bits. Defaults to 0644. Directories within
+                          the path are not affected by this setting. This might be
+                          in conflict with other options that affect the file mode,
+                          like fsGroup, and the result can be other mode bits set.'
+                        format: int32
+                        type: integer
+                      items:
+                        description: Items is a list of downward API volume file
+                        items:
+                          description: DownwardAPIVolumeFile represents information
+                            to create the file containing the pod field
+                          properties:
+                            fieldRef:
+                              description: 'Required: Selects a field of the pod:
+                                only annotations, labels, name and namespace are supported.'
+                              properties:
+                                apiVersion:
+                                  description: Version of the schema the FieldPath
+                                    is written in terms of, defaults to "v1".
+                                  type: string
+                                fieldPath:
+                                  description: Path of the field to select in the
+                                    specified API version.
+                                  type: string
+                              required:
+                              - fieldPath
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            mode:
+                              description: 'Optional: mode bits used to set permissions
+                                on this file, must be an octal value between 0000
+                                and 0777 or a decimal value between 0 and 511. YAML
+                                accepts both octal and decimal values, JSON requires
+                                decimal values for mode bits. If not specified, the
+                                volume defaultMode will be used. This might be in
+                                conflict with other options that affect the file mode,
+                                like fsGroup, and the result can be other mode bits
+                                set.'
+                              format: int32
+                              type: integer
+                            path:
+                              description: 'Required: Path is  the relative path name
+                                of the file to be created. Must not be absolute or
+                                contain the ''..'' path. Must be utf-8 encoded. The
+                                first item of the relative path must not start with
+                                ''..'''
+                              type: string
+                            resourceFieldRef:
+                              description: 'Selects a resource of the container: only
+                                resources limits and requests (limits.cpu, limits.memory,
+                                requests.cpu and requests.memory) are currently supported.'
+                              properties:
+                                containerName:
+                                  description: 'Container name: required for volumes,
+                                    optional for env vars'
+                                  type: string
+                                divisor:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: Specifies the output format of the
+                                    exposed resources, defaults to "1"
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                resource:
+                                  description: 'Required: resource to select'
+                                  type: string
+                              required:
+                              - resource
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          required:
+                          - path
+                          type: object
+                        type: array
+                    type: object
+                  emptyDir:
+                    description: 'emptyDir represents a temporary directory that shares
+                      a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                    properties:
+                      medium:
+                        description: 'medium represents what type of storage medium
+                          should back this directory. The default is "" which means
+                          to use the node''s default medium. Must be an empty string
+                          (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                        type: string
+                      sizeLimit:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        description: 'sizeLimit is the total amount of local storage
+                          required for this EmptyDir volume. The size limit is also
+                          applicable for memory medium. The maximum usage on memory
+                          medium EmptyDir would be the minimum value between the SizeLimit
+                          specified here and the sum of memory limits of all containers
+                          in a pod. The default is nil which means that the limit
+                          is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir'
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
+                    type: object
+                  ephemeral:
+                    description: "ephemeral represents a volume that is handled by
+                      a cluster storage driver. The volume's lifecycle is tied to
+                      the pod that defines it - it will be created before the pod
+                      starts, and deleted when the pod is removed. \n Use this if:
+                      a) the volume is only needed while the pod runs, b) features
+                      of normal volumes like restoring from snapshot or capacity tracking
+                      are needed, c) the storage driver is specified through a storage
+                      class, and d) the storage driver supports dynamic volume provisioning
+                      through a PersistentVolumeClaim (see EphemeralVolumeSource for
+                      more information on the connection between this volume type
+                      and PersistentVolumeClaim). \n Use PersistentVolumeClaim or
+                      one of the vendor-specific APIs for volumes that persist for
+                      longer than the lifecycle of an individual pod. \n Use CSI for
+                      light-weight local ephemeral volumes if the CSI driver is meant
+                      to be used that way - see the documentation of the driver for
+                      more information. \n A pod can use both types of ephemeral volumes
+                      and persistent volumes at the same time."
+                    properties:
+                      volumeClaimTemplate:
+                        description: "Will be used to create a stand-alone PVC to
+                          provision the volume. The pod in which this EphemeralVolumeSource
+                          is embedded will be the owner of the PVC, i.e. the PVC will
+                          be deleted together with the pod.  The name of the PVC will
+                          be `<pod name>-<volume name>` where `<volume name>` is the
+                          name from the `PodSpec.Volumes` array entry. Pod validation
+                          will reject the pod if the concatenated name is not valid
+                          for a PVC (for example, too long). \n An existing PVC with
+                          that name that is not owned by the pod will *not* be used
+                          for the pod to avoid using an unrelated volume by mistake.
+                          Starting the pod is then blocked until the unrelated PVC
+                          is removed. If such a pre-created PVC is meant to be used
+                          by the pod, the PVC has to updated with an owner reference
+                          to the pod once the pod exists. Normally this should not
+                          be necessary, but it may be useful when manually reconstructing
+                          a broken cluster. \n This field is read-only and no changes
+                          will be made by Kubernetes to the PVC after it has been
+                          created. \n Required, must not be nil."
+                        properties:
+                          metadata:
+                            description: May contain labels and annotations that will
+                              be copied into the PVC when creating it. No other fields
+                              are allowed and will be rejected during validation.
+                            properties:
+                              annotations:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              finalizers:
+                                items:
+                                  type: string
+                                type: array
+                              labels:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              name:
+                                type: string
+                              namespace:
+                                type: string
+                            type: object
+                          spec:
+                            description: The specification for the PersistentVolumeClaim.
+                              The entire content is copied unchanged into the PVC
+                              that gets created from this template. The same fields
+                              as in a PersistentVolumeClaim are also valid here.
+                            properties:
+                              accessModes:
+                                description: 'accessModes contains the desired access
+                                  modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1'
+                                items:
+                                  type: string
+                                type: array
+                              dataSource:
+                                description: 'dataSource field can be used to specify
+                                  either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                  * An existing PVC (PersistentVolumeClaim) If the
+                                  provisioner or an external controller can support
+                                  the specified data source, it will create a new
+                                  volume based on the contents of the specified data
+                                  source. When the AnyVolumeDataSource feature gate
+                                  is enabled, dataSource contents will be copied to
+                                  dataSourceRef, and dataSourceRef contents will be
+                                  copied to dataSource when dataSourceRef.namespace
+                                  is not specified. If the namespace is specified,
+                                  then dataSourceRef will not be copied to dataSource.'
+                                properties:
+                                  apiGroup:
+                                    description: APIGroup is the group for the resource
+                                      being referenced. If APIGroup is not specified,
+                                      the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is
+                                      required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              dataSourceRef:
+                                description: 'dataSourceRef specifies the object from
+                                  which to populate the volume with data, if a non-empty
+                                  volume is desired. This may be any object from a
+                                  non-empty API group (non core object) or a PersistentVolumeClaim
+                                  object. When this field is specified, volume binding
+                                  will only succeed if the type of the specified object
+                                  matches some installed volume populator or dynamic
+                                  provisioner. This field will replace the functionality
+                                  of the dataSource field and as such if both fields
+                                  are non-empty, they must have the same value. For
+                                  backwards compatibility, when namespace isn''t specified
+                                  in dataSourceRef, both fields (dataSource and dataSourceRef)
+                                  will be set to the same value automatically if one
+                                  of them is empty and the other is non-empty. When
+                                  namespace is specified in dataSourceRef, dataSource
+                                  isn''t set to the same value and must be empty.
+                                  There are three important differences between dataSource
+                                  and dataSourceRef: * While dataSource only allows
+                                  two specific types of objects, dataSourceRef allows
+                                  any non-core object, as well as PersistentVolumeClaim
+                                  objects. * While dataSource ignores disallowed values
+                                  (dropping them), dataSourceRef preserves all values,
+                                  and generates an error if a disallowed value is
+                                  specified. * While dataSource only allows local
+                                  objects, dataSourceRef allows objects in any namespaces.
+                                  (Beta) Using this field requires the AnyVolumeDataSource
+                                  feature gate to be enabled. (Alpha) Using the namespace
+                                  field of dataSourceRef requires the CrossNamespaceVolumeDataSource
+                                  feature gate to be enabled.'
+                                properties:
+                                  apiGroup:
+                                    description: APIGroup is the group for the resource
+                                      being referenced. If APIGroup is not specified,
+                                      the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is
+                                      required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                  namespace:
+                                    description: Namespace is the namespace of resource
+                                      being referenced Note that when a namespace
+                                      is specified, a gateway.networking.k8s.io/ReferenceGrant
+                                      object is required in the referent namespace
+                                      to allow that namespace's owner to accept the
+                                      reference. See the ReferenceGrant documentation
+                                      for details. (Alpha) This field requires the
+                                      CrossNamespaceVolumeDataSource feature gate
+                                      to be enabled.
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                              resources:
+                                description: 'resources represents the minimum resources
+                                  the volume should have. If RecoverVolumeExpansionFailure
+                                  feature is enabled users are allowed to specify
+                                  resource requirements that are lower than previous
+                                  value but must still be higher than capacity recorded
+                                  in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
+                                properties:
+                                  claims:
+                                    description: "Claims lists the names of resources,
+                                      defined in spec.resourceClaims, that are used
+                                      by this container. \n This is an alpha field
+                                      and requires enabling the DynamicResourceAllocation
+                                      feature gate. \n This field is immutable. It
+                                      can only be set for containers."
+                                    items:
+                                      description: ResourceClaim references one entry
+                                        in PodSpec.ResourceClaims.
+                                      properties:
+                                        name:
+                                          description: Name must match the name of
+                                            one entry in pod.spec.resourceClaims of
+                                            the Pod where this field is used. It makes
+                                            that resource available inside a container.
+                                          type: string
+                                      required:
+                                      - name
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-map-keys:
+                                    - name
+                                    x-kubernetes-list-type: map
+                                  limits:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: 'Limits describes the maximum amount
+                                      of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                    type: object
+                                  requests:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: 'Requests describes the minimum amount
+                                      of compute resources required. If Requests is
+                                      omitted for a container, it defaults to Limits
+                                      if that is explicitly specified, otherwise to
+                                      an implementation-defined value. More info:
+                                      https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                    type: object
+                                type: object
+                              selector:
+                                description: selector is a label query over volumes
+                                  to consider for binding.
+                                properties:
+                                  matchExpressions:
+                                    description: matchExpressions is a list of label
+                                      selector requirements. The requirements are
+                                      ANDed.
+                                    items:
+                                      description: A label selector requirement is
+                                        a selector that contains values, a key, and
+                                        an operator that relates the key and values.
+                                      properties:
+                                        key:
+                                          description: key is the label key that the
+                                            selector applies to.
+                                          type: string
+                                        operator:
+                                          description: operator represents a key's
+                                            relationship to a set of values. Valid
+                                            operators are In, NotIn, Exists and DoesNotExist.
+                                          type: string
+                                        values:
+                                          description: values is an array of string
+                                            values. If the operator is In or NotIn,
+                                            the values array must be non-empty. If
+                                            the operator is Exists or DoesNotExist,
+                                            the values array must be empty. This array
+                                            is replaced during a strategic merge patch.
+                                          items:
+                                            type: string
+                                          type: array
+                                      required:
+                                      - key
+                                      - operator
+                                      type: object
+                                    type: array
+                                  matchLabels:
+                                    additionalProperties:
+                                      type: string
+                                    description: matchLabels is a map of {key,value}
+                                      pairs. A single {key,value} in the matchLabels
+                                      map is equivalent to an element of matchExpressions,
+                                      whose key field is "key", the operator is "In",
+                                      and the values array contains only "value".
+                                      The requirements are ANDed.
+                                    type: object
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              storageClassName:
+                                description: 'storageClassName is the name of the
+                                  StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
+                                type: string
+                              volumeMode:
+                                description: volumeMode defines what type of volume
+                                  is required by the claim. Value of Filesystem is
+                                  implied when not included in claim spec.
+                                type: string
+                              volumeName:
+                                description: volumeName is the binding reference to
+                                  the PersistentVolume backing this claim.
+                                type: string
+                            type: object
+                        required:
+                        - spec
+                        type: object
+                    type: object
+                  fc:
+                    description: fc represents a Fibre Channel resource that is attached
+                      to a kubelet's host machine and then exposed to the pod.
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. TODO: how do we prevent errors in the filesystem
+                          from compromising the machine'
+                        type: string
+                      lun:
+                        description: 'lun is Optional: FC target lun number'
+                        format: int32
+                        type: integer
+                      readOnly:
+                        description: 'readOnly is Optional: Defaults to false (read/write).
+                          ReadOnly here will force the ReadOnly setting in VolumeMounts.'
+                        type: boolean
+                      targetWWNs:
+                        description: 'targetWWNs is Optional: FC target worldwide
+                          names (WWNs)'
+                        items:
+                          type: string
+                        type: array
+                      wwids:
+                        description: 'wwids Optional: FC volume world wide identifiers
+                          (wwids) Either wwids or combination of targetWWNs and lun
+                          must be set, but not both simultaneously.'
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                  flexVolume:
+                    description: flexVolume represents a generic volume resource that
+                      is provisioned/attached using an exec based plugin.
+                    properties:
+                      driver:
+                        description: driver is the name of the driver to use for this
+                          volume.
+                        type: string
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". The default filesystem depends
+                          on FlexVolume script.
+                        type: string
+                      options:
+                        additionalProperties:
+                          type: string
+                        description: 'options is Optional: this field holds extra
+                          command options if any.'
+                        type: object
+                      readOnly:
+                        description: 'readOnly is Optional: defaults to false (read/write).
+                          ReadOnly here will force the ReadOnly setting in VolumeMounts.'
+                        type: boolean
+                      secretRef:
+                        description: 'secretRef is Optional: secretRef is reference
+                          to the secret object containing sensitive information to
+                          pass to the plugin scripts. This may be empty if no secret
+                          object is specified. If the secret object contains more
+                          than one secret, all secrets are passed to the plugin scripts.'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    required:
+                    - driver
+                    type: object
+                  flocker:
+                    description: flocker represents a Flocker volume attached to a
+                      kubelet's host machine. This depends on the Flocker control
+                      service being running
+                    properties:
+                      datasetName:
+                        description: datasetName is Name of the dataset stored as
+                          metadata -> name on the dataset for Flocker should be considered
+                          as deprecated
+                        type: string
+                      datasetUUID:
+                        description: datasetUUID is the UUID of the dataset. This
+                          is unique identifier of a Flocker dataset
+                        type: string
+                    type: object
+                  gcePersistentDisk:
+                    description: 'gcePersistentDisk represents a GCE Disk resource
+                      that is attached to a kubelet''s host machine and then exposed
+                      to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                    properties:
+                      fsType:
+                        description: 'fsType is filesystem type of the volume that
+                          you want to mount. Tip: Ensure that the filesystem type
+                          is supported by the host operating system. Examples: "ext4",
+                          "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      partition:
+                        description: 'partition is the partition in the volume that
+                          you want to mount. If omitted, the default is to mount by
+                          volume name. Examples: For volume /dev/sda1, you specify
+                          the partition as "1". Similarly, the volume partition for
+                          /dev/sda is "0" (or you can leave the property empty). More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                        format: int32
+                        type: integer
+                      pdName:
+                        description: 'pdName is unique name of the PD resource in
+                          GCE. Used to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the ReadOnly setting
+                          in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                        type: boolean
+                    required:
+                    - pdName
+                    type: object
+                  gitRepo:
+                    description: 'gitRepo represents a git repository at a particular
+                      revision. DEPRECATED: GitRepo is deprecated. To provision a
+                      container with a git repo, mount an EmptyDir into an InitContainer
+                      that clones the repo using git, then mount the EmptyDir into
+                      the Pod''s container.'
+                    properties:
+                      directory:
+                        description: directory is the target directory name. Must
+                          not contain or start with '..'.  If '.' is supplied, the
+                          volume directory will be the git repository.  Otherwise,
+                          if specified, the volume will contain the git repository
+                          in the subdirectory with the given name.
+                        type: string
+                      repository:
+                        description: repository is the URL
+                        type: string
+                      revision:
+                        description: revision is the commit hash for the specified
+                          revision.
+                        type: string
+                    required:
+                    - repository
+                    type: object
+                  glusterfs:
+                    description: 'glusterfs represents a Glusterfs mount on the host
+                      that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md'
+                    properties:
+                      endpoints:
+                        description: 'endpoints is the endpoint name that details
+                          Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                        type: string
+                      path:
+                        description: 'path is the Glusterfs volume path. More info:
+                          https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the Glusterfs volume
+                          to be mounted with read-only permissions. Defaults to false.
+                          More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                        type: boolean
+                    required:
+                    - endpoints
+                    - path
+                    type: object
+                  hostPath:
+                    description: 'hostPath represents a pre-existing file or directory
+                      on the host machine that is directly exposed to the container.
+                      This is generally used for system agents or other privileged
+                      things that are allowed to see the host machine. Most containers
+                      will NOT need this. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                      --- TODO(jonesdl) We need to restrict who can use host directory
+                      mounts and who can/can not mount host directories as read/write.'
+                    properties:
+                      path:
+                        description: 'path of the directory on the host. If the path
+                          is a symlink, it will follow the link to the real path.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                        type: string
+                      type:
+                        description: 'type for HostPath Volume Defaults to "" More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                        type: string
+                    required:
+                    - path
+                    type: object
+                  iscsi:
+                    description: 'iscsi represents an ISCSI Disk resource that is
+                      attached to a kubelet''s host machine and then exposed to the
+                      pod. More info: https://examples.k8s.io/volumes/iscsi/README.md'
+                    properties:
+                      chapAuthDiscovery:
+                        description: chapAuthDiscovery defines whether support iSCSI
+                          Discovery CHAP authentication
+                        type: boolean
+                      chapAuthSession:
+                        description: chapAuthSession defines whether support iSCSI
+                          Session CHAP authentication
+                        type: boolean
+                      fsType:
+                        description: 'fsType is the filesystem type of the volume
+                          that you want to mount. Tip: Ensure that the filesystem
+                          type is supported by the host operating system. Examples:
+                          "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      initiatorName:
+                        description: initiatorName is the custom iSCSI Initiator Name.
+                          If initiatorName is specified with iscsiInterface simultaneously,
+                          new iSCSI interface <target portal>:<volume name> will be
+                          created for the connection.
+                        type: string
+                      iqn:
+                        description: iqn is the target iSCSI Qualified Name.
+                        type: string
+                      iscsiInterface:
+                        description: iscsiInterface is the interface Name that uses
+                          an iSCSI transport. Defaults to 'default' (tcp).
+                        type: string
+                      lun:
+                        description: lun represents iSCSI Target Lun number.
+                        format: int32
+                        type: integer
+                      portals:
+                        description: portals is the iSCSI Target Portal List. The
+                          portal is either an IP or ip_addr:port if the port is other
+                          than default (typically TCP ports 860 and 3260).
+                        items:
+                          type: string
+                        type: array
+                      readOnly:
+                        description: readOnly here will force the ReadOnly setting
+                          in VolumeMounts. Defaults to false.
+                        type: boolean
+                      secretRef:
+                        description: secretRef is the CHAP Secret for iSCSI target
+                          and initiator authentication
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      targetPortal:
+                        description: targetPortal is iSCSI Target Portal. The Portal
+                          is either an IP or ip_addr:port if the port is other than
+                          default (typically TCP ports 860 and 3260).
+                        type: string
+                    required:
+                    - iqn
+                    - lun
+                    - targetPortal
+                    type: object
+                  nfs:
+                    description: 'nfs represents an NFS mount on the host that shares
+                      a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                    properties:
+                      path:
+                        description: 'path that is exported by the NFS server. More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the NFS export to be
+                          mounted with read-only permissions. Defaults to false. More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                        type: boolean
+                      server:
+                        description: 'server is the hostname or IP address of the
+                          NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                        type: string
+                    required:
+                    - path
+                    - server
+                    type: object
+                  persistentVolumeClaim:
+                    description: 'persistentVolumeClaimVolumeSource represents a reference
+                      to a PersistentVolumeClaim in the same namespace. More info:
+                      https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                    properties:
+                      claimName:
+                        description: 'claimName is the name of a PersistentVolumeClaim
+                          in the same namespace as the pod using this volume. More
+                          info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                        type: string
+                      readOnly:
+                        description: readOnly Will force the ReadOnly setting in VolumeMounts.
+                          Default false.
+                        type: boolean
+                    required:
+                    - claimName
+                    type: object
+                  photonPersistentDisk:
+                    description: photonPersistentDisk represents a PhotonController
+                      persistent disk attached and mounted on kubelets host machine
+                    properties:
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      pdID:
+                        description: pdID is the ID that identifies Photon Controller
+                          persistent disk
+                        type: string
+                    required:
+                    - pdID
+                    type: object
+                  portworxVolume:
+                    description: portworxVolume represents a portworx volume attached
+                      and mounted on kubelets host machine
+                    properties:
+                      fsType:
+                        description: fSType represents the filesystem type to mount
+                          Must be a filesystem type supported by the host operating
+                          system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      readOnly:
+                        description: readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      volumeID:
+                        description: volumeID uniquely identifies a Portworx volume
+                        type: string
+                    required:
+                    - volumeID
+                    type: object
+                  projected:
+                    description: projected items for all in one resources secrets,
+                      configmaps, and downward API
+                    properties:
+                      defaultMode:
+                        description: defaultMode are the mode bits used to set permissions
+                          on created files by default. Must be an octal value between
+                          0000 and 0777 or a decimal value between 0 and 511. YAML
+                          accepts both octal and decimal values, JSON requires decimal
+                          values for mode bits. Directories within the path are not
+                          affected by this setting. This might be in conflict with
+                          other options that affect the file mode, like fsGroup, and
+                          the result can be other mode bits set.
+                        format: int32
+                        type: integer
+                      sources:
+                        description: sources is the list of volume projections
+                        items:
+                          description: Projection that may be projected along with
+                            other supported volume types
+                          properties:
+                            configMap:
+                              description: configMap information about the configMap
+                                data to project
+                              properties:
+                                items:
+                                  description: items if unspecified, each key-value
+                                    pair in the Data field of the referenced ConfigMap
+                                    will be projected into the volume as a file whose
+                                    name is the key and content is the value. If specified,
+                                    the listed keys will be projected into the specified
+                                    paths, and unlisted keys will not be present.
+                                    If a key is specified which is not present in
+                                    the ConfigMap, the volume setup will error unless
+                                    it is marked optional. Paths must be relative
+                                    and may not contain the '..' path or start with
+                                    '..'.
+                                  items:
+                                    description: Maps a string key to a path within
+                                      a volume.
+                                    properties:
+                                      key:
+                                        description: key is the key to project.
+                                        type: string
+                                      mode:
+                                        description: 'mode is Optional: mode bits
+                                          used to set permissions on this file. Must
+                                          be an octal value between 0000 and 0777
+                                          or a decimal value between 0 and 511. YAML
+                                          accepts both octal and decimal values, JSON
+                                          requires decimal values for mode bits. If
+                                          not specified, the volume defaultMode will
+                                          be used. This might be in conflict with
+                                          other options that affect the file mode,
+                                          like fsGroup, and the result can be other
+                                          mode bits set.'
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        description: path is the relative path of
+                                          the file to map the key to. May not be an
+                                          absolute path. May not contain the path
+                                          element '..'. May not start with the string
+                                          '..'.
+                                        type: string
+                                    required:
+                                    - key
+                                    - path
+                                    type: object
+                                  type: array
+                                name:
+                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    TODO: Add other useful fields. apiVersion, kind,
+                                    uid?'
+                                  type: string
+                                optional:
+                                  description: optional specify whether the ConfigMap
+                                    or its keys must be defined
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            downwardAPI:
+                              description: downwardAPI information about the downwardAPI
+                                data to project
+                              properties:
+                                items:
+                                  description: Items is a list of DownwardAPIVolume
+                                    file
+                                  items:
+                                    description: DownwardAPIVolumeFile represents
+                                      information to create the file containing the
+                                      pod field
+                                    properties:
+                                      fieldRef:
+                                        description: 'Required: Selects a field of
+                                          the pod: only annotations, labels, name
+                                          and namespace are supported.'
+                                        properties:
+                                          apiVersion:
+                                            description: Version of the schema the
+                                              FieldPath is written in terms of, defaults
+                                              to "v1".
+                                            type: string
+                                          fieldPath:
+                                            description: Path of the field to select
+                                              in the specified API version.
+                                            type: string
+                                        required:
+                                        - fieldPath
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      mode:
+                                        description: 'Optional: mode bits used to
+                                          set permissions on this file, must be an
+                                          octal value between 0000 and 0777 or a decimal
+                                          value between 0 and 511. YAML accepts both
+                                          octal and decimal values, JSON requires
+                                          decimal values for mode bits. If not specified,
+                                          the volume defaultMode will be used. This
+                                          might be in conflict with other options
+                                          that affect the file mode, like fsGroup,
+                                          and the result can be other mode bits set.'
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        description: 'Required: Path is  the relative
+                                          path name of the file to be created. Must
+                                          not be absolute or contain the ''..'' path.
+                                          Must be utf-8 encoded. The first item of
+                                          the relative path must not start with ''..'''
+                                        type: string
+                                      resourceFieldRef:
+                                        description: 'Selects a resource of the container:
+                                          only resources limits and requests (limits.cpu,
+                                          limits.memory, requests.cpu and requests.memory)
+                                          are currently supported.'
+                                        properties:
+                                          containerName:
+                                            description: 'Container name: required
+                                              for volumes, optional for env vars'
+                                            type: string
+                                          divisor:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            description: Specifies the output format
+                                              of the exposed resources, defaults to
+                                              "1"
+                                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                            x-kubernetes-int-or-string: true
+                                          resource:
+                                            description: 'Required: resource to select'
+                                            type: string
+                                        required:
+                                        - resource
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    required:
+                                    - path
+                                    type: object
+                                  type: array
+                              type: object
+                            secret:
+                              description: secret information about the secret data
+                                to project
+                              properties:
+                                items:
+                                  description: items if unspecified, each key-value
+                                    pair in the Data field of the referenced Secret
+                                    will be projected into the volume as a file whose
+                                    name is the key and content is the value. If specified,
+                                    the listed keys will be projected into the specified
+                                    paths, and unlisted keys will not be present.
+                                    If a key is specified which is not present in
+                                    the Secret, the volume setup will error unless
+                                    it is marked optional. Paths must be relative
+                                    and may not contain the '..' path or start with
+                                    '..'.
+                                  items:
+                                    description: Maps a string key to a path within
+                                      a volume.
+                                    properties:
+                                      key:
+                                        description: key is the key to project.
+                                        type: string
+                                      mode:
+                                        description: 'mode is Optional: mode bits
+                                          used to set permissions on this file. Must
+                                          be an octal value between 0000 and 0777
+                                          or a decimal value between 0 and 511. YAML
+                                          accepts both octal and decimal values, JSON
+                                          requires decimal values for mode bits. If
+                                          not specified, the volume defaultMode will
+                                          be used. This might be in conflict with
+                                          other options that affect the file mode,
+                                          like fsGroup, and the result can be other
+                                          mode bits set.'
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        description: path is the relative path of
+                                          the file to map the key to. May not be an
+                                          absolute path. May not contain the path
+                                          element '..'. May not start with the string
+                                          '..'.
+                                        type: string
+                                    required:
+                                    - key
+                                    - path
+                                    type: object
+                                  type: array
+                                name:
+                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    TODO: Add other useful fields. apiVersion, kind,
+                                    uid?'
+                                  type: string
+                                optional:
+                                  description: optional field specify whether the
+                                    Secret or its key must be defined
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            serviceAccountToken:
+                              description: serviceAccountToken is information about
+                                the serviceAccountToken data to project
+                              properties:
+                                audience:
+                                  description: audience is the intended audience of
+                                    the token. A recipient of a token must identify
+                                    itself with an identifier specified in the audience
+                                    of the token, and otherwise should reject the
+                                    token. The audience defaults to the identifier
+                                    of the apiserver.
+                                  type: string
+                                expirationSeconds:
+                                  description: expirationSeconds is the requested
+                                    duration of validity of the service account token.
+                                    As the token approaches expiration, the kubelet
+                                    volume plugin will proactively rotate the service
+                                    account token. The kubelet will start trying to
+                                    rotate the token if the token is older than 80
+                                    percent of its time to live or if the token is
+                                    older than 24 hours.Defaults to 1 hour and must
+                                    be at least 10 minutes.
+                                  format: int64
+                                  type: integer
+                                path:
+                                  description: path is the path relative to the mount
+                                    point of the file to project the token into.
+                                  type: string
+                              required:
+                              - path
+                              type: object
+                          type: object
+                        type: array
+                    type: object
+                  quobyte:
+                    description: quobyte represents a Quobyte mount on the host that
+                      shares a pod's lifetime
+                    properties:
+                      group:
+                        description: group to map volume access to Default is no group
+                        type: string
+                      readOnly:
+                        description: readOnly here will force the Quobyte volume to
+                          be mounted with read-only permissions. Defaults to false.
+                        type: boolean
+                      registry:
+                        description: registry represents a single or multiple Quobyte
+                          Registry services specified as a string as host:port pair
+                          (multiple entries are separated with commas) which acts
+                          as the central registry for volumes
+                        type: string
+                      tenant:
+                        description: tenant owning the given Quobyte volume in the
+                          Backend Used with dynamically provisioned Quobyte volumes,
+                          value is set by the plugin
+                        type: string
+                      user:
+                        description: user to map volume access to Defaults to serivceaccount
+                          user
+                        type: string
+                      volume:
+                        description: volume is a string that references an already
+                          created Quobyte volume by name.
+                        type: string
+                    required:
+                    - registry
+                    - volume
+                    type: object
+                  rbd:
+                    description: 'rbd represents a Rados Block Device mount on the
+                      host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md'
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type of the volume
+                          that you want to mount. Tip: Ensure that the filesystem
+                          type is supported by the host operating system. Examples:
+                          "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      image:
+                        description: 'image is the rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                      keyring:
+                        description: 'keyring is the path to key ring for RBDUser.
+                          Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                      monitors:
+                        description: 'monitors is a collection of Ceph monitors. More
+                          info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        items:
+                          type: string
+                        type: array
+                      pool:
+                        description: 'pool is the rados pool name. Default is rbd.
+                          More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the ReadOnly setting
+                          in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: boolean
+                      secretRef:
+                        description: 'secretRef is name of the authentication secret
+                          for RBDUser. If provided overrides keyring. Default is nil.
+                          More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      user:
+                        description: 'user is the rados user name. Default is admin.
+                          More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                    required:
+                    - image
+                    - monitors
+                    type: object
+                  scaleIO:
+                    description: scaleIO represents a ScaleIO persistent volume attached
+                      and mounted on Kubernetes nodes.
+                    properties:
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Default is "xfs".
+                        type: string
+                      gateway:
+                        description: gateway is the host address of the ScaleIO API
+                          Gateway.
+                        type: string
+                      protectionDomain:
+                        description: protectionDomain is the name of the ScaleIO Protection
+                          Domain for the configured storage.
+                        type: string
+                      readOnly:
+                        description: readOnly Defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      secretRef:
+                        description: secretRef references to the secret for ScaleIO
+                          user and other sensitive information. If this is not provided,
+                          Login operation will fail.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      sslEnabled:
+                        description: sslEnabled Flag enable/disable SSL communication
+                          with Gateway, default false
+                        type: boolean
+                      storageMode:
+                        description: storageMode indicates whether the storage for
+                          a volume should be ThickProvisioned or ThinProvisioned.
+                          Default is ThinProvisioned.
+                        type: string
+                      storagePool:
+                        description: storagePool is the ScaleIO Storage Pool associated
+                          with the protection domain.
+                        type: string
+                      system:
+                        description: system is the name of the storage system as configured
+                          in ScaleIO.
+                        type: string
+                      volumeName:
+                        description: volumeName is the name of a volume already created
+                          in the ScaleIO system that is associated with this volume
+                          source.
+                        type: string
+                    required:
+                    - gateway
+                    - secretRef
+                    - system
+                    type: object
+                  secret:
+                    description: 'secret represents a secret that should populate
+                      this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                    properties:
+                      defaultMode:
+                        description: 'defaultMode is Optional: mode bits used to set
+                          permissions on created files by default. Must be an octal
+                          value between 0000 and 0777 or a decimal value between 0
+                          and 511. YAML accepts both octal and decimal values, JSON
+                          requires decimal values for mode bits. Defaults to 0644.
+                          Directories within the path are not affected by this setting.
+                          This might be in conflict with other options that affect
+                          the file mode, like fsGroup, and the result can be other
+                          mode bits set.'
+                        format: int32
+                        type: integer
+                      items:
+                        description: items If unspecified, each key-value pair in
+                          the Data field of the referenced Secret will be projected
+                          into the volume as a file whose name is the key and content
+                          is the value. If specified, the listed keys will be projected
+                          into the specified paths, and unlisted keys will not be
+                          present. If a key is specified which is not present in the
+                          Secret, the volume setup will error unless it is marked
+                          optional. Paths must be relative and may not contain the
+                          '..' path or start with '..'.
+                        items:
+                          description: Maps a string key to a path within a volume.
+                          properties:
+                            key:
+                              description: key is the key to project.
+                              type: string
+                            mode:
+                              description: 'mode is Optional: mode bits used to set
+                                permissions on this file. Must be an octal value between
+                                0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires
+                                decimal values for mode bits. If not specified, the
+                                volume defaultMode will be used. This might be in
+                                conflict with other options that affect the file mode,
+                                like fsGroup, and the result can be other mode bits
+                                set.'
+                              format: int32
+                              type: integer
+                            path:
+                              description: path is the relative path of the file to
+                                map the key to. May not be an absolute path. May not
+                                contain the path element '..'. May not start with
+                                the string '..'.
+                              type: string
+                          required:
+                          - key
+                          - path
+                          type: object
+                        type: array
+                      optional:
+                        description: optional field specify whether the Secret or
+                          its keys must be defined
+                        type: boolean
+                      secretName:
+                        description: 'secretName is the name of the secret in the
+                          pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                        type: string
+                    type: object
+                  storageos:
+                    description: storageOS represents a StorageOS volume attached
+                      and mounted on Kubernetes nodes.
+                    properties:
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      readOnly:
+                        description: readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      secretRef:
+                        description: secretRef specifies the secret to use for obtaining
+                          the StorageOS API credentials.  If not specified, default
+                          values will be attempted.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      volumeName:
+                        description: volumeName is the human-readable name of the
+                          StorageOS volume.  Volume names are only unique within a
+                          namespace.
+                        type: string
+                      volumeNamespace:
+                        description: volumeNamespace specifies the scope of the volume
+                          within StorageOS.  If no namespace is specified then the
+                          Pod's namespace will be used.  This allows the Kubernetes
+                          name scoping to be mirrored within StorageOS for tighter
+                          integration. Set VolumeName to any name to override the
+                          default behaviour. Set to "default" if you are not using
+                          namespaces within StorageOS. Namespaces that do not pre-exist
+                          within StorageOS will be created.
+                        type: string
+                    type: object
+                  vsphereVolume:
+                    description: vsphereVolume represents a vSphere volume attached
+                      and mounted on kubelets host machine
+                    properties:
+                      fsType:
+                        description: fsType is filesystem type to mount. Must be a
+                          filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      storagePolicyID:
+                        description: storagePolicyID is the storage Policy Based Management
+                          (SPBM) profile ID associated with the StoragePolicyName.
+                        type: string
+                      storagePolicyName:
+                        description: storagePolicyName is the storage Policy Based
+                          Management (SPBM) profile name.
+                        type: string
+                      volumePath:
+                        description: volumePath is the path that identifies vSphere
+                          volume vmdk
+                        type: string
+                    required:
+                    - volumePath
+                    type: object
+                type: object
               priorityClassName:
                 description: PriorityClassName represents the pod's priority class.
                 type: string
@@ -2303,7 +4014,8 @@ spec:
                   type: object
                 type: array
               replicas:
-                description: Numbers of the Fluentd instance
+                description: Numbers of the Fluentd instance Applicable when the mode
+                  is "collector", and will be ignored when the mode is "agent"
                 format: int32
                 type: integer
               resources:
@@ -2597,6 +4309,8 @@ spec:
                   for mapping network identities to claims in a way that maintains
                   the identity of a pod. Every claim in this list must have at least
                   one matching (by name) volumeMount in one container in the template.
+                  Applicable when the mode is "collector", and will be ignored when
+                  the mode is "agent"
                 items:
                   description: PersistentVolumeClaim is a user's request for and claim
                     to a persistent volume
diff --git a/controllers/consts.go b/controllers/consts.go
index d5aa268ff..3561a046e 100644
--- a/controllers/consts.go
+++ b/controllers/consts.go
@@ -11,4 +11,5 @@ var (
 	fluentdOwnerKey   = ".fluentd.metadata.controller"
 	fluentbitApiGVStr = fluentbitv1alpha2.SchemeGroupVersion.String()
 	fluentdApiGVStr   = fluentdv1alpha1.SchemeGroupVersion.String()
+	fluentdAgentMode  = "agent"
 )
diff --git a/controllers/fluent_controller_finalizer.go b/controllers/fluent_controller_finalizer.go
index f0ac6c84c..0844d4dc0 100644
--- a/controllers/fluent_controller_finalizer.go
+++ b/controllers/fluent_controller_finalizer.go
@@ -87,6 +87,16 @@ func (r *FluentdReconciler) delete(ctx context.Context, fd *fluentdv1alpha1.Flue
 		return err
 	}
 
+	ds := appsv1.DaemonSet{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      fd.Name,
+			Namespace: fd.Namespace,
+		},
+	}
+	if err := r.Delete(ctx, &ds); err != nil && !errors.IsNotFound(err) {
+		return err
+	}
+
 	svc := corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      fd.Name,
@@ -129,8 +139,18 @@ func (r *FluentdReconciler) mutate(obj client.Object, fd *fluentdv1alpha1.Fluent
 			return nil
 		}
 	case *appsv1.StatefulSet:
-		expected := operator.MakeStatefulset(*fd)
+		expected := operator.MakeStatefulSet(*fd)
 
+		return func() error {
+			o.Labels = expected.Labels
+			o.Spec = expected.Spec
+			if err := ctrl.SetControllerReference(fd, o, r.Scheme); err != nil {
+				return err
+			}
+			return nil
+		}
+	case *appsv1.DaemonSet:
+		expected := operator.MakeFluentdDaemonSet(*fd)
 		return func() error {
 			o.Labels = expected.Labels
 			o.Spec = expected.Spec
diff --git a/controllers/fluentd_controller.go b/controllers/fluentd_controller.go
index fada5638c..e2ef014d9 100644
--- a/controllers/fluentd_controller.go
+++ b/controllers/fluentd_controller.go
@@ -105,17 +105,44 @@ func (r *FluentdReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		return ctrl.Result{}, err
 	}
 
-	// Deploy Fluentd Statefulset
-	sts := operator.MakeStatefulset(fd)
-	if _, err := controllerutil.CreateOrPatch(ctx, r.Client, sts, r.mutate(sts, &fd)); err != nil {
-		return ctrl.Result{}, err
+	var err error
+	if fd.Spec.Mode == "agent" {
+		// Deploy Fluentd DaemonSet
+		ds := operator.MakeFluentdDaemonSet(fd)
+		_, err = controllerutil.CreateOrPatch(ctx, r.Client, ds, r.mutate(ds, &fd))
+		if err != nil {
+			return ctrl.Result{}, err
+		}
+		sts := appsv1.StatefulSet{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      fd.Name,
+				Namespace: fd.Namespace,
+			},
+		}
+		if err = r.Delete(ctx, &sts); err != nil && !errors.IsNotFound(err) {
+			return ctrl.Result{}, err
+		}
+	} else {
+		// Deploy Fluentd StatefulSet
+		sts := operator.MakeStatefulSet(fd)
+		_, err = controllerutil.CreateOrPatch(ctx, r.Client, sts, r.mutate(sts, &fd))
+		ds := appsv1.DaemonSet{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      fd.Name,
+				Namespace: fd.Namespace,
+			},
+		}
+		if err = r.Delete(ctx, &ds); err != nil && !errors.IsNotFound(err) {
+			return ctrl.Result{}, err
+		}
 	}
-
 	// Deploy Fluentd Service
 	if !fd.Spec.DisableService {
 		svc := operator.MakeFluentdService(fd)
-		if _, err := controllerutil.CreateOrPatch(ctx, r.Client, svc, r.mutate(svc, &fd)); err != nil {
-			return ctrl.Result{}, err
+		if len(svc.Spec.Ports) > 0 {
+			if _, err = controllerutil.CreateOrPatch(ctx, r.Client, svc, r.mutate(svc, &fd)); err != nil {
+				return ctrl.Result{}, err
+			}
 		}
 	}
 
@@ -139,6 +166,22 @@ func (r *FluentdReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		return err
 	}
 
+	if err := mgr.GetFieldIndexer().IndexField(context.Background(), &appsv1.DaemonSet{}, fluentdOwnerKey, func(rawObj client.Object) []string {
+		// grab the job object, extract the owner.
+		ds := rawObj.(*appsv1.DaemonSet)
+		owner := metav1.GetControllerOf(ds)
+		if owner == nil {
+			return nil
+		}
+
+		if owner.APIVersion != fluentdApiGVStr || owner.Kind != "Fluentd" {
+			return nil
+		}
+		return []string{owner.Name}
+	}); err != nil {
+		return err
+	}
+
 	if err := mgr.GetFieldIndexer().IndexField(context.Background(), &appsv1.StatefulSet{}, fluentdOwnerKey, func(rawObj client.Object) []string {
 		// grab the job object, extract the owner.
 		sts := rawObj.(*appsv1.StatefulSet)
@@ -174,6 +217,7 @@ func (r *FluentdReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&fluentdv1alpha1.Fluentd{}).
 		Owns(&corev1.ServiceAccount{}).
+		Owns(&appsv1.DaemonSet{}).
 		Owns(&appsv1.StatefulSet{}).
 		Owns(&corev1.Service{}).
 		Complete(r)
diff --git a/go.mod b/go.mod
index d1ce8e4bb..c7c35c777 100644
--- a/go.mod
+++ b/go.mod
@@ -58,12 +58,14 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/mod v0.10.0 // indirect
 	golang.org/x/net v0.10.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
 	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/term v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.9.1 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
@@ -72,7 +74,9 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
+	k8s.io/code-generator v0.26.1 // indirect
 	k8s.io/component-base v0.26.1 // indirect
+	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
 	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
 	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
diff --git a/go.sum b/go.sum
index 641313c9a..eedf76a5f 100644
--- a/go.sum
+++ b/go.sum
@@ -89,6 +89,7 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -349,6 +350,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 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.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -503,6 +506,7 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -513,6 +517,7 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
+golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -640,8 +645,13 @@ k8s.io/apimachinery v0.27.3 h1:Ubye8oBufD04l9QnNtW05idcOe9Z3GQN8+7PqmuVcUM=
 k8s.io/apimachinery v0.27.3/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
 k8s.io/client-go v0.26.3 h1:k1UY+KXfkxV2ScEL3gilKcF7761xkYsSD6BC9szIu8s=
 k8s.io/client-go v0.26.3/go.mod h1:ZPNu9lm8/dbRIPAgteN30RSXea6vrCpFvq+MateTUuQ=
+k8s.io/code-generator v0.26.1 h1:dusFDsnNSKlMFYhzIM0jAO1OlnTN5WYwQQ+Ai12IIlo=
+k8s.io/code-generator v0.26.1/go.mod h1:OMoJ5Dqx1wgaQzKgc+ZWaZPfGjdRq/Y3WubFrZmeI3I=
 k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
 k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
+k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
+k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
 k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
@@ -657,5 +667,6 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index 552aae100..a4f59cc1d 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -19414,6 +19414,166 @@ spec:
                         type: object
                     type: object
                 type: object
+              containerSecurityContext:
+                description: ContainerSecurityContext represents the security context
+                  for the fluentd container.
+                properties:
+                  allowPrivilegeEscalation:
+                    description: 'AllowPrivilegeEscalation controls whether a process
+                      can gain more privileges than its parent process. This bool
+                      directly controls if the no_new_privs flag will be set on the
+                      container process. AllowPrivilegeEscalation is true always when
+                      the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN
+                      Note that this field cannot be set when spec.os.name is windows.'
+                    type: boolean
+                  capabilities:
+                    description: The capabilities to add/drop when running containers.
+                      Defaults to the default set of capabilities granted by the container
+                      runtime. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    properties:
+                      add:
+                        description: Added capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                      drop:
+                        description: Removed capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                    type: object
+                  privileged:
+                    description: Run container in privileged mode. Processes in privileged
+                      containers are essentially equivalent to root on the host. Defaults
+                      to false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  procMount:
+                    description: procMount denotes the type of proc mount to use for
+                      the containers. The default is DefaultProcMount which uses the
+                      container runtime defaults for readonly paths and masked paths.
+                      This requires the ProcMountType feature flag to be enabled.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  readOnlyRootFilesystem:
+                    description: Whether this container has a read-only root filesystem.
+                      Default is false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  runAsGroup:
+                    description: The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: Indicates that the container must run as a non-root
+                      user. If true, the Kubelet will validate the image at runtime
+                      to ensure that it does not run as UID 0 (root) and fail to start
+                      the container if it does. If unset or false, no such validation
+                      will be performed. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in PodSecurityContext.  If set in both SecurityContext
+                      and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    description: The SELinux context to be applied to the container.
+                      If unspecified, the container runtime will allocate a random
+                      SELinux context for each container.  May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: The seccomp options to use by this container. If
+                      seccomp options are provided at both the pod & container level,
+                      the container options override the pod options. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: localhostProfile indicates a profile defined
+                          in a file on the node should be used. The profile must be
+                          preconfigured on the node to work. Must be a descending
+                          path, relative to the kubelet's configured seccomp profile
+                          location. Must only be set if type is "Localhost".
+                        type: string
+                      type:
+                        description: "type indicates which kind of seccomp profile
+                          will be applied. Valid options are: \n Localhost - a profile
+                          defined in a file on the node should be used. RuntimeDefault
+                          - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied."
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  windowsOptions:
+                    description: The Windows specific settings applied to all containers.
+                      If unspecified, the options from the PodSecurityContext will
+                      be used. If set in both SecurityContext and PodSecurityContext,
+                      the value specified in SecurityContext takes precedence. Note
+                      that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: GMSACredentialSpec is where the GMSA admission
+                          webhook (https://github.com/kubernetes-sigs/windows-gmsa)
+                          inlines the contents of the GMSA credential spec named by
+                          the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: HostProcess determines if a container should
+                          be run as a 'Host Process' container. This field is alpha-level
+                          and will only be honored by components that enable the WindowsHostProcessContainers
+                          feature flag. Setting this field without the feature flag
+                          will result in errors when validating the Pod. All of a
+                          Pod's containers must have the same effective HostProcess
+                          value (it is not allowed to have a mix of HostProcess containers
+                          and non-HostProcess containers).  In addition, if HostProcess
+                          is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: The UserName in Windows to run the entrypoint
+                          of the container process. Defaults to the user specified
+                          in image metadata if unspecified. May also be set in PodSecurityContext.
+                          If set in both SecurityContext and PodSecurityContext, the
+                          value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
               defaultFilterSelector:
                 description: Select cluster filter plugins used to filter for the
                   default cluster output
@@ -20395,11 +20555,1562 @@ spec:
                 - debug
                 - trace
                 type: string
+              mode:
+                default: collector
+                description: Mode to determine whether to run Fluentd as collector
+                  or agent.
+                enum:
+                - collector
+                - agent
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string
                 description: NodeSelector
                 type: object
+              positionDB:
+                description: Storage for position db. You will use it if tail input
+                  is enabled. Applicable when the mode is "agent", and will be ignored
+                  when the mode is "collector"
+                properties:
+                  awsElasticBlockStore:
+                    description: 'awsElasticBlockStore represents an AWS Disk resource
+                      that is attached to a kubelet''s host machine and then exposed
+                      to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type of the volume
+                          that you want to mount. Tip: Ensure that the filesystem
+                          type is supported by the host operating system. Examples:
+                          "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      partition:
+                        description: 'partition is the partition in the volume that
+                          you want to mount. If omitted, the default is to mount by
+                          volume name. Examples: For volume /dev/sda1, you specify
+                          the partition as "1". Similarly, the volume partition for
+                          /dev/sda is "0" (or you can leave the property empty).'
+                        format: int32
+                        type: integer
+                      readOnly:
+                        description: 'readOnly value true will force the readOnly
+                          setting in VolumeMounts. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                        type: boolean
+                      volumeID:
+                        description: 'volumeID is unique ID of the persistent disk
+                          resource in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                        type: string
+                    required:
+                    - volumeID
+                    type: object
+                  azureDisk:
+                    description: azureDisk represents an Azure Data Disk mount on
+                      the host and bind mount to the pod.
+                    properties:
+                      cachingMode:
+                        description: 'cachingMode is the Host Caching mode: None,
+                          Read Only, Read Write.'
+                        type: string
+                      diskName:
+                        description: diskName is the Name of the data disk in the
+                          blob storage
+                        type: string
+                      diskURI:
+                        description: diskURI is the URI of data disk in the blob storage
+                        type: string
+                      fsType:
+                        description: fsType is Filesystem type to mount. Must be a
+                          filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      kind:
+                        description: 'kind expected values are Shared: multiple blob
+                          disks per storage account  Dedicated: single blob disk per
+                          storage account  Managed: azure managed data disk (only
+                          in managed availability set). defaults to shared'
+                        type: string
+                      readOnly:
+                        description: readOnly Defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                    required:
+                    - diskName
+                    - diskURI
+                    type: object
+                  azureFile:
+                    description: azureFile represents an Azure File Service mount
+                      on the host and bind mount to the pod.
+                    properties:
+                      readOnly:
+                        description: readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      secretName:
+                        description: secretName is the  name of secret that contains
+                          Azure Storage Account Name and Key
+                        type: string
+                      shareName:
+                        description: shareName is the azure share Name
+                        type: string
+                    required:
+                    - secretName
+                    - shareName
+                    type: object
+                  cephfs:
+                    description: cephFS represents a Ceph FS mount on the host that
+                      shares a pod's lifetime
+                    properties:
+                      monitors:
+                        description: 'monitors is Required: Monitors is a collection
+                          of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        items:
+                          type: string
+                        type: array
+                      path:
+                        description: 'path is Optional: Used as the mounted root,
+                          rather than the full Ceph tree, default is /'
+                        type: string
+                      readOnly:
+                        description: 'readOnly is Optional: Defaults to false (read/write).
+                          ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                          More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        type: boolean
+                      secretFile:
+                        description: 'secretFile is Optional: SecretFile is the path
+                          to key ring for User, default is /etc/ceph/user.secret More
+                          info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        type: string
+                      secretRef:
+                        description: 'secretRef is Optional: SecretRef is reference
+                          to the authentication secret for User, default is empty.
+                          More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      user:
+                        description: 'user is optional: User is the rados user name,
+                          default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        type: string
+                    required:
+                    - monitors
+                    type: object
+                  cinder:
+                    description: 'cinder represents a cinder volume attached and mounted
+                      on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Examples: "ext4", "xfs", "ntfs". Implicitly inferred to
+                          be "ext4" if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                        type: string
+                      readOnly:
+                        description: 'readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts. More
+                          info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                        type: boolean
+                      secretRef:
+                        description: 'secretRef is optional: points to a secret object
+                          containing parameters used to connect to OpenStack.'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      volumeID:
+                        description: 'volumeID used to identify the volume in cinder.
+                          More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                        type: string
+                    required:
+                    - volumeID
+                    type: object
+                  configMap:
+                    description: configMap represents a configMap that should populate
+                      this volume
+                    properties:
+                      defaultMode:
+                        description: 'defaultMode is optional: mode bits used to set
+                          permissions on created files by default. Must be an octal
+                          value between 0000 and 0777 or a decimal value between 0
+                          and 511. YAML accepts both octal and decimal values, JSON
+                          requires decimal values for mode bits. Defaults to 0644.
+                          Directories within the path are not affected by this setting.
+                          This might be in conflict with other options that affect
+                          the file mode, like fsGroup, and the result can be other
+                          mode bits set.'
+                        format: int32
+                        type: integer
+                      items:
+                        description: items if unspecified, each key-value pair in
+                          the Data field of the referenced ConfigMap will be projected
+                          into the volume as a file whose name is the key and content
+                          is the value. If specified, the listed keys will be projected
+                          into the specified paths, and unlisted keys will not be
+                          present. If a key is specified which is not present in the
+                          ConfigMap, the volume setup will error unless it is marked
+                          optional. Paths must be relative and may not contain the
+                          '..' path or start with '..'.
+                        items:
+                          description: Maps a string key to a path within a volume.
+                          properties:
+                            key:
+                              description: key is the key to project.
+                              type: string
+                            mode:
+                              description: 'mode is Optional: mode bits used to set
+                                permissions on this file. Must be an octal value between
+                                0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires
+                                decimal values for mode bits. If not specified, the
+                                volume defaultMode will be used. This might be in
+                                conflict with other options that affect the file mode,
+                                like fsGroup, and the result can be other mode bits
+                                set.'
+                              format: int32
+                              type: integer
+                            path:
+                              description: path is the relative path of the file to
+                                map the key to. May not be an absolute path. May not
+                                contain the path element '..'. May not start with
+                                the string '..'.
+                              type: string
+                          required:
+                          - key
+                          - path
+                          type: object
+                        type: array
+                      name:
+                        description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          TODO: Add other useful fields. apiVersion, kind, uid?'
+                        type: string
+                      optional:
+                        description: optional specify whether the ConfigMap or its
+                          keys must be defined
+                        type: boolean
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  csi:
+                    description: csi (Container Storage Interface) represents ephemeral
+                      storage that is handled by certain external CSI drivers (Beta
+                      feature).
+                    properties:
+                      driver:
+                        description: driver is the name of the CSI driver that handles
+                          this volume. Consult with your admin for the correct name
+                          as registered in the cluster.
+                        type: string
+                      fsType:
+                        description: fsType to mount. Ex. "ext4", "xfs", "ntfs". If
+                          not provided, the empty value is passed to the associated
+                          CSI driver which will determine the default filesystem to
+                          apply.
+                        type: string
+                      nodePublishSecretRef:
+                        description: nodePublishSecretRef is a reference to the secret
+                          object containing sensitive information to pass to the CSI
+                          driver to complete the CSI NodePublishVolume and NodeUnpublishVolume
+                          calls. This field is optional, and  may be empty if no secret
+                          is required. If the secret object contains more than one
+                          secret, all secret references are passed.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      readOnly:
+                        description: readOnly specifies a read-only configuration
+                          for the volume. Defaults to false (read/write).
+                        type: boolean
+                      volumeAttributes:
+                        additionalProperties:
+                          type: string
+                        description: volumeAttributes stores driver-specific properties
+                          that are passed to the CSI driver. Consult your driver's
+                          documentation for supported values.
+                        type: object
+                    required:
+                    - driver
+                    type: object
+                  downwardAPI:
+                    description: downwardAPI represents downward API about the pod
+                      that should populate this volume
+                    properties:
+                      defaultMode:
+                        description: 'Optional: mode bits to use on created files
+                          by default. Must be a Optional: mode bits used to set permissions
+                          on created files by default. Must be an octal value between
+                          0000 and 0777 or a decimal value between 0 and 511. YAML
+                          accepts both octal and decimal values, JSON requires decimal
+                          values for mode bits. Defaults to 0644. Directories within
+                          the path are not affected by this setting. This might be
+                          in conflict with other options that affect the file mode,
+                          like fsGroup, and the result can be other mode bits set.'
+                        format: int32
+                        type: integer
+                      items:
+                        description: Items is a list of downward API volume file
+                        items:
+                          description: DownwardAPIVolumeFile represents information
+                            to create the file containing the pod field
+                          properties:
+                            fieldRef:
+                              description: 'Required: Selects a field of the pod:
+                                only annotations, labels, name and namespace are supported.'
+                              properties:
+                                apiVersion:
+                                  description: Version of the schema the FieldPath
+                                    is written in terms of, defaults to "v1".
+                                  type: string
+                                fieldPath:
+                                  description: Path of the field to select in the
+                                    specified API version.
+                                  type: string
+                              required:
+                              - fieldPath
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            mode:
+                              description: 'Optional: mode bits used to set permissions
+                                on this file, must be an octal value between 0000
+                                and 0777 or a decimal value between 0 and 511. YAML
+                                accepts both octal and decimal values, JSON requires
+                                decimal values for mode bits. If not specified, the
+                                volume defaultMode will be used. This might be in
+                                conflict with other options that affect the file mode,
+                                like fsGroup, and the result can be other mode bits
+                                set.'
+                              format: int32
+                              type: integer
+                            path:
+                              description: 'Required: Path is  the relative path name
+                                of the file to be created. Must not be absolute or
+                                contain the ''..'' path. Must be utf-8 encoded. The
+                                first item of the relative path must not start with
+                                ''..'''
+                              type: string
+                            resourceFieldRef:
+                              description: 'Selects a resource of the container: only
+                                resources limits and requests (limits.cpu, limits.memory,
+                                requests.cpu and requests.memory) are currently supported.'
+                              properties:
+                                containerName:
+                                  description: 'Container name: required for volumes,
+                                    optional for env vars'
+                                  type: string
+                                divisor:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: Specifies the output format of the
+                                    exposed resources, defaults to "1"
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                resource:
+                                  description: 'Required: resource to select'
+                                  type: string
+                              required:
+                              - resource
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          required:
+                          - path
+                          type: object
+                        type: array
+                    type: object
+                  emptyDir:
+                    description: 'emptyDir represents a temporary directory that shares
+                      a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                    properties:
+                      medium:
+                        description: 'medium represents what type of storage medium
+                          should back this directory. The default is "" which means
+                          to use the node''s default medium. Must be an empty string
+                          (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                        type: string
+                      sizeLimit:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        description: 'sizeLimit is the total amount of local storage
+                          required for this EmptyDir volume. The size limit is also
+                          applicable for memory medium. The maximum usage on memory
+                          medium EmptyDir would be the minimum value between the SizeLimit
+                          specified here and the sum of memory limits of all containers
+                          in a pod. The default is nil which means that the limit
+                          is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir'
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
+                    type: object
+                  ephemeral:
+                    description: "ephemeral represents a volume that is handled by
+                      a cluster storage driver. The volume's lifecycle is tied to
+                      the pod that defines it - it will be created before the pod
+                      starts, and deleted when the pod is removed. \n Use this if:
+                      a) the volume is only needed while the pod runs, b) features
+                      of normal volumes like restoring from snapshot or capacity tracking
+                      are needed, c) the storage driver is specified through a storage
+                      class, and d) the storage driver supports dynamic volume provisioning
+                      through a PersistentVolumeClaim (see EphemeralVolumeSource for
+                      more information on the connection between this volume type
+                      and PersistentVolumeClaim). \n Use PersistentVolumeClaim or
+                      one of the vendor-specific APIs for volumes that persist for
+                      longer than the lifecycle of an individual pod. \n Use CSI for
+                      light-weight local ephemeral volumes if the CSI driver is meant
+                      to be used that way - see the documentation of the driver for
+                      more information. \n A pod can use both types of ephemeral volumes
+                      and persistent volumes at the same time."
+                    properties:
+                      volumeClaimTemplate:
+                        description: "Will be used to create a stand-alone PVC to
+                          provision the volume. The pod in which this EphemeralVolumeSource
+                          is embedded will be the owner of the PVC, i.e. the PVC will
+                          be deleted together with the pod.  The name of the PVC will
+                          be `<pod name>-<volume name>` where `<volume name>` is the
+                          name from the `PodSpec.Volumes` array entry. Pod validation
+                          will reject the pod if the concatenated name is not valid
+                          for a PVC (for example, too long). \n An existing PVC with
+                          that name that is not owned by the pod will *not* be used
+                          for the pod to avoid using an unrelated volume by mistake.
+                          Starting the pod is then blocked until the unrelated PVC
+                          is removed. If such a pre-created PVC is meant to be used
+                          by the pod, the PVC has to updated with an owner reference
+                          to the pod once the pod exists. Normally this should not
+                          be necessary, but it may be useful when manually reconstructing
+                          a broken cluster. \n This field is read-only and no changes
+                          will be made by Kubernetes to the PVC after it has been
+                          created. \n Required, must not be nil."
+                        properties:
+                          metadata:
+                            description: May contain labels and annotations that will
+                              be copied into the PVC when creating it. No other fields
+                              are allowed and will be rejected during validation.
+                            properties:
+                              annotations:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              finalizers:
+                                items:
+                                  type: string
+                                type: array
+                              labels:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              name:
+                                type: string
+                              namespace:
+                                type: string
+                            type: object
+                          spec:
+                            description: The specification for the PersistentVolumeClaim.
+                              The entire content is copied unchanged into the PVC
+                              that gets created from this template. The same fields
+                              as in a PersistentVolumeClaim are also valid here.
+                            properties:
+                              accessModes:
+                                description: 'accessModes contains the desired access
+                                  modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1'
+                                items:
+                                  type: string
+                                type: array
+                              dataSource:
+                                description: 'dataSource field can be used to specify
+                                  either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                  * An existing PVC (PersistentVolumeClaim) If the
+                                  provisioner or an external controller can support
+                                  the specified data source, it will create a new
+                                  volume based on the contents of the specified data
+                                  source. When the AnyVolumeDataSource feature gate
+                                  is enabled, dataSource contents will be copied to
+                                  dataSourceRef, and dataSourceRef contents will be
+                                  copied to dataSource when dataSourceRef.namespace
+                                  is not specified. If the namespace is specified,
+                                  then dataSourceRef will not be copied to dataSource.'
+                                properties:
+                                  apiGroup:
+                                    description: APIGroup is the group for the resource
+                                      being referenced. If APIGroup is not specified,
+                                      the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is
+                                      required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              dataSourceRef:
+                                description: 'dataSourceRef specifies the object from
+                                  which to populate the volume with data, if a non-empty
+                                  volume is desired. This may be any object from a
+                                  non-empty API group (non core object) or a PersistentVolumeClaim
+                                  object. When this field is specified, volume binding
+                                  will only succeed if the type of the specified object
+                                  matches some installed volume populator or dynamic
+                                  provisioner. This field will replace the functionality
+                                  of the dataSource field and as such if both fields
+                                  are non-empty, they must have the same value. For
+                                  backwards compatibility, when namespace isn''t specified
+                                  in dataSourceRef, both fields (dataSource and dataSourceRef)
+                                  will be set to the same value automatically if one
+                                  of them is empty and the other is non-empty. When
+                                  namespace is specified in dataSourceRef, dataSource
+                                  isn''t set to the same value and must be empty.
+                                  There are three important differences between dataSource
+                                  and dataSourceRef: * While dataSource only allows
+                                  two specific types of objects, dataSourceRef allows
+                                  any non-core object, as well as PersistentVolumeClaim
+                                  objects. * While dataSource ignores disallowed values
+                                  (dropping them), dataSourceRef preserves all values,
+                                  and generates an error if a disallowed value is
+                                  specified. * While dataSource only allows local
+                                  objects, dataSourceRef allows objects in any namespaces.
+                                  (Beta) Using this field requires the AnyVolumeDataSource
+                                  feature gate to be enabled. (Alpha) Using the namespace
+                                  field of dataSourceRef requires the CrossNamespaceVolumeDataSource
+                                  feature gate to be enabled.'
+                                properties:
+                                  apiGroup:
+                                    description: APIGroup is the group for the resource
+                                      being referenced. If APIGroup is not specified,
+                                      the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is
+                                      required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                  namespace:
+                                    description: Namespace is the namespace of resource
+                                      being referenced Note that when a namespace
+                                      is specified, a gateway.networking.k8s.io/ReferenceGrant
+                                      object is required in the referent namespace
+                                      to allow that namespace's owner to accept the
+                                      reference. See the ReferenceGrant documentation
+                                      for details. (Alpha) This field requires the
+                                      CrossNamespaceVolumeDataSource feature gate
+                                      to be enabled.
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                              resources:
+                                description: 'resources represents the minimum resources
+                                  the volume should have. If RecoverVolumeExpansionFailure
+                                  feature is enabled users are allowed to specify
+                                  resource requirements that are lower than previous
+                                  value but must still be higher than capacity recorded
+                                  in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
+                                properties:
+                                  claims:
+                                    description: "Claims lists the names of resources,
+                                      defined in spec.resourceClaims, that are used
+                                      by this container. \n This is an alpha field
+                                      and requires enabling the DynamicResourceAllocation
+                                      feature gate. \n This field is immutable. It
+                                      can only be set for containers."
+                                    items:
+                                      description: ResourceClaim references one entry
+                                        in PodSpec.ResourceClaims.
+                                      properties:
+                                        name:
+                                          description: Name must match the name of
+                                            one entry in pod.spec.resourceClaims of
+                                            the Pod where this field is used. It makes
+                                            that resource available inside a container.
+                                          type: string
+                                      required:
+                                      - name
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-map-keys:
+                                    - name
+                                    x-kubernetes-list-type: map
+                                  limits:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: 'Limits describes the maximum amount
+                                      of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                    type: object
+                                  requests:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: 'Requests describes the minimum amount
+                                      of compute resources required. If Requests is
+                                      omitted for a container, it defaults to Limits
+                                      if that is explicitly specified, otherwise to
+                                      an implementation-defined value. More info:
+                                      https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                    type: object
+                                type: object
+                              selector:
+                                description: selector is a label query over volumes
+                                  to consider for binding.
+                                properties:
+                                  matchExpressions:
+                                    description: matchExpressions is a list of label
+                                      selector requirements. The requirements are
+                                      ANDed.
+                                    items:
+                                      description: A label selector requirement is
+                                        a selector that contains values, a key, and
+                                        an operator that relates the key and values.
+                                      properties:
+                                        key:
+                                          description: key is the label key that the
+                                            selector applies to.
+                                          type: string
+                                        operator:
+                                          description: operator represents a key's
+                                            relationship to a set of values. Valid
+                                            operators are In, NotIn, Exists and DoesNotExist.
+                                          type: string
+                                        values:
+                                          description: values is an array of string
+                                            values. If the operator is In or NotIn,
+                                            the values array must be non-empty. If
+                                            the operator is Exists or DoesNotExist,
+                                            the values array must be empty. This array
+                                            is replaced during a strategic merge patch.
+                                          items:
+                                            type: string
+                                          type: array
+                                      required:
+                                      - key
+                                      - operator
+                                      type: object
+                                    type: array
+                                  matchLabels:
+                                    additionalProperties:
+                                      type: string
+                                    description: matchLabels is a map of {key,value}
+                                      pairs. A single {key,value} in the matchLabels
+                                      map is equivalent to an element of matchExpressions,
+                                      whose key field is "key", the operator is "In",
+                                      and the values array contains only "value".
+                                      The requirements are ANDed.
+                                    type: object
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              storageClassName:
+                                description: 'storageClassName is the name of the
+                                  StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
+                                type: string
+                              volumeMode:
+                                description: volumeMode defines what type of volume
+                                  is required by the claim. Value of Filesystem is
+                                  implied when not included in claim spec.
+                                type: string
+                              volumeName:
+                                description: volumeName is the binding reference to
+                                  the PersistentVolume backing this claim.
+                                type: string
+                            type: object
+                        required:
+                        - spec
+                        type: object
+                    type: object
+                  fc:
+                    description: fc represents a Fibre Channel resource that is attached
+                      to a kubelet's host machine and then exposed to the pod.
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. TODO: how do we prevent errors in the filesystem
+                          from compromising the machine'
+                        type: string
+                      lun:
+                        description: 'lun is Optional: FC target lun number'
+                        format: int32
+                        type: integer
+                      readOnly:
+                        description: 'readOnly is Optional: Defaults to false (read/write).
+                          ReadOnly here will force the ReadOnly setting in VolumeMounts.'
+                        type: boolean
+                      targetWWNs:
+                        description: 'targetWWNs is Optional: FC target worldwide
+                          names (WWNs)'
+                        items:
+                          type: string
+                        type: array
+                      wwids:
+                        description: 'wwids Optional: FC volume world wide identifiers
+                          (wwids) Either wwids or combination of targetWWNs and lun
+                          must be set, but not both simultaneously.'
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                  flexVolume:
+                    description: flexVolume represents a generic volume resource that
+                      is provisioned/attached using an exec based plugin.
+                    properties:
+                      driver:
+                        description: driver is the name of the driver to use for this
+                          volume.
+                        type: string
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". The default filesystem depends
+                          on FlexVolume script.
+                        type: string
+                      options:
+                        additionalProperties:
+                          type: string
+                        description: 'options is Optional: this field holds extra
+                          command options if any.'
+                        type: object
+                      readOnly:
+                        description: 'readOnly is Optional: defaults to false (read/write).
+                          ReadOnly here will force the ReadOnly setting in VolumeMounts.'
+                        type: boolean
+                      secretRef:
+                        description: 'secretRef is Optional: secretRef is reference
+                          to the secret object containing sensitive information to
+                          pass to the plugin scripts. This may be empty if no secret
+                          object is specified. If the secret object contains more
+                          than one secret, all secrets are passed to the plugin scripts.'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    required:
+                    - driver
+                    type: object
+                  flocker:
+                    description: flocker represents a Flocker volume attached to a
+                      kubelet's host machine. This depends on the Flocker control
+                      service being running
+                    properties:
+                      datasetName:
+                        description: datasetName is Name of the dataset stored as
+                          metadata -> name on the dataset for Flocker should be considered
+                          as deprecated
+                        type: string
+                      datasetUUID:
+                        description: datasetUUID is the UUID of the dataset. This
+                          is unique identifier of a Flocker dataset
+                        type: string
+                    type: object
+                  gcePersistentDisk:
+                    description: 'gcePersistentDisk represents a GCE Disk resource
+                      that is attached to a kubelet''s host machine and then exposed
+                      to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                    properties:
+                      fsType:
+                        description: 'fsType is filesystem type of the volume that
+                          you want to mount. Tip: Ensure that the filesystem type
+                          is supported by the host operating system. Examples: "ext4",
+                          "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      partition:
+                        description: 'partition is the partition in the volume that
+                          you want to mount. If omitted, the default is to mount by
+                          volume name. Examples: For volume /dev/sda1, you specify
+                          the partition as "1". Similarly, the volume partition for
+                          /dev/sda is "0" (or you can leave the property empty). More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                        format: int32
+                        type: integer
+                      pdName:
+                        description: 'pdName is unique name of the PD resource in
+                          GCE. Used to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the ReadOnly setting
+                          in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                        type: boolean
+                    required:
+                    - pdName
+                    type: object
+                  gitRepo:
+                    description: 'gitRepo represents a git repository at a particular
+                      revision. DEPRECATED: GitRepo is deprecated. To provision a
+                      container with a git repo, mount an EmptyDir into an InitContainer
+                      that clones the repo using git, then mount the EmptyDir into
+                      the Pod''s container.'
+                    properties:
+                      directory:
+                        description: directory is the target directory name. Must
+                          not contain or start with '..'.  If '.' is supplied, the
+                          volume directory will be the git repository.  Otherwise,
+                          if specified, the volume will contain the git repository
+                          in the subdirectory with the given name.
+                        type: string
+                      repository:
+                        description: repository is the URL
+                        type: string
+                      revision:
+                        description: revision is the commit hash for the specified
+                          revision.
+                        type: string
+                    required:
+                    - repository
+                    type: object
+                  glusterfs:
+                    description: 'glusterfs represents a Glusterfs mount on the host
+                      that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md'
+                    properties:
+                      endpoints:
+                        description: 'endpoints is the endpoint name that details
+                          Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                        type: string
+                      path:
+                        description: 'path is the Glusterfs volume path. More info:
+                          https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the Glusterfs volume
+                          to be mounted with read-only permissions. Defaults to false.
+                          More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                        type: boolean
+                    required:
+                    - endpoints
+                    - path
+                    type: object
+                  hostPath:
+                    description: 'hostPath represents a pre-existing file or directory
+                      on the host machine that is directly exposed to the container.
+                      This is generally used for system agents or other privileged
+                      things that are allowed to see the host machine. Most containers
+                      will NOT need this. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                      --- TODO(jonesdl) We need to restrict who can use host directory
+                      mounts and who can/can not mount host directories as read/write.'
+                    properties:
+                      path:
+                        description: 'path of the directory on the host. If the path
+                          is a symlink, it will follow the link to the real path.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                        type: string
+                      type:
+                        description: 'type for HostPath Volume Defaults to "" More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                        type: string
+                    required:
+                    - path
+                    type: object
+                  iscsi:
+                    description: 'iscsi represents an ISCSI Disk resource that is
+                      attached to a kubelet''s host machine and then exposed to the
+                      pod. More info: https://examples.k8s.io/volumes/iscsi/README.md'
+                    properties:
+                      chapAuthDiscovery:
+                        description: chapAuthDiscovery defines whether support iSCSI
+                          Discovery CHAP authentication
+                        type: boolean
+                      chapAuthSession:
+                        description: chapAuthSession defines whether support iSCSI
+                          Session CHAP authentication
+                        type: boolean
+                      fsType:
+                        description: 'fsType is the filesystem type of the volume
+                          that you want to mount. Tip: Ensure that the filesystem
+                          type is supported by the host operating system. Examples:
+                          "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      initiatorName:
+                        description: initiatorName is the custom iSCSI Initiator Name.
+                          If initiatorName is specified with iscsiInterface simultaneously,
+                          new iSCSI interface <target portal>:<volume name> will be
+                          created for the connection.
+                        type: string
+                      iqn:
+                        description: iqn is the target iSCSI Qualified Name.
+                        type: string
+                      iscsiInterface:
+                        description: iscsiInterface is the interface Name that uses
+                          an iSCSI transport. Defaults to 'default' (tcp).
+                        type: string
+                      lun:
+                        description: lun represents iSCSI Target Lun number.
+                        format: int32
+                        type: integer
+                      portals:
+                        description: portals is the iSCSI Target Portal List. The
+                          portal is either an IP or ip_addr:port if the port is other
+                          than default (typically TCP ports 860 and 3260).
+                        items:
+                          type: string
+                        type: array
+                      readOnly:
+                        description: readOnly here will force the ReadOnly setting
+                          in VolumeMounts. Defaults to false.
+                        type: boolean
+                      secretRef:
+                        description: secretRef is the CHAP Secret for iSCSI target
+                          and initiator authentication
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      targetPortal:
+                        description: targetPortal is iSCSI Target Portal. The Portal
+                          is either an IP or ip_addr:port if the port is other than
+                          default (typically TCP ports 860 and 3260).
+                        type: string
+                    required:
+                    - iqn
+                    - lun
+                    - targetPortal
+                    type: object
+                  nfs:
+                    description: 'nfs represents an NFS mount on the host that shares
+                      a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                    properties:
+                      path:
+                        description: 'path that is exported by the NFS server. More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the NFS export to be
+                          mounted with read-only permissions. Defaults to false. More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                        type: boolean
+                      server:
+                        description: 'server is the hostname or IP address of the
+                          NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                        type: string
+                    required:
+                    - path
+                    - server
+                    type: object
+                  persistentVolumeClaim:
+                    description: 'persistentVolumeClaimVolumeSource represents a reference
+                      to a PersistentVolumeClaim in the same namespace. More info:
+                      https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                    properties:
+                      claimName:
+                        description: 'claimName is the name of a PersistentVolumeClaim
+                          in the same namespace as the pod using this volume. More
+                          info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                        type: string
+                      readOnly:
+                        description: readOnly Will force the ReadOnly setting in VolumeMounts.
+                          Default false.
+                        type: boolean
+                    required:
+                    - claimName
+                    type: object
+                  photonPersistentDisk:
+                    description: photonPersistentDisk represents a PhotonController
+                      persistent disk attached and mounted on kubelets host machine
+                    properties:
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      pdID:
+                        description: pdID is the ID that identifies Photon Controller
+                          persistent disk
+                        type: string
+                    required:
+                    - pdID
+                    type: object
+                  portworxVolume:
+                    description: portworxVolume represents a portworx volume attached
+                      and mounted on kubelets host machine
+                    properties:
+                      fsType:
+                        description: fSType represents the filesystem type to mount
+                          Must be a filesystem type supported by the host operating
+                          system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      readOnly:
+                        description: readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      volumeID:
+                        description: volumeID uniquely identifies a Portworx volume
+                        type: string
+                    required:
+                    - volumeID
+                    type: object
+                  projected:
+                    description: projected items for all in one resources secrets,
+                      configmaps, and downward API
+                    properties:
+                      defaultMode:
+                        description: defaultMode are the mode bits used to set permissions
+                          on created files by default. Must be an octal value between
+                          0000 and 0777 or a decimal value between 0 and 511. YAML
+                          accepts both octal and decimal values, JSON requires decimal
+                          values for mode bits. Directories within the path are not
+                          affected by this setting. This might be in conflict with
+                          other options that affect the file mode, like fsGroup, and
+                          the result can be other mode bits set.
+                        format: int32
+                        type: integer
+                      sources:
+                        description: sources is the list of volume projections
+                        items:
+                          description: Projection that may be projected along with
+                            other supported volume types
+                          properties:
+                            configMap:
+                              description: configMap information about the configMap
+                                data to project
+                              properties:
+                                items:
+                                  description: items if unspecified, each key-value
+                                    pair in the Data field of the referenced ConfigMap
+                                    will be projected into the volume as a file whose
+                                    name is the key and content is the value. If specified,
+                                    the listed keys will be projected into the specified
+                                    paths, and unlisted keys will not be present.
+                                    If a key is specified which is not present in
+                                    the ConfigMap, the volume setup will error unless
+                                    it is marked optional. Paths must be relative
+                                    and may not contain the '..' path or start with
+                                    '..'.
+                                  items:
+                                    description: Maps a string key to a path within
+                                      a volume.
+                                    properties:
+                                      key:
+                                        description: key is the key to project.
+                                        type: string
+                                      mode:
+                                        description: 'mode is Optional: mode bits
+                                          used to set permissions on this file. Must
+                                          be an octal value between 0000 and 0777
+                                          or a decimal value between 0 and 511. YAML
+                                          accepts both octal and decimal values, JSON
+                                          requires decimal values for mode bits. If
+                                          not specified, the volume defaultMode will
+                                          be used. This might be in conflict with
+                                          other options that affect the file mode,
+                                          like fsGroup, and the result can be other
+                                          mode bits set.'
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        description: path is the relative path of
+                                          the file to map the key to. May not be an
+                                          absolute path. May not contain the path
+                                          element '..'. May not start with the string
+                                          '..'.
+                                        type: string
+                                    required:
+                                    - key
+                                    - path
+                                    type: object
+                                  type: array
+                                name:
+                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    TODO: Add other useful fields. apiVersion, kind,
+                                    uid?'
+                                  type: string
+                                optional:
+                                  description: optional specify whether the ConfigMap
+                                    or its keys must be defined
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            downwardAPI:
+                              description: downwardAPI information about the downwardAPI
+                                data to project
+                              properties:
+                                items:
+                                  description: Items is a list of DownwardAPIVolume
+                                    file
+                                  items:
+                                    description: DownwardAPIVolumeFile represents
+                                      information to create the file containing the
+                                      pod field
+                                    properties:
+                                      fieldRef:
+                                        description: 'Required: Selects a field of
+                                          the pod: only annotations, labels, name
+                                          and namespace are supported.'
+                                        properties:
+                                          apiVersion:
+                                            description: Version of the schema the
+                                              FieldPath is written in terms of, defaults
+                                              to "v1".
+                                            type: string
+                                          fieldPath:
+                                            description: Path of the field to select
+                                              in the specified API version.
+                                            type: string
+                                        required:
+                                        - fieldPath
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      mode:
+                                        description: 'Optional: mode bits used to
+                                          set permissions on this file, must be an
+                                          octal value between 0000 and 0777 or a decimal
+                                          value between 0 and 511. YAML accepts both
+                                          octal and decimal values, JSON requires
+                                          decimal values for mode bits. If not specified,
+                                          the volume defaultMode will be used. This
+                                          might be in conflict with other options
+                                          that affect the file mode, like fsGroup,
+                                          and the result can be other mode bits set.'
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        description: 'Required: Path is  the relative
+                                          path name of the file to be created. Must
+                                          not be absolute or contain the ''..'' path.
+                                          Must be utf-8 encoded. The first item of
+                                          the relative path must not start with ''..'''
+                                        type: string
+                                      resourceFieldRef:
+                                        description: 'Selects a resource of the container:
+                                          only resources limits and requests (limits.cpu,
+                                          limits.memory, requests.cpu and requests.memory)
+                                          are currently supported.'
+                                        properties:
+                                          containerName:
+                                            description: 'Container name: required
+                                              for volumes, optional for env vars'
+                                            type: string
+                                          divisor:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            description: Specifies the output format
+                                              of the exposed resources, defaults to
+                                              "1"
+                                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                            x-kubernetes-int-or-string: true
+                                          resource:
+                                            description: 'Required: resource to select'
+                                            type: string
+                                        required:
+                                        - resource
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    required:
+                                    - path
+                                    type: object
+                                  type: array
+                              type: object
+                            secret:
+                              description: secret information about the secret data
+                                to project
+                              properties:
+                                items:
+                                  description: items if unspecified, each key-value
+                                    pair in the Data field of the referenced Secret
+                                    will be projected into the volume as a file whose
+                                    name is the key and content is the value. If specified,
+                                    the listed keys will be projected into the specified
+                                    paths, and unlisted keys will not be present.
+                                    If a key is specified which is not present in
+                                    the Secret, the volume setup will error unless
+                                    it is marked optional. Paths must be relative
+                                    and may not contain the '..' path or start with
+                                    '..'.
+                                  items:
+                                    description: Maps a string key to a path within
+                                      a volume.
+                                    properties:
+                                      key:
+                                        description: key is the key to project.
+                                        type: string
+                                      mode:
+                                        description: 'mode is Optional: mode bits
+                                          used to set permissions on this file. Must
+                                          be an octal value between 0000 and 0777
+                                          or a decimal value between 0 and 511. YAML
+                                          accepts both octal and decimal values, JSON
+                                          requires decimal values for mode bits. If
+                                          not specified, the volume defaultMode will
+                                          be used. This might be in conflict with
+                                          other options that affect the file mode,
+                                          like fsGroup, and the result can be other
+                                          mode bits set.'
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        description: path is the relative path of
+                                          the file to map the key to. May not be an
+                                          absolute path. May not contain the path
+                                          element '..'. May not start with the string
+                                          '..'.
+                                        type: string
+                                    required:
+                                    - key
+                                    - path
+                                    type: object
+                                  type: array
+                                name:
+                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    TODO: Add other useful fields. apiVersion, kind,
+                                    uid?'
+                                  type: string
+                                optional:
+                                  description: optional field specify whether the
+                                    Secret or its key must be defined
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            serviceAccountToken:
+                              description: serviceAccountToken is information about
+                                the serviceAccountToken data to project
+                              properties:
+                                audience:
+                                  description: audience is the intended audience of
+                                    the token. A recipient of a token must identify
+                                    itself with an identifier specified in the audience
+                                    of the token, and otherwise should reject the
+                                    token. The audience defaults to the identifier
+                                    of the apiserver.
+                                  type: string
+                                expirationSeconds:
+                                  description: expirationSeconds is the requested
+                                    duration of validity of the service account token.
+                                    As the token approaches expiration, the kubelet
+                                    volume plugin will proactively rotate the service
+                                    account token. The kubelet will start trying to
+                                    rotate the token if the token is older than 80
+                                    percent of its time to live or if the token is
+                                    older than 24 hours.Defaults to 1 hour and must
+                                    be at least 10 minutes.
+                                  format: int64
+                                  type: integer
+                                path:
+                                  description: path is the path relative to the mount
+                                    point of the file to project the token into.
+                                  type: string
+                              required:
+                              - path
+                              type: object
+                          type: object
+                        type: array
+                    type: object
+                  quobyte:
+                    description: quobyte represents a Quobyte mount on the host that
+                      shares a pod's lifetime
+                    properties:
+                      group:
+                        description: group to map volume access to Default is no group
+                        type: string
+                      readOnly:
+                        description: readOnly here will force the Quobyte volume to
+                          be mounted with read-only permissions. Defaults to false.
+                        type: boolean
+                      registry:
+                        description: registry represents a single or multiple Quobyte
+                          Registry services specified as a string as host:port pair
+                          (multiple entries are separated with commas) which acts
+                          as the central registry for volumes
+                        type: string
+                      tenant:
+                        description: tenant owning the given Quobyte volume in the
+                          Backend Used with dynamically provisioned Quobyte volumes,
+                          value is set by the plugin
+                        type: string
+                      user:
+                        description: user to map volume access to Defaults to serivceaccount
+                          user
+                        type: string
+                      volume:
+                        description: volume is a string that references an already
+                          created Quobyte volume by name.
+                        type: string
+                    required:
+                    - registry
+                    - volume
+                    type: object
+                  rbd:
+                    description: 'rbd represents a Rados Block Device mount on the
+                      host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md'
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type of the volume
+                          that you want to mount. Tip: Ensure that the filesystem
+                          type is supported by the host operating system. Examples:
+                          "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      image:
+                        description: 'image is the rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                      keyring:
+                        description: 'keyring is the path to key ring for RBDUser.
+                          Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                      monitors:
+                        description: 'monitors is a collection of Ceph monitors. More
+                          info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        items:
+                          type: string
+                        type: array
+                      pool:
+                        description: 'pool is the rados pool name. Default is rbd.
+                          More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the ReadOnly setting
+                          in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: boolean
+                      secretRef:
+                        description: 'secretRef is name of the authentication secret
+                          for RBDUser. If provided overrides keyring. Default is nil.
+                          More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      user:
+                        description: 'user is the rados user name. Default is admin.
+                          More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                    required:
+                    - image
+                    - monitors
+                    type: object
+                  scaleIO:
+                    description: scaleIO represents a ScaleIO persistent volume attached
+                      and mounted on Kubernetes nodes.
+                    properties:
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Default is "xfs".
+                        type: string
+                      gateway:
+                        description: gateway is the host address of the ScaleIO API
+                          Gateway.
+                        type: string
+                      protectionDomain:
+                        description: protectionDomain is the name of the ScaleIO Protection
+                          Domain for the configured storage.
+                        type: string
+                      readOnly:
+                        description: readOnly Defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      secretRef:
+                        description: secretRef references to the secret for ScaleIO
+                          user and other sensitive information. If this is not provided,
+                          Login operation will fail.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      sslEnabled:
+                        description: sslEnabled Flag enable/disable SSL communication
+                          with Gateway, default false
+                        type: boolean
+                      storageMode:
+                        description: storageMode indicates whether the storage for
+                          a volume should be ThickProvisioned or ThinProvisioned.
+                          Default is ThinProvisioned.
+                        type: string
+                      storagePool:
+                        description: storagePool is the ScaleIO Storage Pool associated
+                          with the protection domain.
+                        type: string
+                      system:
+                        description: system is the name of the storage system as configured
+                          in ScaleIO.
+                        type: string
+                      volumeName:
+                        description: volumeName is the name of a volume already created
+                          in the ScaleIO system that is associated with this volume
+                          source.
+                        type: string
+                    required:
+                    - gateway
+                    - secretRef
+                    - system
+                    type: object
+                  secret:
+                    description: 'secret represents a secret that should populate
+                      this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                    properties:
+                      defaultMode:
+                        description: 'defaultMode is Optional: mode bits used to set
+                          permissions on created files by default. Must be an octal
+                          value between 0000 and 0777 or a decimal value between 0
+                          and 511. YAML accepts both octal and decimal values, JSON
+                          requires decimal values for mode bits. Defaults to 0644.
+                          Directories within the path are not affected by this setting.
+                          This might be in conflict with other options that affect
+                          the file mode, like fsGroup, and the result can be other
+                          mode bits set.'
+                        format: int32
+                        type: integer
+                      items:
+                        description: items If unspecified, each key-value pair in
+                          the Data field of the referenced Secret will be projected
+                          into the volume as a file whose name is the key and content
+                          is the value. If specified, the listed keys will be projected
+                          into the specified paths, and unlisted keys will not be
+                          present. If a key is specified which is not present in the
+                          Secret, the volume setup will error unless it is marked
+                          optional. Paths must be relative and may not contain the
+                          '..' path or start with '..'.
+                        items:
+                          description: Maps a string key to a path within a volume.
+                          properties:
+                            key:
+                              description: key is the key to project.
+                              type: string
+                            mode:
+                              description: 'mode is Optional: mode bits used to set
+                                permissions on this file. Must be an octal value between
+                                0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires
+                                decimal values for mode bits. If not specified, the
+                                volume defaultMode will be used. This might be in
+                                conflict with other options that affect the file mode,
+                                like fsGroup, and the result can be other mode bits
+                                set.'
+                              format: int32
+                              type: integer
+                            path:
+                              description: path is the relative path of the file to
+                                map the key to. May not be an absolute path. May not
+                                contain the path element '..'. May not start with
+                                the string '..'.
+                              type: string
+                          required:
+                          - key
+                          - path
+                          type: object
+                        type: array
+                      optional:
+                        description: optional field specify whether the Secret or
+                          its keys must be defined
+                        type: boolean
+                      secretName:
+                        description: 'secretName is the name of the secret in the
+                          pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                        type: string
+                    type: object
+                  storageos:
+                    description: storageOS represents a StorageOS volume attached
+                      and mounted on Kubernetes nodes.
+                    properties:
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      readOnly:
+                        description: readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      secretRef:
+                        description: secretRef specifies the secret to use for obtaining
+                          the StorageOS API credentials.  If not specified, default
+                          values will be attempted.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      volumeName:
+                        description: volumeName is the human-readable name of the
+                          StorageOS volume.  Volume names are only unique within a
+                          namespace.
+                        type: string
+                      volumeNamespace:
+                        description: volumeNamespace specifies the scope of the volume
+                          within StorageOS.  If no namespace is specified then the
+                          Pod's namespace will be used.  This allows the Kubernetes
+                          name scoping to be mirrored within StorageOS for tighter
+                          integration. Set VolumeName to any name to override the
+                          default behaviour. Set to "default" if you are not using
+                          namespaces within StorageOS. Namespaces that do not pre-exist
+                          within StorageOS will be created.
+                        type: string
+                    type: object
+                  vsphereVolume:
+                    description: vsphereVolume represents a vSphere volume attached
+                      and mounted on kubelets host machine
+                    properties:
+                      fsType:
+                        description: fsType is filesystem type to mount. Must be a
+                          filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      storagePolicyID:
+                        description: storagePolicyID is the storage Policy Based Management
+                          (SPBM) profile ID associated with the StoragePolicyName.
+                        type: string
+                      storagePolicyName:
+                        description: storagePolicyName is the storage Policy Based
+                          Management (SPBM) profile name.
+                        type: string
+                      volumePath:
+                        description: volumePath is the path that identifies vSphere
+                          volume vmdk
+                        type: string
+                    required:
+                    - volumePath
+                    type: object
+                type: object
               priorityClassName:
                 description: PriorityClassName represents the pod's priority class.
                 type: string
@@ -20455,7 +22166,8 @@ spec:
                   type: object
                 type: array
               replicas:
-                description: Numbers of the Fluentd instance
+                description: Numbers of the Fluentd instance Applicable when the mode
+                  is "collector", and will be ignored when the mode is "agent"
                 format: int32
                 type: integer
               resources:
@@ -20749,6 +22461,8 @@ spec:
                   for mapping network identities to claims in a way that maintains
                   the identity of a pod. Every claim in this list must have at least
                   one matching (by name) volumeMount in one container in the template.
+                  Applicable when the mode is "collector", and will be ignored when
+                  the mode is "agent"
                 items:
                   description: PersistentVolumeClaim is a user's request for and claim
                     to a persistent volume
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index 4a2575e6a..e607bbd89 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -19414,6 +19414,166 @@ spec:
                         type: object
                     type: object
                 type: object
+              containerSecurityContext:
+                description: ContainerSecurityContext represents the security context
+                  for the fluentd container.
+                properties:
+                  allowPrivilegeEscalation:
+                    description: 'AllowPrivilegeEscalation controls whether a process
+                      can gain more privileges than its parent process. This bool
+                      directly controls if the no_new_privs flag will be set on the
+                      container process. AllowPrivilegeEscalation is true always when
+                      the container is: 1) run as Privileged 2) has CAP_SYS_ADMIN
+                      Note that this field cannot be set when spec.os.name is windows.'
+                    type: boolean
+                  capabilities:
+                    description: The capabilities to add/drop when running containers.
+                      Defaults to the default set of capabilities granted by the container
+                      runtime. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    properties:
+                      add:
+                        description: Added capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                      drop:
+                        description: Removed capabilities
+                        items:
+                          description: Capability represent POSIX capabilities type
+                          type: string
+                        type: array
+                    type: object
+                  privileged:
+                    description: Run container in privileged mode. Processes in privileged
+                      containers are essentially equivalent to root on the host. Defaults
+                      to false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  procMount:
+                    description: procMount denotes the type of proc mount to use for
+                      the containers. The default is DefaultProcMount which uses the
+                      container runtime defaults for readonly paths and masked paths.
+                      This requires the ProcMountType feature flag to be enabled.
+                      Note that this field cannot be set when spec.os.name is windows.
+                    type: string
+                  readOnlyRootFilesystem:
+                    description: Whether this container has a read-only root filesystem.
+                      Default is false. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    type: boolean
+                  runAsGroup:
+                    description: The GID to run the entrypoint of the container process.
+                      Uses runtime default if unset. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    format: int64
+                    type: integer
+                  runAsNonRoot:
+                    description: Indicates that the container must run as a non-root
+                      user. If true, the Kubelet will validate the image at runtime
+                      to ensure that it does not run as UID 0 (root) and fail to start
+                      the container if it does. If unset or false, no such validation
+                      will be performed. May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence.
+                    type: boolean
+                  runAsUser:
+                    description: The UID to run the entrypoint of the container process.
+                      Defaults to user specified in image metadata if unspecified.
+                      May also be set in PodSecurityContext.  If set in both SecurityContext
+                      and PodSecurityContext, the value specified in SecurityContext
+                      takes precedence. Note that this field cannot be set when spec.os.name
+                      is windows.
+                    format: int64
+                    type: integer
+                  seLinuxOptions:
+                    description: The SELinux context to be applied to the container.
+                      If unspecified, the container runtime will allocate a random
+                      SELinux context for each container.  May also be set in PodSecurityContext.  If
+                      set in both SecurityContext and PodSecurityContext, the value
+                      specified in SecurityContext takes precedence. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      level:
+                        description: Level is SELinux level label that applies to
+                          the container.
+                        type: string
+                      role:
+                        description: Role is a SELinux role label that applies to
+                          the container.
+                        type: string
+                      type:
+                        description: Type is a SELinux type label that applies to
+                          the container.
+                        type: string
+                      user:
+                        description: User is a SELinux user label that applies to
+                          the container.
+                        type: string
+                    type: object
+                  seccompProfile:
+                    description: The seccomp options to use by this container. If
+                      seccomp options are provided at both the pod & container level,
+                      the container options override the pod options. Note that this
+                      field cannot be set when spec.os.name is windows.
+                    properties:
+                      localhostProfile:
+                        description: localhostProfile indicates a profile defined
+                          in a file on the node should be used. The profile must be
+                          preconfigured on the node to work. Must be a descending
+                          path, relative to the kubelet's configured seccomp profile
+                          location. Must only be set if type is "Localhost".
+                        type: string
+                      type:
+                        description: "type indicates which kind of seccomp profile
+                          will be applied. Valid options are: \n Localhost - a profile
+                          defined in a file on the node should be used. RuntimeDefault
+                          - the container runtime default profile should be used.
+                          Unconfined - no profile should be applied."
+                        type: string
+                    required:
+                    - type
+                    type: object
+                  windowsOptions:
+                    description: The Windows specific settings applied to all containers.
+                      If unspecified, the options from the PodSecurityContext will
+                      be used. If set in both SecurityContext and PodSecurityContext,
+                      the value specified in SecurityContext takes precedence. Note
+                      that this field cannot be set when spec.os.name is linux.
+                    properties:
+                      gmsaCredentialSpec:
+                        description: GMSACredentialSpec is where the GMSA admission
+                          webhook (https://github.com/kubernetes-sigs/windows-gmsa)
+                          inlines the contents of the GMSA credential spec named by
+                          the GMSACredentialSpecName field.
+                        type: string
+                      gmsaCredentialSpecName:
+                        description: GMSACredentialSpecName is the name of the GMSA
+                          credential spec to use.
+                        type: string
+                      hostProcess:
+                        description: HostProcess determines if a container should
+                          be run as a 'Host Process' container. This field is alpha-level
+                          and will only be honored by components that enable the WindowsHostProcessContainers
+                          feature flag. Setting this field without the feature flag
+                          will result in errors when validating the Pod. All of a
+                          Pod's containers must have the same effective HostProcess
+                          value (it is not allowed to have a mix of HostProcess containers
+                          and non-HostProcess containers).  In addition, if HostProcess
+                          is true then HostNetwork must also be set to true.
+                        type: boolean
+                      runAsUserName:
+                        description: The UserName in Windows to run the entrypoint
+                          of the container process. Defaults to the user specified
+                          in image metadata if unspecified. May also be set in PodSecurityContext.
+                          If set in both SecurityContext and PodSecurityContext, the
+                          value specified in SecurityContext takes precedence.
+                        type: string
+                    type: object
+                type: object
               defaultFilterSelector:
                 description: Select cluster filter plugins used to filter for the
                   default cluster output
@@ -20395,11 +20555,1562 @@ spec:
                 - debug
                 - trace
                 type: string
+              mode:
+                default: collector
+                description: Mode to determine whether to run Fluentd as collector
+                  or agent.
+                enum:
+                - collector
+                - agent
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string
                 description: NodeSelector
                 type: object
+              positionDB:
+                description: Storage for position db. You will use it if tail input
+                  is enabled. Applicable when the mode is "agent", and will be ignored
+                  when the mode is "collector"
+                properties:
+                  awsElasticBlockStore:
+                    description: 'awsElasticBlockStore represents an AWS Disk resource
+                      that is attached to a kubelet''s host machine and then exposed
+                      to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type of the volume
+                          that you want to mount. Tip: Ensure that the filesystem
+                          type is supported by the host operating system. Examples:
+                          "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      partition:
+                        description: 'partition is the partition in the volume that
+                          you want to mount. If omitted, the default is to mount by
+                          volume name. Examples: For volume /dev/sda1, you specify
+                          the partition as "1". Similarly, the volume partition for
+                          /dev/sda is "0" (or you can leave the property empty).'
+                        format: int32
+                        type: integer
+                      readOnly:
+                        description: 'readOnly value true will force the readOnly
+                          setting in VolumeMounts. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                        type: boolean
+                      volumeID:
+                        description: 'volumeID is unique ID of the persistent disk
+                          resource in AWS (Amazon EBS volume). More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore'
+                        type: string
+                    required:
+                    - volumeID
+                    type: object
+                  azureDisk:
+                    description: azureDisk represents an Azure Data Disk mount on
+                      the host and bind mount to the pod.
+                    properties:
+                      cachingMode:
+                        description: 'cachingMode is the Host Caching mode: None,
+                          Read Only, Read Write.'
+                        type: string
+                      diskName:
+                        description: diskName is the Name of the data disk in the
+                          blob storage
+                        type: string
+                      diskURI:
+                        description: diskURI is the URI of data disk in the blob storage
+                        type: string
+                      fsType:
+                        description: fsType is Filesystem type to mount. Must be a
+                          filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      kind:
+                        description: 'kind expected values are Shared: multiple blob
+                          disks per storage account  Dedicated: single blob disk per
+                          storage account  Managed: azure managed data disk (only
+                          in managed availability set). defaults to shared'
+                        type: string
+                      readOnly:
+                        description: readOnly Defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                    required:
+                    - diskName
+                    - diskURI
+                    type: object
+                  azureFile:
+                    description: azureFile represents an Azure File Service mount
+                      on the host and bind mount to the pod.
+                    properties:
+                      readOnly:
+                        description: readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      secretName:
+                        description: secretName is the  name of secret that contains
+                          Azure Storage Account Name and Key
+                        type: string
+                      shareName:
+                        description: shareName is the azure share Name
+                        type: string
+                    required:
+                    - secretName
+                    - shareName
+                    type: object
+                  cephfs:
+                    description: cephFS represents a Ceph FS mount on the host that
+                      shares a pod's lifetime
+                    properties:
+                      monitors:
+                        description: 'monitors is Required: Monitors is a collection
+                          of Ceph monitors More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        items:
+                          type: string
+                        type: array
+                      path:
+                        description: 'path is Optional: Used as the mounted root,
+                          rather than the full Ceph tree, default is /'
+                        type: string
+                      readOnly:
+                        description: 'readOnly is Optional: Defaults to false (read/write).
+                          ReadOnly here will force the ReadOnly setting in VolumeMounts.
+                          More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        type: boolean
+                      secretFile:
+                        description: 'secretFile is Optional: SecretFile is the path
+                          to key ring for User, default is /etc/ceph/user.secret More
+                          info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        type: string
+                      secretRef:
+                        description: 'secretRef is Optional: SecretRef is reference
+                          to the authentication secret for User, default is empty.
+                          More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      user:
+                        description: 'user is optional: User is the rados user name,
+                          default is admin More info: https://examples.k8s.io/volumes/cephfs/README.md#how-to-use-it'
+                        type: string
+                    required:
+                    - monitors
+                    type: object
+                  cinder:
+                    description: 'cinder represents a cinder volume attached and mounted
+                      on kubelets host machine. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Examples: "ext4", "xfs", "ntfs". Implicitly inferred to
+                          be "ext4" if unspecified. More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                        type: string
+                      readOnly:
+                        description: 'readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts. More
+                          info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                        type: boolean
+                      secretRef:
+                        description: 'secretRef is optional: points to a secret object
+                          containing parameters used to connect to OpenStack.'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      volumeID:
+                        description: 'volumeID used to identify the volume in cinder.
+                          More info: https://examples.k8s.io/mysql-cinder-pd/README.md'
+                        type: string
+                    required:
+                    - volumeID
+                    type: object
+                  configMap:
+                    description: configMap represents a configMap that should populate
+                      this volume
+                    properties:
+                      defaultMode:
+                        description: 'defaultMode is optional: mode bits used to set
+                          permissions on created files by default. Must be an octal
+                          value between 0000 and 0777 or a decimal value between 0
+                          and 511. YAML accepts both octal and decimal values, JSON
+                          requires decimal values for mode bits. Defaults to 0644.
+                          Directories within the path are not affected by this setting.
+                          This might be in conflict with other options that affect
+                          the file mode, like fsGroup, and the result can be other
+                          mode bits set.'
+                        format: int32
+                        type: integer
+                      items:
+                        description: items if unspecified, each key-value pair in
+                          the Data field of the referenced ConfigMap will be projected
+                          into the volume as a file whose name is the key and content
+                          is the value. If specified, the listed keys will be projected
+                          into the specified paths, and unlisted keys will not be
+                          present. If a key is specified which is not present in the
+                          ConfigMap, the volume setup will error unless it is marked
+                          optional. Paths must be relative and may not contain the
+                          '..' path or start with '..'.
+                        items:
+                          description: Maps a string key to a path within a volume.
+                          properties:
+                            key:
+                              description: key is the key to project.
+                              type: string
+                            mode:
+                              description: 'mode is Optional: mode bits used to set
+                                permissions on this file. Must be an octal value between
+                                0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires
+                                decimal values for mode bits. If not specified, the
+                                volume defaultMode will be used. This might be in
+                                conflict with other options that affect the file mode,
+                                like fsGroup, and the result can be other mode bits
+                                set.'
+                              format: int32
+                              type: integer
+                            path:
+                              description: path is the relative path of the file to
+                                map the key to. May not be an absolute path. May not
+                                contain the path element '..'. May not start with
+                                the string '..'.
+                              type: string
+                          required:
+                          - key
+                          - path
+                          type: object
+                        type: array
+                      name:
+                        description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                          TODO: Add other useful fields. apiVersion, kind, uid?'
+                        type: string
+                      optional:
+                        description: optional specify whether the ConfigMap or its
+                          keys must be defined
+                        type: boolean
+                    type: object
+                    x-kubernetes-map-type: atomic
+                  csi:
+                    description: csi (Container Storage Interface) represents ephemeral
+                      storage that is handled by certain external CSI drivers (Beta
+                      feature).
+                    properties:
+                      driver:
+                        description: driver is the name of the CSI driver that handles
+                          this volume. Consult with your admin for the correct name
+                          as registered in the cluster.
+                        type: string
+                      fsType:
+                        description: fsType to mount. Ex. "ext4", "xfs", "ntfs". If
+                          not provided, the empty value is passed to the associated
+                          CSI driver which will determine the default filesystem to
+                          apply.
+                        type: string
+                      nodePublishSecretRef:
+                        description: nodePublishSecretRef is a reference to the secret
+                          object containing sensitive information to pass to the CSI
+                          driver to complete the CSI NodePublishVolume and NodeUnpublishVolume
+                          calls. This field is optional, and  may be empty if no secret
+                          is required. If the secret object contains more than one
+                          secret, all secret references are passed.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      readOnly:
+                        description: readOnly specifies a read-only configuration
+                          for the volume. Defaults to false (read/write).
+                        type: boolean
+                      volumeAttributes:
+                        additionalProperties:
+                          type: string
+                        description: volumeAttributes stores driver-specific properties
+                          that are passed to the CSI driver. Consult your driver's
+                          documentation for supported values.
+                        type: object
+                    required:
+                    - driver
+                    type: object
+                  downwardAPI:
+                    description: downwardAPI represents downward API about the pod
+                      that should populate this volume
+                    properties:
+                      defaultMode:
+                        description: 'Optional: mode bits to use on created files
+                          by default. Must be a Optional: mode bits used to set permissions
+                          on created files by default. Must be an octal value between
+                          0000 and 0777 or a decimal value between 0 and 511. YAML
+                          accepts both octal and decimal values, JSON requires decimal
+                          values for mode bits. Defaults to 0644. Directories within
+                          the path are not affected by this setting. This might be
+                          in conflict with other options that affect the file mode,
+                          like fsGroup, and the result can be other mode bits set.'
+                        format: int32
+                        type: integer
+                      items:
+                        description: Items is a list of downward API volume file
+                        items:
+                          description: DownwardAPIVolumeFile represents information
+                            to create the file containing the pod field
+                          properties:
+                            fieldRef:
+                              description: 'Required: Selects a field of the pod:
+                                only annotations, labels, name and namespace are supported.'
+                              properties:
+                                apiVersion:
+                                  description: Version of the schema the FieldPath
+                                    is written in terms of, defaults to "v1".
+                                  type: string
+                                fieldPath:
+                                  description: Path of the field to select in the
+                                    specified API version.
+                                  type: string
+                              required:
+                              - fieldPath
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            mode:
+                              description: 'Optional: mode bits used to set permissions
+                                on this file, must be an octal value between 0000
+                                and 0777 or a decimal value between 0 and 511. YAML
+                                accepts both octal and decimal values, JSON requires
+                                decimal values for mode bits. If not specified, the
+                                volume defaultMode will be used. This might be in
+                                conflict with other options that affect the file mode,
+                                like fsGroup, and the result can be other mode bits
+                                set.'
+                              format: int32
+                              type: integer
+                            path:
+                              description: 'Required: Path is  the relative path name
+                                of the file to be created. Must not be absolute or
+                                contain the ''..'' path. Must be utf-8 encoded. The
+                                first item of the relative path must not start with
+                                ''..'''
+                              type: string
+                            resourceFieldRef:
+                              description: 'Selects a resource of the container: only
+                                resources limits and requests (limits.cpu, limits.memory,
+                                requests.cpu and requests.memory) are currently supported.'
+                              properties:
+                                containerName:
+                                  description: 'Container name: required for volumes,
+                                    optional for env vars'
+                                  type: string
+                                divisor:
+                                  anyOf:
+                                  - type: integer
+                                  - type: string
+                                  description: Specifies the output format of the
+                                    exposed resources, defaults to "1"
+                                  pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                  x-kubernetes-int-or-string: true
+                                resource:
+                                  description: 'Required: resource to select'
+                                  type: string
+                              required:
+                              - resource
+                              type: object
+                              x-kubernetes-map-type: atomic
+                          required:
+                          - path
+                          type: object
+                        type: array
+                    type: object
+                  emptyDir:
+                    description: 'emptyDir represents a temporary directory that shares
+                      a pod''s lifetime. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                    properties:
+                      medium:
+                        description: 'medium represents what type of storage medium
+                          should back this directory. The default is "" which means
+                          to use the node''s default medium. Must be an empty string
+                          (default) or Memory. More info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
+                        type: string
+                      sizeLimit:
+                        anyOf:
+                        - type: integer
+                        - type: string
+                        description: 'sizeLimit is the total amount of local storage
+                          required for this EmptyDir volume. The size limit is also
+                          applicable for memory medium. The maximum usage on memory
+                          medium EmptyDir would be the minimum value between the SizeLimit
+                          specified here and the sum of memory limits of all containers
+                          in a pod. The default is nil which means that the limit
+                          is undefined. More info: http://kubernetes.io/docs/user-guide/volumes#emptydir'
+                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                        x-kubernetes-int-or-string: true
+                    type: object
+                  ephemeral:
+                    description: "ephemeral represents a volume that is handled by
+                      a cluster storage driver. The volume's lifecycle is tied to
+                      the pod that defines it - it will be created before the pod
+                      starts, and deleted when the pod is removed. \n Use this if:
+                      a) the volume is only needed while the pod runs, b) features
+                      of normal volumes like restoring from snapshot or capacity tracking
+                      are needed, c) the storage driver is specified through a storage
+                      class, and d) the storage driver supports dynamic volume provisioning
+                      through a PersistentVolumeClaim (see EphemeralVolumeSource for
+                      more information on the connection between this volume type
+                      and PersistentVolumeClaim). \n Use PersistentVolumeClaim or
+                      one of the vendor-specific APIs for volumes that persist for
+                      longer than the lifecycle of an individual pod. \n Use CSI for
+                      light-weight local ephemeral volumes if the CSI driver is meant
+                      to be used that way - see the documentation of the driver for
+                      more information. \n A pod can use both types of ephemeral volumes
+                      and persistent volumes at the same time."
+                    properties:
+                      volumeClaimTemplate:
+                        description: "Will be used to create a stand-alone PVC to
+                          provision the volume. The pod in which this EphemeralVolumeSource
+                          is embedded will be the owner of the PVC, i.e. the PVC will
+                          be deleted together with the pod.  The name of the PVC will
+                          be `<pod name>-<volume name>` where `<volume name>` is the
+                          name from the `PodSpec.Volumes` array entry. Pod validation
+                          will reject the pod if the concatenated name is not valid
+                          for a PVC (for example, too long). \n An existing PVC with
+                          that name that is not owned by the pod will *not* be used
+                          for the pod to avoid using an unrelated volume by mistake.
+                          Starting the pod is then blocked until the unrelated PVC
+                          is removed. If such a pre-created PVC is meant to be used
+                          by the pod, the PVC has to updated with an owner reference
+                          to the pod once the pod exists. Normally this should not
+                          be necessary, but it may be useful when manually reconstructing
+                          a broken cluster. \n This field is read-only and no changes
+                          will be made by Kubernetes to the PVC after it has been
+                          created. \n Required, must not be nil."
+                        properties:
+                          metadata:
+                            description: May contain labels and annotations that will
+                              be copied into the PVC when creating it. No other fields
+                              are allowed and will be rejected during validation.
+                            properties:
+                              annotations:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              finalizers:
+                                items:
+                                  type: string
+                                type: array
+                              labels:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              name:
+                                type: string
+                              namespace:
+                                type: string
+                            type: object
+                          spec:
+                            description: The specification for the PersistentVolumeClaim.
+                              The entire content is copied unchanged into the PVC
+                              that gets created from this template. The same fields
+                              as in a PersistentVolumeClaim are also valid here.
+                            properties:
+                              accessModes:
+                                description: 'accessModes contains the desired access
+                                  modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1'
+                                items:
+                                  type: string
+                                type: array
+                              dataSource:
+                                description: 'dataSource field can be used to specify
+                                  either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot)
+                                  * An existing PVC (PersistentVolumeClaim) If the
+                                  provisioner or an external controller can support
+                                  the specified data source, it will create a new
+                                  volume based on the contents of the specified data
+                                  source. When the AnyVolumeDataSource feature gate
+                                  is enabled, dataSource contents will be copied to
+                                  dataSourceRef, and dataSourceRef contents will be
+                                  copied to dataSource when dataSourceRef.namespace
+                                  is not specified. If the namespace is specified,
+                                  then dataSourceRef will not be copied to dataSource.'
+                                properties:
+                                  apiGroup:
+                                    description: APIGroup is the group for the resource
+                                      being referenced. If APIGroup is not specified,
+                                      the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is
+                                      required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              dataSourceRef:
+                                description: 'dataSourceRef specifies the object from
+                                  which to populate the volume with data, if a non-empty
+                                  volume is desired. This may be any object from a
+                                  non-empty API group (non core object) or a PersistentVolumeClaim
+                                  object. When this field is specified, volume binding
+                                  will only succeed if the type of the specified object
+                                  matches some installed volume populator or dynamic
+                                  provisioner. This field will replace the functionality
+                                  of the dataSource field and as such if both fields
+                                  are non-empty, they must have the same value. For
+                                  backwards compatibility, when namespace isn''t specified
+                                  in dataSourceRef, both fields (dataSource and dataSourceRef)
+                                  will be set to the same value automatically if one
+                                  of them is empty and the other is non-empty. When
+                                  namespace is specified in dataSourceRef, dataSource
+                                  isn''t set to the same value and must be empty.
+                                  There are three important differences between dataSource
+                                  and dataSourceRef: * While dataSource only allows
+                                  two specific types of objects, dataSourceRef allows
+                                  any non-core object, as well as PersistentVolumeClaim
+                                  objects. * While dataSource ignores disallowed values
+                                  (dropping them), dataSourceRef preserves all values,
+                                  and generates an error if a disallowed value is
+                                  specified. * While dataSource only allows local
+                                  objects, dataSourceRef allows objects in any namespaces.
+                                  (Beta) Using this field requires the AnyVolumeDataSource
+                                  feature gate to be enabled. (Alpha) Using the namespace
+                                  field of dataSourceRef requires the CrossNamespaceVolumeDataSource
+                                  feature gate to be enabled.'
+                                properties:
+                                  apiGroup:
+                                    description: APIGroup is the group for the resource
+                                      being referenced. If APIGroup is not specified,
+                                      the specified Kind must be in the core API group.
+                                      For any other third-party types, APIGroup is
+                                      required.
+                                    type: string
+                                  kind:
+                                    description: Kind is the type of resource being
+                                      referenced
+                                    type: string
+                                  name:
+                                    description: Name is the name of resource being
+                                      referenced
+                                    type: string
+                                  namespace:
+                                    description: Namespace is the namespace of resource
+                                      being referenced Note that when a namespace
+                                      is specified, a gateway.networking.k8s.io/ReferenceGrant
+                                      object is required in the referent namespace
+                                      to allow that namespace's owner to accept the
+                                      reference. See the ReferenceGrant documentation
+                                      for details. (Alpha) This field requires the
+                                      CrossNamespaceVolumeDataSource feature gate
+                                      to be enabled.
+                                    type: string
+                                required:
+                                - kind
+                                - name
+                                type: object
+                              resources:
+                                description: 'resources represents the minimum resources
+                                  the volume should have. If RecoverVolumeExpansionFailure
+                                  feature is enabled users are allowed to specify
+                                  resource requirements that are lower than previous
+                                  value but must still be higher than capacity recorded
+                                  in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
+                                properties:
+                                  claims:
+                                    description: "Claims lists the names of resources,
+                                      defined in spec.resourceClaims, that are used
+                                      by this container. \n This is an alpha field
+                                      and requires enabling the DynamicResourceAllocation
+                                      feature gate. \n This field is immutable. It
+                                      can only be set for containers."
+                                    items:
+                                      description: ResourceClaim references one entry
+                                        in PodSpec.ResourceClaims.
+                                      properties:
+                                        name:
+                                          description: Name must match the name of
+                                            one entry in pod.spec.resourceClaims of
+                                            the Pod where this field is used. It makes
+                                            that resource available inside a container.
+                                          type: string
+                                      required:
+                                      - name
+                                      type: object
+                                    type: array
+                                    x-kubernetes-list-map-keys:
+                                    - name
+                                    x-kubernetes-list-type: map
+                                  limits:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: 'Limits describes the maximum amount
+                                      of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                    type: object
+                                  requests:
+                                    additionalProperties:
+                                      anyOf:
+                                      - type: integer
+                                      - type: string
+                                      pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                      x-kubernetes-int-or-string: true
+                                    description: 'Requests describes the minimum amount
+                                      of compute resources required. If Requests is
+                                      omitted for a container, it defaults to Limits
+                                      if that is explicitly specified, otherwise to
+                                      an implementation-defined value. More info:
+                                      https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                                    type: object
+                                type: object
+                              selector:
+                                description: selector is a label query over volumes
+                                  to consider for binding.
+                                properties:
+                                  matchExpressions:
+                                    description: matchExpressions is a list of label
+                                      selector requirements. The requirements are
+                                      ANDed.
+                                    items:
+                                      description: A label selector requirement is
+                                        a selector that contains values, a key, and
+                                        an operator that relates the key and values.
+                                      properties:
+                                        key:
+                                          description: key is the label key that the
+                                            selector applies to.
+                                          type: string
+                                        operator:
+                                          description: operator represents a key's
+                                            relationship to a set of values. Valid
+                                            operators are In, NotIn, Exists and DoesNotExist.
+                                          type: string
+                                        values:
+                                          description: values is an array of string
+                                            values. If the operator is In or NotIn,
+                                            the values array must be non-empty. If
+                                            the operator is Exists or DoesNotExist,
+                                            the values array must be empty. This array
+                                            is replaced during a strategic merge patch.
+                                          items:
+                                            type: string
+                                          type: array
+                                      required:
+                                      - key
+                                      - operator
+                                      type: object
+                                    type: array
+                                  matchLabels:
+                                    additionalProperties:
+                                      type: string
+                                    description: matchLabels is a map of {key,value}
+                                      pairs. A single {key,value} in the matchLabels
+                                      map is equivalent to an element of matchExpressions,
+                                      whose key field is "key", the operator is "In",
+                                      and the values array contains only "value".
+                                      The requirements are ANDed.
+                                    type: object
+                                type: object
+                                x-kubernetes-map-type: atomic
+                              storageClassName:
+                                description: 'storageClassName is the name of the
+                                  StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
+                                type: string
+                              volumeMode:
+                                description: volumeMode defines what type of volume
+                                  is required by the claim. Value of Filesystem is
+                                  implied when not included in claim spec.
+                                type: string
+                              volumeName:
+                                description: volumeName is the binding reference to
+                                  the PersistentVolume backing this claim.
+                                type: string
+                            type: object
+                        required:
+                        - spec
+                        type: object
+                    type: object
+                  fc:
+                    description: fc represents a Fibre Channel resource that is attached
+                      to a kubelet's host machine and then exposed to the pod.
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. TODO: how do we prevent errors in the filesystem
+                          from compromising the machine'
+                        type: string
+                      lun:
+                        description: 'lun is Optional: FC target lun number'
+                        format: int32
+                        type: integer
+                      readOnly:
+                        description: 'readOnly is Optional: Defaults to false (read/write).
+                          ReadOnly here will force the ReadOnly setting in VolumeMounts.'
+                        type: boolean
+                      targetWWNs:
+                        description: 'targetWWNs is Optional: FC target worldwide
+                          names (WWNs)'
+                        items:
+                          type: string
+                        type: array
+                      wwids:
+                        description: 'wwids Optional: FC volume world wide identifiers
+                          (wwids) Either wwids or combination of targetWWNs and lun
+                          must be set, but not both simultaneously.'
+                        items:
+                          type: string
+                        type: array
+                    type: object
+                  flexVolume:
+                    description: flexVolume represents a generic volume resource that
+                      is provisioned/attached using an exec based plugin.
+                    properties:
+                      driver:
+                        description: driver is the name of the driver to use for this
+                          volume.
+                        type: string
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". The default filesystem depends
+                          on FlexVolume script.
+                        type: string
+                      options:
+                        additionalProperties:
+                          type: string
+                        description: 'options is Optional: this field holds extra
+                          command options if any.'
+                        type: object
+                      readOnly:
+                        description: 'readOnly is Optional: defaults to false (read/write).
+                          ReadOnly here will force the ReadOnly setting in VolumeMounts.'
+                        type: boolean
+                      secretRef:
+                        description: 'secretRef is Optional: secretRef is reference
+                          to the secret object containing sensitive information to
+                          pass to the plugin scripts. This may be empty if no secret
+                          object is specified. If the secret object contains more
+                          than one secret, all secrets are passed to the plugin scripts.'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                    required:
+                    - driver
+                    type: object
+                  flocker:
+                    description: flocker represents a Flocker volume attached to a
+                      kubelet's host machine. This depends on the Flocker control
+                      service being running
+                    properties:
+                      datasetName:
+                        description: datasetName is Name of the dataset stored as
+                          metadata -> name on the dataset for Flocker should be considered
+                          as deprecated
+                        type: string
+                      datasetUUID:
+                        description: datasetUUID is the UUID of the dataset. This
+                          is unique identifier of a Flocker dataset
+                        type: string
+                    type: object
+                  gcePersistentDisk:
+                    description: 'gcePersistentDisk represents a GCE Disk resource
+                      that is attached to a kubelet''s host machine and then exposed
+                      to the pod. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                    properties:
+                      fsType:
+                        description: 'fsType is filesystem type of the volume that
+                          you want to mount. Tip: Ensure that the filesystem type
+                          is supported by the host operating system. Examples: "ext4",
+                          "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      partition:
+                        description: 'partition is the partition in the volume that
+                          you want to mount. If omitted, the default is to mount by
+                          volume name. Examples: For volume /dev/sda1, you specify
+                          the partition as "1". Similarly, the volume partition for
+                          /dev/sda is "0" (or you can leave the property empty). More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                        format: int32
+                        type: integer
+                      pdName:
+                        description: 'pdName is unique name of the PD resource in
+                          GCE. Used to identify the disk in GCE. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the ReadOnly setting
+                          in VolumeMounts. Defaults to false. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk'
+                        type: boolean
+                    required:
+                    - pdName
+                    type: object
+                  gitRepo:
+                    description: 'gitRepo represents a git repository at a particular
+                      revision. DEPRECATED: GitRepo is deprecated. To provision a
+                      container with a git repo, mount an EmptyDir into an InitContainer
+                      that clones the repo using git, then mount the EmptyDir into
+                      the Pod''s container.'
+                    properties:
+                      directory:
+                        description: directory is the target directory name. Must
+                          not contain or start with '..'.  If '.' is supplied, the
+                          volume directory will be the git repository.  Otherwise,
+                          if specified, the volume will contain the git repository
+                          in the subdirectory with the given name.
+                        type: string
+                      repository:
+                        description: repository is the URL
+                        type: string
+                      revision:
+                        description: revision is the commit hash for the specified
+                          revision.
+                        type: string
+                    required:
+                    - repository
+                    type: object
+                  glusterfs:
+                    description: 'glusterfs represents a Glusterfs mount on the host
+                      that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/glusterfs/README.md'
+                    properties:
+                      endpoints:
+                        description: 'endpoints is the endpoint name that details
+                          Glusterfs topology. More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                        type: string
+                      path:
+                        description: 'path is the Glusterfs volume path. More info:
+                          https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the Glusterfs volume
+                          to be mounted with read-only permissions. Defaults to false.
+                          More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod'
+                        type: boolean
+                    required:
+                    - endpoints
+                    - path
+                    type: object
+                  hostPath:
+                    description: 'hostPath represents a pre-existing file or directory
+                      on the host machine that is directly exposed to the container.
+                      This is generally used for system agents or other privileged
+                      things that are allowed to see the host machine. Most containers
+                      will NOT need this. More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath
+                      --- TODO(jonesdl) We need to restrict who can use host directory
+                      mounts and who can/can not mount host directories as read/write.'
+                    properties:
+                      path:
+                        description: 'path of the directory on the host. If the path
+                          is a symlink, it will follow the link to the real path.
+                          More info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                        type: string
+                      type:
+                        description: 'type for HostPath Volume Defaults to "" More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#hostpath'
+                        type: string
+                    required:
+                    - path
+                    type: object
+                  iscsi:
+                    description: 'iscsi represents an ISCSI Disk resource that is
+                      attached to a kubelet''s host machine and then exposed to the
+                      pod. More info: https://examples.k8s.io/volumes/iscsi/README.md'
+                    properties:
+                      chapAuthDiscovery:
+                        description: chapAuthDiscovery defines whether support iSCSI
+                          Discovery CHAP authentication
+                        type: boolean
+                      chapAuthSession:
+                        description: chapAuthSession defines whether support iSCSI
+                          Session CHAP authentication
+                        type: boolean
+                      fsType:
+                        description: 'fsType is the filesystem type of the volume
+                          that you want to mount. Tip: Ensure that the filesystem
+                          type is supported by the host operating system. Examples:
+                          "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#iscsi
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      initiatorName:
+                        description: initiatorName is the custom iSCSI Initiator Name.
+                          If initiatorName is specified with iscsiInterface simultaneously,
+                          new iSCSI interface <target portal>:<volume name> will be
+                          created for the connection.
+                        type: string
+                      iqn:
+                        description: iqn is the target iSCSI Qualified Name.
+                        type: string
+                      iscsiInterface:
+                        description: iscsiInterface is the interface Name that uses
+                          an iSCSI transport. Defaults to 'default' (tcp).
+                        type: string
+                      lun:
+                        description: lun represents iSCSI Target Lun number.
+                        format: int32
+                        type: integer
+                      portals:
+                        description: portals is the iSCSI Target Portal List. The
+                          portal is either an IP or ip_addr:port if the port is other
+                          than default (typically TCP ports 860 and 3260).
+                        items:
+                          type: string
+                        type: array
+                      readOnly:
+                        description: readOnly here will force the ReadOnly setting
+                          in VolumeMounts. Defaults to false.
+                        type: boolean
+                      secretRef:
+                        description: secretRef is the CHAP Secret for iSCSI target
+                          and initiator authentication
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      targetPortal:
+                        description: targetPortal is iSCSI Target Portal. The Portal
+                          is either an IP or ip_addr:port if the port is other than
+                          default (typically TCP ports 860 and 3260).
+                        type: string
+                    required:
+                    - iqn
+                    - lun
+                    - targetPortal
+                    type: object
+                  nfs:
+                    description: 'nfs represents an NFS mount on the host that shares
+                      a pod''s lifetime More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                    properties:
+                      path:
+                        description: 'path that is exported by the NFS server. More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the NFS export to be
+                          mounted with read-only permissions. Defaults to false. More
+                          info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                        type: boolean
+                      server:
+                        description: 'server is the hostname or IP address of the
+                          NFS server. More info: https://kubernetes.io/docs/concepts/storage/volumes#nfs'
+                        type: string
+                    required:
+                    - path
+                    - server
+                    type: object
+                  persistentVolumeClaim:
+                    description: 'persistentVolumeClaimVolumeSource represents a reference
+                      to a PersistentVolumeClaim in the same namespace. More info:
+                      https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                    properties:
+                      claimName:
+                        description: 'claimName is the name of a PersistentVolumeClaim
+                          in the same namespace as the pod using this volume. More
+                          info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
+                        type: string
+                      readOnly:
+                        description: readOnly Will force the ReadOnly setting in VolumeMounts.
+                          Default false.
+                        type: boolean
+                    required:
+                    - claimName
+                    type: object
+                  photonPersistentDisk:
+                    description: photonPersistentDisk represents a PhotonController
+                      persistent disk attached and mounted on kubelets host machine
+                    properties:
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      pdID:
+                        description: pdID is the ID that identifies Photon Controller
+                          persistent disk
+                        type: string
+                    required:
+                    - pdID
+                    type: object
+                  portworxVolume:
+                    description: portworxVolume represents a portworx volume attached
+                      and mounted on kubelets host machine
+                    properties:
+                      fsType:
+                        description: fSType represents the filesystem type to mount
+                          Must be a filesystem type supported by the host operating
+                          system. Ex. "ext4", "xfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      readOnly:
+                        description: readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      volumeID:
+                        description: volumeID uniquely identifies a Portworx volume
+                        type: string
+                    required:
+                    - volumeID
+                    type: object
+                  projected:
+                    description: projected items for all in one resources secrets,
+                      configmaps, and downward API
+                    properties:
+                      defaultMode:
+                        description: defaultMode are the mode bits used to set permissions
+                          on created files by default. Must be an octal value between
+                          0000 and 0777 or a decimal value between 0 and 511. YAML
+                          accepts both octal and decimal values, JSON requires decimal
+                          values for mode bits. Directories within the path are not
+                          affected by this setting. This might be in conflict with
+                          other options that affect the file mode, like fsGroup, and
+                          the result can be other mode bits set.
+                        format: int32
+                        type: integer
+                      sources:
+                        description: sources is the list of volume projections
+                        items:
+                          description: Projection that may be projected along with
+                            other supported volume types
+                          properties:
+                            configMap:
+                              description: configMap information about the configMap
+                                data to project
+                              properties:
+                                items:
+                                  description: items if unspecified, each key-value
+                                    pair in the Data field of the referenced ConfigMap
+                                    will be projected into the volume as a file whose
+                                    name is the key and content is the value. If specified,
+                                    the listed keys will be projected into the specified
+                                    paths, and unlisted keys will not be present.
+                                    If a key is specified which is not present in
+                                    the ConfigMap, the volume setup will error unless
+                                    it is marked optional. Paths must be relative
+                                    and may not contain the '..' path or start with
+                                    '..'.
+                                  items:
+                                    description: Maps a string key to a path within
+                                      a volume.
+                                    properties:
+                                      key:
+                                        description: key is the key to project.
+                                        type: string
+                                      mode:
+                                        description: 'mode is Optional: mode bits
+                                          used to set permissions on this file. Must
+                                          be an octal value between 0000 and 0777
+                                          or a decimal value between 0 and 511. YAML
+                                          accepts both octal and decimal values, JSON
+                                          requires decimal values for mode bits. If
+                                          not specified, the volume defaultMode will
+                                          be used. This might be in conflict with
+                                          other options that affect the file mode,
+                                          like fsGroup, and the result can be other
+                                          mode bits set.'
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        description: path is the relative path of
+                                          the file to map the key to. May not be an
+                                          absolute path. May not contain the path
+                                          element '..'. May not start with the string
+                                          '..'.
+                                        type: string
+                                    required:
+                                    - key
+                                    - path
+                                    type: object
+                                  type: array
+                                name:
+                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    TODO: Add other useful fields. apiVersion, kind,
+                                    uid?'
+                                  type: string
+                                optional:
+                                  description: optional specify whether the ConfigMap
+                                    or its keys must be defined
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            downwardAPI:
+                              description: downwardAPI information about the downwardAPI
+                                data to project
+                              properties:
+                                items:
+                                  description: Items is a list of DownwardAPIVolume
+                                    file
+                                  items:
+                                    description: DownwardAPIVolumeFile represents
+                                      information to create the file containing the
+                                      pod field
+                                    properties:
+                                      fieldRef:
+                                        description: 'Required: Selects a field of
+                                          the pod: only annotations, labels, name
+                                          and namespace are supported.'
+                                        properties:
+                                          apiVersion:
+                                            description: Version of the schema the
+                                              FieldPath is written in terms of, defaults
+                                              to "v1".
+                                            type: string
+                                          fieldPath:
+                                            description: Path of the field to select
+                                              in the specified API version.
+                                            type: string
+                                        required:
+                                        - fieldPath
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                      mode:
+                                        description: 'Optional: mode bits used to
+                                          set permissions on this file, must be an
+                                          octal value between 0000 and 0777 or a decimal
+                                          value between 0 and 511. YAML accepts both
+                                          octal and decimal values, JSON requires
+                                          decimal values for mode bits. If not specified,
+                                          the volume defaultMode will be used. This
+                                          might be in conflict with other options
+                                          that affect the file mode, like fsGroup,
+                                          and the result can be other mode bits set.'
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        description: 'Required: Path is  the relative
+                                          path name of the file to be created. Must
+                                          not be absolute or contain the ''..'' path.
+                                          Must be utf-8 encoded. The first item of
+                                          the relative path must not start with ''..'''
+                                        type: string
+                                      resourceFieldRef:
+                                        description: 'Selects a resource of the container:
+                                          only resources limits and requests (limits.cpu,
+                                          limits.memory, requests.cpu and requests.memory)
+                                          are currently supported.'
+                                        properties:
+                                          containerName:
+                                            description: 'Container name: required
+                                              for volumes, optional for env vars'
+                                            type: string
+                                          divisor:
+                                            anyOf:
+                                            - type: integer
+                                            - type: string
+                                            description: Specifies the output format
+                                              of the exposed resources, defaults to
+                                              "1"
+                                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                                            x-kubernetes-int-or-string: true
+                                          resource:
+                                            description: 'Required: resource to select'
+                                            type: string
+                                        required:
+                                        - resource
+                                        type: object
+                                        x-kubernetes-map-type: atomic
+                                    required:
+                                    - path
+                                    type: object
+                                  type: array
+                              type: object
+                            secret:
+                              description: secret information about the secret data
+                                to project
+                              properties:
+                                items:
+                                  description: items if unspecified, each key-value
+                                    pair in the Data field of the referenced Secret
+                                    will be projected into the volume as a file whose
+                                    name is the key and content is the value. If specified,
+                                    the listed keys will be projected into the specified
+                                    paths, and unlisted keys will not be present.
+                                    If a key is specified which is not present in
+                                    the Secret, the volume setup will error unless
+                                    it is marked optional. Paths must be relative
+                                    and may not contain the '..' path or start with
+                                    '..'.
+                                  items:
+                                    description: Maps a string key to a path within
+                                      a volume.
+                                    properties:
+                                      key:
+                                        description: key is the key to project.
+                                        type: string
+                                      mode:
+                                        description: 'mode is Optional: mode bits
+                                          used to set permissions on this file. Must
+                                          be an octal value between 0000 and 0777
+                                          or a decimal value between 0 and 511. YAML
+                                          accepts both octal and decimal values, JSON
+                                          requires decimal values for mode bits. If
+                                          not specified, the volume defaultMode will
+                                          be used. This might be in conflict with
+                                          other options that affect the file mode,
+                                          like fsGroup, and the result can be other
+                                          mode bits set.'
+                                        format: int32
+                                        type: integer
+                                      path:
+                                        description: path is the relative path of
+                                          the file to map the key to. May not be an
+                                          absolute path. May not contain the path
+                                          element '..'. May not start with the string
+                                          '..'.
+                                        type: string
+                                    required:
+                                    - key
+                                    - path
+                                    type: object
+                                  type: array
+                                name:
+                                  description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                                    TODO: Add other useful fields. apiVersion, kind,
+                                    uid?'
+                                  type: string
+                                optional:
+                                  description: optional field specify whether the
+                                    Secret or its key must be defined
+                                  type: boolean
+                              type: object
+                              x-kubernetes-map-type: atomic
+                            serviceAccountToken:
+                              description: serviceAccountToken is information about
+                                the serviceAccountToken data to project
+                              properties:
+                                audience:
+                                  description: audience is the intended audience of
+                                    the token. A recipient of a token must identify
+                                    itself with an identifier specified in the audience
+                                    of the token, and otherwise should reject the
+                                    token. The audience defaults to the identifier
+                                    of the apiserver.
+                                  type: string
+                                expirationSeconds:
+                                  description: expirationSeconds is the requested
+                                    duration of validity of the service account token.
+                                    As the token approaches expiration, the kubelet
+                                    volume plugin will proactively rotate the service
+                                    account token. The kubelet will start trying to
+                                    rotate the token if the token is older than 80
+                                    percent of its time to live or if the token is
+                                    older than 24 hours.Defaults to 1 hour and must
+                                    be at least 10 minutes.
+                                  format: int64
+                                  type: integer
+                                path:
+                                  description: path is the path relative to the mount
+                                    point of the file to project the token into.
+                                  type: string
+                              required:
+                              - path
+                              type: object
+                          type: object
+                        type: array
+                    type: object
+                  quobyte:
+                    description: quobyte represents a Quobyte mount on the host that
+                      shares a pod's lifetime
+                    properties:
+                      group:
+                        description: group to map volume access to Default is no group
+                        type: string
+                      readOnly:
+                        description: readOnly here will force the Quobyte volume to
+                          be mounted with read-only permissions. Defaults to false.
+                        type: boolean
+                      registry:
+                        description: registry represents a single or multiple Quobyte
+                          Registry services specified as a string as host:port pair
+                          (multiple entries are separated with commas) which acts
+                          as the central registry for volumes
+                        type: string
+                      tenant:
+                        description: tenant owning the given Quobyte volume in the
+                          Backend Used with dynamically provisioned Quobyte volumes,
+                          value is set by the plugin
+                        type: string
+                      user:
+                        description: user to map volume access to Defaults to serivceaccount
+                          user
+                        type: string
+                      volume:
+                        description: volume is a string that references an already
+                          created Quobyte volume by name.
+                        type: string
+                    required:
+                    - registry
+                    - volume
+                    type: object
+                  rbd:
+                    description: 'rbd represents a Rados Block Device mount on the
+                      host that shares a pod''s lifetime. More info: https://examples.k8s.io/volumes/rbd/README.md'
+                    properties:
+                      fsType:
+                        description: 'fsType is the filesystem type of the volume
+                          that you want to mount. Tip: Ensure that the filesystem
+                          type is supported by the host operating system. Examples:
+                          "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified. More info: https://kubernetes.io/docs/concepts/storage/volumes#rbd
+                          TODO: how do we prevent errors in the filesystem from compromising
+                          the machine'
+                        type: string
+                      image:
+                        description: 'image is the rados image name. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                      keyring:
+                        description: 'keyring is the path to key ring for RBDUser.
+                          Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                      monitors:
+                        description: 'monitors is a collection of Ceph monitors. More
+                          info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        items:
+                          type: string
+                        type: array
+                      pool:
+                        description: 'pool is the rados pool name. Default is rbd.
+                          More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                      readOnly:
+                        description: 'readOnly here will force the ReadOnly setting
+                          in VolumeMounts. Defaults to false. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: boolean
+                      secretRef:
+                        description: 'secretRef is name of the authentication secret
+                          for RBDUser. If provided overrides keyring. Default is nil.
+                          More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      user:
+                        description: 'user is the rados user name. Default is admin.
+                          More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it'
+                        type: string
+                    required:
+                    - image
+                    - monitors
+                    type: object
+                  scaleIO:
+                    description: scaleIO represents a ScaleIO persistent volume attached
+                      and mounted on Kubernetes nodes.
+                    properties:
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Default is "xfs".
+                        type: string
+                      gateway:
+                        description: gateway is the host address of the ScaleIO API
+                          Gateway.
+                        type: string
+                      protectionDomain:
+                        description: protectionDomain is the name of the ScaleIO Protection
+                          Domain for the configured storage.
+                        type: string
+                      readOnly:
+                        description: readOnly Defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      secretRef:
+                        description: secretRef references to the secret for ScaleIO
+                          user and other sensitive information. If this is not provided,
+                          Login operation will fail.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      sslEnabled:
+                        description: sslEnabled Flag enable/disable SSL communication
+                          with Gateway, default false
+                        type: boolean
+                      storageMode:
+                        description: storageMode indicates whether the storage for
+                          a volume should be ThickProvisioned or ThinProvisioned.
+                          Default is ThinProvisioned.
+                        type: string
+                      storagePool:
+                        description: storagePool is the ScaleIO Storage Pool associated
+                          with the protection domain.
+                        type: string
+                      system:
+                        description: system is the name of the storage system as configured
+                          in ScaleIO.
+                        type: string
+                      volumeName:
+                        description: volumeName is the name of a volume already created
+                          in the ScaleIO system that is associated with this volume
+                          source.
+                        type: string
+                    required:
+                    - gateway
+                    - secretRef
+                    - system
+                    type: object
+                  secret:
+                    description: 'secret represents a secret that should populate
+                      this volume. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                    properties:
+                      defaultMode:
+                        description: 'defaultMode is Optional: mode bits used to set
+                          permissions on created files by default. Must be an octal
+                          value between 0000 and 0777 or a decimal value between 0
+                          and 511. YAML accepts both octal and decimal values, JSON
+                          requires decimal values for mode bits. Defaults to 0644.
+                          Directories within the path are not affected by this setting.
+                          This might be in conflict with other options that affect
+                          the file mode, like fsGroup, and the result can be other
+                          mode bits set.'
+                        format: int32
+                        type: integer
+                      items:
+                        description: items If unspecified, each key-value pair in
+                          the Data field of the referenced Secret will be projected
+                          into the volume as a file whose name is the key and content
+                          is the value. If specified, the listed keys will be projected
+                          into the specified paths, and unlisted keys will not be
+                          present. If a key is specified which is not present in the
+                          Secret, the volume setup will error unless it is marked
+                          optional. Paths must be relative and may not contain the
+                          '..' path or start with '..'.
+                        items:
+                          description: Maps a string key to a path within a volume.
+                          properties:
+                            key:
+                              description: key is the key to project.
+                              type: string
+                            mode:
+                              description: 'mode is Optional: mode bits used to set
+                                permissions on this file. Must be an octal value between
+                                0000 and 0777 or a decimal value between 0 and 511.
+                                YAML accepts both octal and decimal values, JSON requires
+                                decimal values for mode bits. If not specified, the
+                                volume defaultMode will be used. This might be in
+                                conflict with other options that affect the file mode,
+                                like fsGroup, and the result can be other mode bits
+                                set.'
+                              format: int32
+                              type: integer
+                            path:
+                              description: path is the relative path of the file to
+                                map the key to. May not be an absolute path. May not
+                                contain the path element '..'. May not start with
+                                the string '..'.
+                              type: string
+                          required:
+                          - key
+                          - path
+                          type: object
+                        type: array
+                      optional:
+                        description: optional field specify whether the Secret or
+                          its keys must be defined
+                        type: boolean
+                      secretName:
+                        description: 'secretName is the name of the secret in the
+                          pod''s namespace to use. More info: https://kubernetes.io/docs/concepts/storage/volumes#secret'
+                        type: string
+                    type: object
+                  storageos:
+                    description: storageOS represents a StorageOS volume attached
+                      and mounted on Kubernetes nodes.
+                    properties:
+                      fsType:
+                        description: fsType is the filesystem type to mount. Must
+                          be a filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      readOnly:
+                        description: readOnly defaults to false (read/write). ReadOnly
+                          here will force the ReadOnly setting in VolumeMounts.
+                        type: boolean
+                      secretRef:
+                        description: secretRef specifies the secret to use for obtaining
+                          the StorageOS API credentials.  If not specified, default
+                          values will be attempted.
+                        properties:
+                          name:
+                            description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              TODO: Add other useful fields. apiVersion, kind, uid?'
+                            type: string
+                        type: object
+                        x-kubernetes-map-type: atomic
+                      volumeName:
+                        description: volumeName is the human-readable name of the
+                          StorageOS volume.  Volume names are only unique within a
+                          namespace.
+                        type: string
+                      volumeNamespace:
+                        description: volumeNamespace specifies the scope of the volume
+                          within StorageOS.  If no namespace is specified then the
+                          Pod's namespace will be used.  This allows the Kubernetes
+                          name scoping to be mirrored within StorageOS for tighter
+                          integration. Set VolumeName to any name to override the
+                          default behaviour. Set to "default" if you are not using
+                          namespaces within StorageOS. Namespaces that do not pre-exist
+                          within StorageOS will be created.
+                        type: string
+                    type: object
+                  vsphereVolume:
+                    description: vsphereVolume represents a vSphere volume attached
+                      and mounted on kubelets host machine
+                    properties:
+                      fsType:
+                        description: fsType is filesystem type to mount. Must be a
+                          filesystem type supported by the host operating system.
+                          Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4"
+                          if unspecified.
+                        type: string
+                      storagePolicyID:
+                        description: storagePolicyID is the storage Policy Based Management
+                          (SPBM) profile ID associated with the StoragePolicyName.
+                        type: string
+                      storagePolicyName:
+                        description: storagePolicyName is the storage Policy Based
+                          Management (SPBM) profile name.
+                        type: string
+                      volumePath:
+                        description: volumePath is the path that identifies vSphere
+                          volume vmdk
+                        type: string
+                    required:
+                    - volumePath
+                    type: object
+                type: object
               priorityClassName:
                 description: PriorityClassName represents the pod's priority class.
                 type: string
@@ -20455,7 +22166,8 @@ spec:
                   type: object
                 type: array
               replicas:
-                description: Numbers of the Fluentd instance
+                description: Numbers of the Fluentd instance Applicable when the mode
+                  is "collector", and will be ignored when the mode is "agent"
                 format: int32
                 type: integer
               resources:
@@ -20749,6 +22461,8 @@ spec:
                   for mapping network identities to claims in a way that maintains
                   the identity of a pod. Every claim in this list must have at least
                   one matching (by name) volumeMount in one container in the template.
+                  Applicable when the mode is "collector", and will be ignored when
+                  the mode is "agent"
                 items:
                   description: PersistentVolumeClaim is a user's request for and claim
                     to a persistent volume
diff --git a/pkg/operator/fluentd-daemonset.go b/pkg/operator/fluentd-daemonset.go
new file mode 100644
index 000000000..2fb58e95f
--- /dev/null
+++ b/pkg/operator/fluentd-daemonset.go
@@ -0,0 +1,195 @@
+package operator
+
+import (
+	"fmt"
+
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	fluentdv1alpha1 "github.com/fluent/fluent-operator/v2/apis/fluentd/v1alpha1"
+)
+
+func MakeFluentdDaemonSet(fd fluentdv1alpha1.Fluentd) *appsv1.DaemonSet {
+
+	ports := makeFluentdPorts(fd)
+
+	labels := map[string]string{
+		"app.kubernetes.io/name":      fd.Name,
+		"app.kubernetes.io/instance":  "fluentd",
+		"app.kubernetes.io/component": "fluentd",
+	}
+
+	if len(fd.Labels) > 0 {
+		for k, v := range fd.Labels {
+			if _, ok := labels[k]; !ok {
+				labels[k] = v
+			}
+		}
+	}
+
+	daemonSet := appsv1.DaemonSet{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:        fd.Name,
+			Namespace:   fd.Namespace,
+			Labels:      labels,
+			Annotations: fd.Annotations,
+		},
+		Spec: appsv1.DaemonSetSpec{
+			Selector: &metav1.LabelSelector{
+				MatchLabels: labels,
+			},
+			Template: corev1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:        fd.Name,
+					Namespace:   fd.Namespace,
+					Labels:      labels,
+					Annotations: fd.Spec.Annotations,
+				},
+				Spec: corev1.PodSpec{
+					ServiceAccountName: fd.Name,
+					ImagePullSecrets:   fd.Spec.ImagePullSecrets,
+					Volumes: []corev1.Volume{
+						{
+							Name: SecretVolName,
+							VolumeSource: corev1.VolumeSource{
+								Secret: &corev1.SecretVolumeSource{
+									SecretName: fmt.Sprintf("%s-config", fd.Name),
+								},
+							},
+						},
+						{
+							Name: "varlogs",
+							VolumeSource: corev1.VolumeSource{
+								HostPath: &corev1.HostPathVolumeSource{
+									Path: "/var/log",
+								},
+							},
+						},
+						{
+							Name: "systemd",
+							VolumeSource: corev1.VolumeSource{
+								HostPath: &corev1.HostPathVolumeSource{
+									Path: "/var/log/journal",
+								},
+							},
+						},
+					},
+					Containers: []corev1.Container{
+						{
+							Name:            "fluentd",
+							Image:           fd.Spec.Image,
+							Args:            fd.Spec.Args,
+							ImagePullPolicy: fd.Spec.ImagePullPolicy,
+							Ports:           ports,
+							VolumeMounts: []corev1.VolumeMount{
+								{
+									Name:      SecretVolName,
+									ReadOnly:  true,
+									MountPath: FluentdMountPath,
+								},
+								{
+									Name:      "varlogs",
+									ReadOnly:  true,
+									MountPath: "/var/log/",
+								},
+								{
+									Name:      "systemd",
+									ReadOnly:  true,
+									MountPath: "/var/log/journal",
+								},
+							},
+							Resources: fd.Spec.Resources,
+							Env: []corev1.EnvVar{
+								{
+									Name:  "BUFFER_PATH",
+									Value: BufferMountPath,
+								},
+							},
+							SecurityContext: fd.Spec.ContainerSecurityContext,
+						},
+					},
+					NodeSelector: fd.Spec.NodeSelector,
+					Tolerations:  fd.Spec.Tolerations,
+					Affinity:     fd.Spec.Affinity,
+				},
+			},
+		},
+	}
+
+	if fd.Spec.RuntimeClassName != "" {
+		daemonSet.Spec.Template.Spec.RuntimeClassName = &fd.Spec.RuntimeClassName
+	}
+
+	if fd.Spec.PriorityClassName != "" {
+		daemonSet.Spec.Template.Spec.PriorityClassName = fd.Spec.PriorityClassName
+	}
+
+	if fd.Spec.Volumes != nil {
+		daemonSet.Spec.Template.Spec.Volumes = append(daemonSet.Spec.Template.Spec.Volumes, fd.Spec.Volumes...)
+	}
+
+	if fd.Spec.VolumeMounts != nil {
+		daemonSet.Spec.Template.Spec.Containers[0].VolumeMounts = append(daemonSet.Spec.Template.Spec.Containers[0].VolumeMounts, fd.Spec.VolumeMounts...)
+	}
+
+	if fd.Spec.EnvVars != nil {
+		daemonSet.Spec.Template.Spec.Containers[0].Env = append(daemonSet.Spec.Template.Spec.Containers[0].Env, fd.Spec.EnvVars...)
+	}
+
+	if fd.Spec.SecurityContext != nil {
+		daemonSet.Spec.Template.Spec.SecurityContext = fd.Spec.SecurityContext
+	}
+
+	if fd.Spec.SchedulerName != "" {
+		daemonSet.Spec.Template.Spec.SchedulerName = fd.Spec.SchedulerName
+	}
+
+	if fd.Spec.PositionDB != (corev1.VolumeSource{}) {
+		daemonSet.Spec.Template.Spec.Volumes = append(daemonSet.Spec.Template.Spec.Volumes, corev1.Volume{
+			Name:         "positions",
+			VolumeSource: fd.Spec.PositionDB,
+		})
+		daemonSet.Spec.Template.Spec.Containers[0].VolumeMounts = append(daemonSet.Spec.Template.Spec.Containers[0].VolumeMounts, corev1.VolumeMount{
+			Name:      "positions",
+			MountPath: "/fluentd/tail",
+		})
+	}
+	// Mount host or emptydir VolumeSource
+	if fd.Spec.BufferVolume != nil && !fd.Spec.BufferVolume.DisableBufferVolume {
+		bufferVolName := fmt.Sprintf("%s-buffer", fd.Name)
+		bufferpv := fd.Spec.BufferVolume
+
+		if bufferpv.HostPath != nil {
+			daemonSet.Spec.Template.Spec.Volumes = append(daemonSet.Spec.Template.Spec.Volumes, corev1.Volume{
+				Name: bufferVolName,
+				VolumeSource: corev1.VolumeSource{
+					HostPath: bufferpv.HostPath,
+				},
+			})
+
+			daemonSet.Spec.Template.Spec.Containers[0].VolumeMounts = append(daemonSet.Spec.Template.Spec.Containers[0].VolumeMounts, corev1.VolumeMount{
+				Name:      bufferVolName,
+				MountPath: BufferMountPath,
+			})
+			return &daemonSet
+		}
+
+		if bufferpv.EmptyDir != nil {
+			daemonSet.Spec.Template.Spec.Volumes = append(daemonSet.Spec.Template.Spec.Volumes, corev1.Volume{
+				Name: bufferVolName,
+				VolumeSource: corev1.VolumeSource{
+					EmptyDir: bufferpv.EmptyDir,
+				},
+			})
+
+			daemonSet.Spec.Template.Spec.Containers[0].VolumeMounts = append(daemonSet.Spec.Template.Spec.Containers[0].VolumeMounts, corev1.VolumeMount{
+				Name:      bufferVolName,
+				MountPath: BufferMountPath,
+			})
+
+			return &daemonSet
+		}
+	}
+	return &daemonSet
+}
diff --git a/pkg/operator/sts.go b/pkg/operator/sts.go
index 6b8b00342..baa84c00c 100644
--- a/pkg/operator/sts.go
+++ b/pkg/operator/sts.go
@@ -31,13 +31,13 @@ const (
 	InputHttpType    = "http"
 )
 
-func MakeStatefulset(fd fluentdv1alpha1.Fluentd) *appsv1.StatefulSet {
+func MakeStatefulSet(fd fluentdv1alpha1.Fluentd) *appsv1.StatefulSet {
 	replicas := *fd.Spec.Replicas
 	if replicas == 0 {
 		replicas = 1
 	}
 
-	ports := makeStatefulsetPorts(fd)
+	ports := makeFluentdPorts(fd)
 
 	labels := map[string]string{
 		"app.kubernetes.io/name":      fd.Name,
@@ -201,7 +201,7 @@ func MakeStatefulset(fd fluentdv1alpha1.Fluentd) *appsv1.StatefulSet {
 	return &sts
 }
 
-func makeStatefulsetPorts(fd fluentdv1alpha1.Fluentd) []corev1.ContainerPort {
+func makeFluentdPorts(fd fluentdv1alpha1.Fluentd) []corev1.ContainerPort {
 	ports := []corev1.ContainerPort{
 		{
 			Name:          MetricsName,