Feat: Add DefaultFilterSelector and DefaultOutputSelector to fluentd #804
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jakob3xD
force-pushed
the
jh-default-route
branch
2 times, most recently
from
ffaa3fc
to
ba73087
Compare
Jakob3xD
changed the title
wenchajun
reviewed
Jun 25, 2023
| @@ -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"` | |||
There was a problem hiding this comment.
What is the processing logic for this? I don't see anything in the code that handles that field.
There was a problem hiding this comment.
This is handled in the controllers/fluentdconfig_controller.go file starting from line 140.
There was a problem hiding this comment.
This is handled in the controllers/fluentdconfig_controller.go file starting from line 140.
@Jakob3xD I cannot see how DefaultFilterSelector/DefaultOutputSelector and default_route is handled in controllers/fluentdconfig_controller.go
benjaminhuo
reviewed
Jun 27, 2023
Jakob3xD
commented
Jun 27, 2023
Comment on lines
+140
to
+162
| 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") | ||
| } | ||
|
|
There was a problem hiding this comment.
@benjaminhuo @wenchajun this code block handles the the newly defined default selectors.
There was a problem hiding this comment.
Got you. Sorry, my bad it's folded by default.
Thanks anyway for this great enhancement! @Jakob3xD
Signed-off-by: Jakob Hahn <[email protected]>
Signed-off-by: Jakob Hahn <[email protected]>
Signed-off-by: Jakob Hahn <[email protected]>
Signed-off-by: Jakob Hahn <[email protected]>
… for fluentd Signed-off-by: Jakob Hahn <[email protected]>
Signed-off-by: Jakob Hahn <[email protected]>
Jakob3xD
force-pushed
the
jh-default-route
branch
from
9ddfe1b
to
b70a222
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #800
Does this PR introduced a user-facing change?
Additional documentation, usage docs, etc.: