From 360247556ea74f7ffcc4b6121ae16d502cb1720e Mon Sep 17 00:00:00 2001
From: zhu733756 <zhu733756@kubesphere.io>
Date: Fri, 11 Feb 2022 15:20:17 +0800
Subject: [PATCH] refactor selectors in clusterfluentdconfig/fluentdconfig

Signed-off-by: zhu733756 <zhu733756@kubesphere.io>
---
 .../v1alpha1/clusterfluentdconfig_types.go    |   4 +-
 apis/fluentd/v1alpha1/fluentdconfig_types.go  |  12 +-
 apis/fluentd/v1alpha1/helper.go               |   4 +-
 .../v1alpha1/tests/expected-main-cfgs.cfg     |  28 ++---
 .../fluentd/v1alpha1/zz_generated.deepcopy.go |  49 ++++++--
 ...uentd.fluent.io_clusterfluentdconfigs.yaml |  20 ++--
 .../fluentd.fluent.io_fluentdconfigs.yaml     |  92 +++++++++++++-
 controllers/fluentdconfig_controller.go       |  63 +++++-----
 ...ntd-cluster-cfg-output-buffer-example.yaml |   6 +-
 .../fluentd-cluster-cfg-output-es.yaml        |   4 +-
 .../fluentd-cluster-cfg-output-kafka.yaml     |   6 +-
 ...luentd-mixed-cfgs-multi-tenant-output.yaml |  29 +++--
 .../forward/fluentd-mixed-cfgs-output-es.yaml |   6 +-
 .../fluentd-namespaced-cfg-output-es.yaml     |   2 +-
 manifests/setup/fluent-operator-crd.yaml      | 112 ++++++++++++++++--
 manifests/setup/setup.yaml                    | 112 ++++++++++++++++--
 16 files changed, 425 insertions(+), 124 deletions(-)

diff --git a/apis/fluentd/v1alpha1/clusterfluentdconfig_types.go b/apis/fluentd/v1alpha1/clusterfluentdconfig_types.go
index db16fabdc..b2d26a631 100644
--- a/apis/fluentd/v1alpha1/clusterfluentdconfig_types.go
+++ b/apis/fluentd/v1alpha1/clusterfluentdconfig_types.go
@@ -40,9 +40,9 @@ type ClusterFluentdConfigSpec struct {
 	// Use this field to filter the logs, will make no effect if EnableFilterKubernetes is set false.
 	WatchedLabels map[string]string `json:"watchedLabels,omitempty"`
 	// Select filter plugins
-	FilterSelector metav1.LabelSelector `json:"filterSelector,omitempty"`
+	ClusterFilterSelector *metav1.LabelSelector `json:"clusterFilterSelector,omitempty"`
 	// Select output plugins
-	OutputSelector metav1.LabelSelector `json:"outputSelector,omitempty"`
+	ClusterOutputSelector *metav1.LabelSelector `json:"clusterOutputSelector,omitempty"`
 }
 
 // ClusterFluentdConfigStatus defines the observed state of ClusterFluentdConfig
diff --git a/apis/fluentd/v1alpha1/fluentdconfig_types.go b/apis/fluentd/v1alpha1/fluentdconfig_types.go
index 701a86460..8e252016f 100644
--- a/apis/fluentd/v1alpha1/fluentdconfig_types.go
+++ b/apis/fluentd/v1alpha1/fluentdconfig_types.go
@@ -37,10 +37,14 @@ type FluentdConfigSpec struct {
 	WatchedContainers []string `json:"watchedConstainers,omitempty"`
 	// Use this field to filter the logs, will make no effect if EnableFilterKubernetes is set false.
 	WatchedLabels map[string]string `json:"watchedLabels,omitempty"`
-	// Select filter plugins
-	FilterSelector metav1.LabelSelector `json:"filterSelector,omitempty"`
-	// Select output plugins
-	OutputSelector metav1.LabelSelector `json:"outputSelector,omitempty"`
+	// Select namespaced filter plugins
+	FilterSelector *metav1.LabelSelector `json:"filterSelector,omitempty"`
+	// Select namespaced output plugins
+	OutputSelector *metav1.LabelSelector `json:"outputSelector,omitempty"`
+	// Select clusterfilter plugins
+	ClusterFilterSelector *metav1.LabelSelector `json:"clusterFilterSelector,omitempty"`
+	// Select clusteroutput plugins
+	ClusterOutputSelector *metav1.LabelSelector `json:"clusterOutputSelector,omitempty"`
 }
 
 // FluentdConfigStatus defines the observed state of FluentdConfig
diff --git a/apis/fluentd/v1alpha1/helper.go b/apis/fluentd/v1alpha1/helper.go
index 8b32b6577..2d7359a4b 100644
--- a/apis/fluentd/v1alpha1/helper.go
+++ b/apis/fluentd/v1alpha1/helper.go
@@ -164,7 +164,7 @@ func (pgr *PluginResources) PatchAndFilterNamespacedLevelResources(sl plugins.Se
 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)
+		filterId := fmt.Sprintf("%s::%s::%s::%s-%d", cfgId, namespace, crdtype, name, n)
 		filter.FilterCommon.Id = &filterId
 		filter.FilterCommon.Tag = &params.DefaultTag
 
@@ -188,7 +188,7 @@ func (r *CfgResources) filterForFilters(cfgId, namespace, name, crdtype string,
 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)
+		outputId := fmt.Sprintf("%s::%s::%s::%s-%d", cfgId, namespace, crdtype, name, n)
 		output.OutputCommon.Id = &outputId
 		output.OutputCommon.Tag = &params.DefaultTag
 
diff --git a/apis/fluentd/v1alpha1/tests/expected-main-cfgs.cfg b/apis/fluentd/v1alpha1/tests/expected-main-cfgs.cfg
index bf5922def..8fd0b9102 100644
--- a/apis/fluentd/v1alpha1/tests/expected-main-cfgs.cfg
+++ b/apis/fluentd/v1alpha1/tests/expected-main-cfgs.cfg
@@ -30,7 +30,7 @@
 </match>
 <label @77325a720438bcf8ce64b8843429c689>
   <filter **>
-    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0-cluster-clusterfilter-clusterfilter1-0
+    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0::cluster::clusterfilter::clusterfilter1-0
     @type  record_transformer
     <record>
       avg  ${record["total"] / record["count"]}
@@ -38,7 +38,7 @@
     </record>
   </filter>
   <filter **>
-    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0-cluster-clusterfilter-clusterfilter1-1
+    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0::cluster::clusterfilter::clusterfilter1-1
     @type  grep
     <exclude>
       key  message
@@ -58,14 +58,14 @@
     </regexp>
   </filter>
   <filter **>
-    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0-cluster-clusterfilter-clusterfilter2-1
+    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0::cluster::clusterfilter::clusterfilter2-1
     @type  stdout
     <format>
       @type  json
     </format>
   </filter>
   <filter **>
-    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0-cluster-clusterfilter-clusterfilter3-0
+    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0::cluster::clusterfilter::clusterfilter3-0
     @type  parser
     <parse>
       @type  regexp
@@ -74,7 +74,7 @@
     </parse>
   </filter>
   <match **>
-    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0-cluster-clusteroutput-clusteroutput1-0
+    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0::cluster::clusteroutput::clusteroutput1-0
     @type  forward
     <buffer buffertag.*>
       @id  common_buffer
@@ -92,7 +92,7 @@
     </service_discovery>
   </match>
   <match **>
-    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0-cluster-clusteroutput-clusteroutput1-1
+    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0::cluster::clusteroutput::clusteroutput1-1
     @type  kafka2
     brokers  broker1,broker2
     <buffer buffertag.*>
@@ -106,7 +106,7 @@
     </format>
   </match>
   <match **>
-    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0-cluster-clusteroutput-clusteroutput2-1
+    @id  ClusterFluentdConfig-cluster-clusterfluentdconfig0::cluster::clusteroutput::clusteroutput2-1
     @type  http
     endpoint  http://logserver.com:9000/api
     open_timeout  2
@@ -125,7 +125,7 @@
 </label>
 <label @7c5eaa432199cc1c1a547dff0dcdef83>
   <filter **>
-    @id  FluentdConfig-testnamespace-fluentdconfig0-testnamespace-filter-filter1-0
+    @id  FluentdConfig-testnamespace-fluentdconfig0::testnamespace::filter::filter1-0
     @type  record_transformer
     <record>
       avg  ${record["total"] / record["count"]}
@@ -133,7 +133,7 @@
     </record>
   </filter>
   <filter **>
-    @id  FluentdConfig-testnamespace-fluentdconfig0-testnamespace-filter-filter1-1
+    @id  FluentdConfig-testnamespace-fluentdconfig0::testnamespace::filter::filter1-1
     @type  grep
     <exclude>
       key  message
@@ -153,14 +153,14 @@
     </regexp>
   </filter>
   <filter **>
-    @id  FluentdConfig-testnamespace-fluentdconfig0-testnamespace-filter-filter2-1
+    @id  FluentdConfig-testnamespace-fluentdconfig0::testnamespace::filter::filter2-1
     @type  stdout
     <format>
       @type  json
     </format>
   </filter>
   <filter **>
-    @id  FluentdConfig-testnamespace-fluentdconfig0-testnamespace-filter-filter3-0
+    @id  FluentdConfig-testnamespace-fluentdconfig0::testnamespace::filter::filter3-0
     @type  parser
     <parse>
       @type  regexp
@@ -169,7 +169,7 @@
     </parse>
   </filter>
   <match **>
-    @id  FluentdConfig-testnamespace-fluentdconfig0-testnamespace-output-output1-0
+    @id  FluentdConfig-testnamespace-fluentdconfig0::testnamespace::output::output1-0
     @type  forward
     <buffer buffertag.*>
       @id  common_buffer
@@ -187,7 +187,7 @@
     </service_discovery>
   </match>
   <match **>
-    @id  FluentdConfig-testnamespace-fluentdconfig0-testnamespace-output-output1-1
+    @id  FluentdConfig-testnamespace-fluentdconfig0::testnamespace::output::output1-1
     @type  kafka2
     brokers  broker1,broker2
     <buffer buffertag.*>
@@ -201,7 +201,7 @@
     </format>
   </match>
   <match **>
-    @id  FluentdConfig-testnamespace-fluentdconfig0-testnamespace-output-output2-1
+    @id  FluentdConfig-testnamespace-fluentdconfig0::testnamespace::output::output2-1
     @type  http
     endpoint  http://logserver.com:9000/api
     open_timeout  2
diff --git a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
index 0ea9eb074..f775a8014 100644
--- a/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/fluentd/v1alpha1/zz_generated.deepcopy.go
@@ -25,7 +25,8 @@ import (
 	"fluent.io/fluent-operator/apis/fluentd/v1alpha1/plugins/filter"
 	"fluent.io/fluent-operator/apis/fluentd/v1alpha1/plugins/input"
 	"fluent.io/fluent-operator/apis/fluentd/v1alpha1/plugins/output"
-	"k8s.io/api/core/v1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -34,17 +35,17 @@ func (in *BufferVolume) DeepCopyInto(out *BufferVolume) {
 	*out = *in
 	if in.HostPath != nil {
 		in, out := &in.HostPath, &out.HostPath
-		*out = new(v1.HostPathVolumeSource)
+		*out = new(corev1.HostPathVolumeSource)
 		(*in).DeepCopyInto(*out)
 	}
 	if in.EmptyDir != nil {
 		in, out := &in.EmptyDir, &out.EmptyDir
-		*out = new(v1.EmptyDirVolumeSource)
+		*out = new(corev1.EmptyDirVolumeSource)
 		(*in).DeepCopyInto(*out)
 	}
 	if in.PersistentVolumeClaim != nil {
 		in, out := &in.PersistentVolumeClaim, &out.PersistentVolumeClaim
-		*out = new(v1.PersistentVolumeClaim)
+		*out = new(corev1.PersistentVolumeClaim)
 		(*in).DeepCopyInto(*out)
 	}
 }
@@ -239,8 +240,16 @@ func (in *ClusterFluentdConfigSpec) DeepCopyInto(out *ClusterFluentdConfigSpec)
 			(*out)[key] = val
 		}
 	}
-	in.FilterSelector.DeepCopyInto(&out.FilterSelector)
-	in.OutputSelector.DeepCopyInto(&out.OutputSelector)
+	if in.ClusterFilterSelector != nil {
+		in, out := &in.ClusterFilterSelector, &out.ClusterFilterSelector
+		*out = new(v1.LabelSelector)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.ClusterOutputSelector != nil {
+		in, out := &in.ClusterOutputSelector, &out.ClusterOutputSelector
+		*out = new(v1.LabelSelector)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterFluentdConfigSpec.
@@ -566,8 +575,26 @@ func (in *FluentdConfigSpec) DeepCopyInto(out *FluentdConfigSpec) {
 			(*out)[key] = val
 		}
 	}
-	in.FilterSelector.DeepCopyInto(&out.FilterSelector)
-	in.OutputSelector.DeepCopyInto(&out.OutputSelector)
+	if in.FilterSelector != nil {
+		in, out := &in.FilterSelector, &out.FilterSelector
+		*out = new(v1.LabelSelector)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.OutputSelector != nil {
+		in, out := &in.OutputSelector, &out.OutputSelector
+		*out = new(v1.LabelSelector)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.ClusterFilterSelector != nil {
+		in, out := &in.ClusterFilterSelector, &out.ClusterFilterSelector
+		*out = new(v1.LabelSelector)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.ClusterOutputSelector != nil {
+		in, out := &in.ClusterOutputSelector, &out.ClusterOutputSelector
+		*out = new(v1.LabelSelector)
+		(*in).DeepCopyInto(*out)
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FluentdConfigSpec.
@@ -660,7 +687,7 @@ func (in *FluentdSpec) DeepCopyInto(out *FluentdSpec) {
 	}
 	if in.ImagePullSecrets != nil {
 		in, out := &in.ImagePullSecrets, &out.ImagePullSecrets
-		*out = make([]v1.LocalObjectReference, len(*in))
+		*out = make([]corev1.LocalObjectReference, len(*in))
 		copy(*out, *in)
 	}
 	in.Resources.DeepCopyInto(&out.Resources)
@@ -673,12 +700,12 @@ func (in *FluentdSpec) DeepCopyInto(out *FluentdSpec) {
 	}
 	if in.Affinity != nil {
 		in, out := &in.Affinity, &out.Affinity
-		*out = new(v1.Affinity)
+		*out = new(corev1.Affinity)
 		(*in).DeepCopyInto(*out)
 	}
 	if in.Tolerations != nil {
 		in, out := &in.Tolerations, &out.Tolerations
-		*out = make([]v1.Toleration, len(*in))
+		*out = make([]corev1.Toleration, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
diff --git a/config/crd/bases/fluentd.fluent.io_clusterfluentdconfigs.yaml b/config/crd/bases/fluentd.fluent.io_clusterfluentdconfigs.yaml
index 9ce2f1505..cedd30905 100644
--- a/config/crd/bases/fluentd.fluent.io_clusterfluentdconfigs.yaml
+++ b/config/crd/bases/fluentd.fluent.io_clusterfluentdconfigs.yaml
@@ -39,15 +39,7 @@ spec:
           spec:
             description: ClusterFluentdConfigSpec defines the desired state of ClusterFluentdConfig
             properties:
-              emit_mode:
-                description: 'Emit mode. If batch, the plugin will emit events per
-                  labels matched. Enum: record, batch. will make no effect if EnableFilterKubernetes
-                  is set false.'
-                enum:
-                - record
-                - batch
-                type: string
-              filterSelector:
+              clusterFilterSelector:
                 description: Select filter plugins
                 properties:
                   matchExpressions:
@@ -91,7 +83,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
-              outputSelector:
+              clusterOutputSelector:
                 description: Select output plugins
                 properties:
                   matchExpressions:
@@ -135,6 +127,14 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+              emit_mode:
+                description: 'Emit mode. If batch, the plugin will emit events per
+                  labels matched. Enum: record, batch. will make no effect if EnableFilterKubernetes
+                  is set false.'
+                enum:
+                - record
+                - batch
+                type: string
               stickyTags:
                 description: Sticky tags will match only one record from an event
                   stream. The same tag will be treated the same way. will make no
diff --git a/config/crd/bases/fluentd.fluent.io_fluentdconfigs.yaml b/config/crd/bases/fluentd.fluent.io_fluentdconfigs.yaml
index a8f29eba6..2610089b4 100644
--- a/config/crd/bases/fluentd.fluent.io_fluentdconfigs.yaml
+++ b/config/crd/bases/fluentd.fluent.io_fluentdconfigs.yaml
@@ -38,6 +38,94 @@ spec:
           spec:
             description: FluentdConfigSpec defines the desired state of FluentdConfig
             properties:
+              clusterFilterSelector:
+                description: Select clusterfilter plugins
+                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
+              clusterOutputSelector:
+                description: Select clusteroutput plugins
+                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
               emit_mode:
                 description: 'Emit mode. If batch, the plugin will emit events per
                   labels matched. Enum: record, batch. will make no effect if EnableFilterKubernetes
@@ -47,7 +135,7 @@ spec:
                 - batch
                 type: string
               filterSelector:
-                description: Select filter plugins
+                description: Select namespaced filter plugins
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
@@ -91,7 +179,7 @@ spec:
                     type: object
                 type: object
               outputSelector:
-                description: Select output plugins
+                description: Select namespaced output plugins
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
diff --git a/controllers/fluentdconfig_controller.go b/controllers/fluentdconfig_controller.go
index c22ed4c00..d6e78789b 100644
--- a/controllers/fluentdconfig_controller.go
+++ b/controllers/fluentdconfig_controller.go
@@ -246,7 +246,7 @@ func (r *FluentdConfigReconciler) ClusterCfgsForFluentd(
 		}
 
 		// list all cluster CRs
-		clusterfilters, clusteroutputs, err := r.ListClusterLevelResources(ctx, cfg.GetCfgId(), &cfg.Spec.FilterSelector, &cfg.Spec.OutputSelector)
+		clusterfilters, clusteroutputs, err := r.ListClusterLevelResources(ctx, cfg.GetCfgId(), cfg.Spec.ClusterFilterSelector, cfg.Spec.ClusterOutputSelector)
 		if err != nil {
 			return err
 		}
@@ -298,13 +298,13 @@ func (r *FluentdConfigReconciler) CfgsForFluentd(ctx context.Context, fdSelector
 		}
 
 		// list all cluster CRs
-		clusterfilters, clusteroutputs, err := r.ListClusterLevelResources(ctx, cfg.GetCfgId(), &cfg.Spec.FilterSelector, &cfg.Spec.OutputSelector)
+		clusterfilters, clusteroutputs, err := r.ListClusterLevelResources(ctx, cfg.GetCfgId(), cfg.Spec.ClusterFilterSelector, cfg.Spec.ClusterOutputSelector)
 		if err != nil {
 			return err
 		}
 
 		// 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.GetCfgId(), cfg.Spec.FilterSelector, cfg.Spec.OutputSelector)
 		if err != nil {
 			return err
 		}
@@ -350,24 +350,27 @@ 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
-	selector, err := metav1.LabelSelectorAsSelector(filterSelector)
-	if err != nil {
-		return nil, nil, err
-	}
-	if err = r.List(ctx, &clusterfilters, client.MatchingLabelsSelector{Selector: selector}); err != nil {
-		return nil, nil, err
+	if filterSelector != nil {
+		selector, err := metav1.LabelSelectorAsSelector(filterSelector)
+		if err != nil {
+			return nil, nil, err
+		}
+		if err = r.List(ctx, &clusterfilters, client.MatchingLabelsSelector{Selector: selector}); err != nil {
+			return nil, nil, err
+		}
 	}
 
 	// List all outputs matching the label selector.
 	var clusteroutputs fluentdv1alpha1.ClusterOutputList
-	selector, err = metav1.LabelSelectorAsSelector(outputSelector)
-	if err != nil {
-		return nil, nil, err
-	}
-	if err = r.List(ctx, &clusteroutputs, client.MatchingLabelsSelector{Selector: selector}); err != nil {
-		return nil, nil, err
+	if outputSelector != nil {
+		selector, err := metav1.LabelSelectorAsSelector(outputSelector)
+		if err != nil {
+			return nil, nil, err
+		}
+		if err = r.List(ctx, &clusteroutputs, client.MatchingLabelsSelector{Selector: selector}); err != nil {
+			return nil, nil, err
+		}
 	}
-
 	return clusterfilters.Items, clusteroutputs.Items, nil
 }
 
@@ -375,22 +378,26 @@ func (r *FluentdConfigReconciler) ListNamespacedLevelResources(ctx context.Conte
 	filterSelector, outputSelector *metav1.LabelSelector) ([]fluentdv1alpha1.Filter, []fluentdv1alpha1.Output, error) {
 	// List and patch the related cluster CRs
 	var filters fluentdv1alpha1.FilterList
-	selector, err := metav1.LabelSelectorAsSelector(filterSelector)
-	if err != nil {
-		return nil, nil, err
-	}
-	if err = r.List(ctx, &filters, client.InNamespace(namespace), client.MatchingLabelsSelector{Selector: selector}); err != nil {
-		return nil, nil, err
+	if filterSelector != nil {
+		selector, err := metav1.LabelSelectorAsSelector(filterSelector)
+		if err != nil {
+			return nil, nil, err
+		}
+		if err = r.List(ctx, &filters, client.InNamespace(namespace), client.MatchingLabelsSelector{Selector: selector}); err != nil {
+			return nil, nil, err
+		}
 	}
 
 	// List all outputs matching the label selector.
 	var outputs fluentdv1alpha1.OutputList
-	selector, err = metav1.LabelSelectorAsSelector(outputSelector)
-	if err != nil {
-		return nil, nil, err
-	}
-	if err = r.List(ctx, &outputs, client.InNamespace(namespace), client.MatchingLabelsSelector{Selector: selector}); err != nil {
-		return nil, nil, err
+	if outputSelector != nil {
+		selector, err := metav1.LabelSelectorAsSelector(outputSelector)
+		if err != nil {
+			return nil, nil, err
+		}
+		if err = r.List(ctx, &outputs, client.InNamespace(namespace), client.MatchingLabelsSelector{Selector: selector}); err != nil {
+			return nil, nil, err
+		}
 	}
 
 	return filters.Items, outputs.Items, nil
diff --git a/manifests/forward/fluentd-cluster-cfg-output-buffer-example.yaml b/manifests/forward/fluentd-cluster-cfg-output-buffer-example.yaml
index 78b293d93..c5921a2d2 100644
--- a/manifests/forward/fluentd-cluster-cfg-output-buffer-example.yaml
+++ b/manifests/forward/fluentd-cluster-cfg-output-buffer-example.yaml
@@ -1,7 +1,7 @@
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: Fluentd
 metadata:
-  name: fluentd-forward
+  name: fluentd
   namespace: kubesphere-logging-system
   labels:
     app.kubernetes.io/name: fluentd
@@ -27,10 +27,10 @@ spec:
   watchedNamespaces: 
     - kube-system
     - kubesphere-monitoring-system
-  filterSelector:
+  clusterFilterSelector:
     matchLabels:
       filter.fluentd.fluent.io/enabled: "true"
-  outputSelector:
+  clusterOutputSelector:
     matchLabels:
       output.fluentd.fluent.io/enabled: "true"
 
diff --git a/manifests/forward/fluentd-cluster-cfg-output-es.yaml b/manifests/forward/fluentd-cluster-cfg-output-es.yaml
index d1aec74ba..3fd54e928 100644
--- a/manifests/forward/fluentd-cluster-cfg-output-es.yaml
+++ b/manifests/forward/fluentd-cluster-cfg-output-es.yaml
@@ -1,7 +1,7 @@
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: Fluentd
 metadata:
-  name: fluentd-forward
+  name: fluentd
   namespace: kubesphere-logging-system
   labels:
     app.kubernetes.io/name: fluentd
@@ -27,7 +27,7 @@ spec:
   watchedNamespaces: 
     - kube-system
     - kubesphere-monitoring-system
-  outputSelector:
+  clusterOutputSelector:
     matchLabels:
       output.fluentd.fluent.io/enabled: "true"
 
diff --git a/manifests/forward/fluentd-cluster-cfg-output-kafka.yaml b/manifests/forward/fluentd-cluster-cfg-output-kafka.yaml
index 074f9e2ac..1f3083da5 100644
--- a/manifests/forward/fluentd-cluster-cfg-output-kafka.yaml
+++ b/manifests/forward/fluentd-cluster-cfg-output-kafka.yaml
@@ -1,7 +1,7 @@
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: Fluentd
 metadata:
-  name: fluentd-forward
+  name: fluentd
   namespace: kubesphere-logging-system
   labels:
     app.kubernetes.io/name: fluentd
@@ -27,10 +27,10 @@ spec:
   watchedNamespaces: 
     - kube-system
     - kubesphere-monitoring-system
-  filterSelector:
+  clusterFilterSelector:
     matchLabels:
       filter.fluentd.fluent.io/enabled: "true"
-  outputSelector:
+  clusterOutputSelector:
     matchLabels:
       output.fluentd.fluent.io/enabled: "true"
 
diff --git a/manifests/forward/fluentd-mixed-cfgs-multi-tenant-output.yaml b/manifests/forward/fluentd-mixed-cfgs-multi-tenant-output.yaml
index 8bd48e1bf..8278fca26 100644
--- a/manifests/forward/fluentd-mixed-cfgs-multi-tenant-output.yaml
+++ b/manifests/forward/fluentd-mixed-cfgs-multi-tenant-output.yaml
@@ -1,7 +1,7 @@
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: Fluentd
 metadata:
-  name: fluentd-forward
+  name: fluentd
   namespace: kubesphere-logging-system
   labels:
     app.kubernetes.io/name: fluentd
@@ -14,35 +14,34 @@ spec:
   image: kubesphere/fluentd:v1.14.4
   fluentdCfgSelector: 
     matchLabels:
-      fluentd.fluent.io/enabled: "true"
+      config.fluentd.fluent.io/enabled: "true"
    
 ---
 apiVersion: fluentd.fluent.io/v1alpha1
-kind: ClusterFluentdConfig
+kind: FluentdConfig
 metadata:
-  name: fluentd-config
+  name: fluentd-config-user1
+  namespace: kubesphere-logging-system
   labels:
-    fluentd.fluent.io/enabled: "true"
+    config.fluentd.fluent.io/enabled: "true"
 spec:
-  watchedNamespaces: 
-    - kube-system
-    - kubesphere-monitoring-system
   outputSelector:
     matchLabels:
-      global: "true"
+      user: user1
 
 ---
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: FluentdConfig
 metadata:
-  name: fluentd-config
-  namespace: kubesphere-logging-system
+  name: fluentd-config-user2
+  namespace: kube-system
   labels:
-    fluentd.fluent.io/enabled: "true"
+    config.fluentd.fluent.io/enabled: "true"
 spec:
-  outputSelector:
+  clusterOutputSelector:
     matchLabels:
-      user: user1
+      global: "true"
+
 ---
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: Output
@@ -58,6 +57,7 @@ spec:
         port: 9200
         logstashFormat: true
         logstashPrefix: ks-logstash-log-user1
+
 ---
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: ClusterOutput
@@ -65,7 +65,6 @@ metadata:
   name: fluentd-output-es
   labels:
     global: "true"
-    user: user1
 spec: 
   outputs: 
     - elasticsearch:
diff --git a/manifests/forward/fluentd-mixed-cfgs-output-es.yaml b/manifests/forward/fluentd-mixed-cfgs-output-es.yaml
index dd97d9b36..6d0ce5632 100644
--- a/manifests/forward/fluentd-mixed-cfgs-output-es.yaml
+++ b/manifests/forward/fluentd-mixed-cfgs-output-es.yaml
@@ -1,7 +1,7 @@
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: Fluentd
 metadata:
-  name: fluentd-forward
+  name: fluentd
   namespace: kubesphere-logging-system
   labels:
     app.kubernetes.io/name: fluentd
@@ -27,7 +27,7 @@ spec:
   watchedNamespaces: 
     - kube-system
     - kubesphere-monitoring-system
-  outputSelector:
+  clusterOutputSelector:
     matchLabels:
       output.fluentd.fluent.io/enabled: "true"
 
@@ -40,7 +40,7 @@ metadata:
   labels:
     config.fluentd.fluent.io/enabled: "true"
 spec:
-  outputSelector:
+  clusterOutputSelector:
     matchLabels:
       output.fluentd.fluent.io/enabled: "true"
 
diff --git a/manifests/forward/fluentd-namespaced-cfg-output-es.yaml b/manifests/forward/fluentd-namespaced-cfg-output-es.yaml
index 814a866bc..dceb9462e 100644
--- a/manifests/forward/fluentd-namespaced-cfg-output-es.yaml
+++ b/manifests/forward/fluentd-namespaced-cfg-output-es.yaml
@@ -1,7 +1,7 @@
 apiVersion: fluentd.fluent.io/v1alpha1
 kind: Fluentd
 metadata:
-  name: fluentd-forward
+  name: fluentd
   namespace: kubesphere-logging-system
   labels:
     app.kubernetes.io/name: fluentd
diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
index 2b909d94c..dff251d58 100644
--- a/manifests/setup/fluent-operator-crd.yaml
+++ b/manifests/setup/fluent-operator-crd.yaml
@@ -452,15 +452,7 @@ spec:
           spec:
             description: ClusterFluentdConfigSpec defines the desired state of ClusterFluentdConfig
             properties:
-              emit_mode:
-                description: 'Emit mode. If batch, the plugin will emit events per
-                  labels matched. Enum: record, batch. will make no effect if EnableFilterKubernetes
-                  is set false.'
-                enum:
-                - record
-                - batch
-                type: string
-              filterSelector:
+              clusterFilterSelector:
                 description: Select filter plugins
                 properties:
                   matchExpressions:
@@ -504,7 +496,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
-              outputSelector:
+              clusterOutputSelector:
                 description: Select output plugins
                 properties:
                   matchExpressions:
@@ -548,6 +540,14 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+              emit_mode:
+                description: 'Emit mode. If batch, the plugin will emit events per
+                  labels matched. Enum: record, batch. will make no effect if EnableFilterKubernetes
+                  is set false.'
+                enum:
+                - record
+                - batch
+                type: string
               stickyTags:
                 description: Sticky tags will match only one record from an event
                   stream. The same tag will be treated the same way. will make no
@@ -6590,6 +6590,94 @@ spec:
           spec:
             description: FluentdConfigSpec defines the desired state of FluentdConfig
             properties:
+              clusterFilterSelector:
+                description: Select clusterfilter plugins
+                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
+              clusterOutputSelector:
+                description: Select clusteroutput plugins
+                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
               emit_mode:
                 description: 'Emit mode. If batch, the plugin will emit events per
                   labels matched. Enum: record, batch. will make no effect if EnableFilterKubernetes
@@ -6599,7 +6687,7 @@ spec:
                 - batch
                 type: string
               filterSelector:
-                description: Select filter plugins
+                description: Select namespaced filter plugins
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
@@ -6643,7 +6731,7 @@ spec:
                     type: object
                 type: object
               outputSelector:
-                description: Select output plugins
+                description: Select namespaced output plugins
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
index a38e4ec6f..a68b6605b 100644
--- a/manifests/setup/setup.yaml
+++ b/manifests/setup/setup.yaml
@@ -452,15 +452,7 @@ spec:
           spec:
             description: ClusterFluentdConfigSpec defines the desired state of ClusterFluentdConfig
             properties:
-              emit_mode:
-                description: 'Emit mode. If batch, the plugin will emit events per
-                  labels matched. Enum: record, batch. will make no effect if EnableFilterKubernetes
-                  is set false.'
-                enum:
-                - record
-                - batch
-                type: string
-              filterSelector:
+              clusterFilterSelector:
                 description: Select filter plugins
                 properties:
                   matchExpressions:
@@ -504,7 +496,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
-              outputSelector:
+              clusterOutputSelector:
                 description: Select output plugins
                 properties:
                   matchExpressions:
@@ -548,6 +540,14 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+              emit_mode:
+                description: 'Emit mode. If batch, the plugin will emit events per
+                  labels matched. Enum: record, batch. will make no effect if EnableFilterKubernetes
+                  is set false.'
+                enum:
+                - record
+                - batch
+                type: string
               stickyTags:
                 description: Sticky tags will match only one record from an event
                   stream. The same tag will be treated the same way. will make no
@@ -6590,6 +6590,94 @@ spec:
           spec:
             description: FluentdConfigSpec defines the desired state of FluentdConfig
             properties:
+              clusterFilterSelector:
+                description: Select clusterfilter plugins
+                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
+              clusterOutputSelector:
+                description: Select clusteroutput plugins
+                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
               emit_mode:
                 description: 'Emit mode. If batch, the plugin will emit events per
                   labels matched. Enum: record, batch. will make no effect if EnableFilterKubernetes
@@ -6599,7 +6687,7 @@ spec:
                 - batch
                 type: string
               filterSelector:
-                description: Select filter plugins
+                description: Select namespaced filter plugins
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.
@@ -6643,7 +6731,7 @@ spec:
                     type: object
                 type: object
               outputSelector:
-                description: Select output plugins
+                description: Select namespaced output plugins
                 properties:
                   matchExpressions:
                     description: matchExpressions is a list of label selector requirements.