Merge pull request #1646 from kube-logging/aggregator-config-fix

pepov · web-flow · commit ccb3f5830422 · 2024-01-19T16:38:06.000+01:00
fix: add namespace filter when listing aggregator configs (#1644)
diff --git a/pkg/resources/model/repository.go b/pkg/resources/model/repository.go
@@ -361,7 +361,7 @@ func (r LoggingResourceRepository) handleMultipleDetachedFluentdObjects(list []v
 
 func (r LoggingResourceRepository) FluentdConfigFor(ctx context.Context, logging v1beta1.Logging) (*v1beta1.FluentdConfig, []v1beta1.FluentdConfig, error) {
 	var list v1beta1.FluentdConfigList
-	if err := r.Client.List(ctx, &list); err != nil {
+	if err := r.Client.List(ctx, &list, client.InNamespace(logging.Spec.ControlNamespace)); err != nil {
 		return nil, []v1beta1.FluentdConfig{}, err
 	}
 
@@ -401,7 +401,7 @@ func (r LoggingResourceRepository) handleMultipleDetachedSyslogNGObjects(list []
 
 func (r LoggingResourceRepository) SyslogNGConfigFor(ctx context.Context, logging v1beta1.Logging) (*v1beta1.SyslogNGConfig, []v1beta1.SyslogNGConfig, error) {
 	var list v1beta1.SyslogNGConfigList
-	if err := r.Client.List(ctx, &list); err != nil {
+	if err := r.Client.List(ctx, &list, client.InNamespace(logging.Spec.ControlNamespace)); err != nil {
 		return nil, []v1beta1.SyslogNGConfig{}, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ func (r LoggingResourceRepository) handleMultipleDetachedFluentdObjects(list []v`
`361`	`361`
`362`	`362`	`func (r LoggingResourceRepository) FluentdConfigFor(ctx context.Context, logging v1beta1.Logging) (*v1beta1.FluentdConfig, []v1beta1.FluentdConfig, error) {`
`363`	`363`	`var list v1beta1.FluentdConfigList`
`364`		`- if err := r.Client.List(ctx, &list); err != nil {`
	`364`	`+ if err := r.Client.List(ctx, &list, client.InNamespace(logging.Spec.ControlNamespace)); err != nil {`
`365`	`365`	`return nil, []v1beta1.FluentdConfig{}, err`
`366`	`366`	`}`
`367`	`367`
`@@ -401,7 +401,7 @@ func (r LoggingResourceRepository) handleMultipleDetachedSyslogNGObjects(list []`
`401`	`401`
`402`	`402`	`func (r LoggingResourceRepository) SyslogNGConfigFor(ctx context.Context, logging v1beta1.Logging) (*v1beta1.SyslogNGConfig, []v1beta1.SyslogNGConfig, error) {`
`403`	`403`	`var list v1beta1.SyslogNGConfigList`
`404`		`- if err := r.Client.List(ctx, &list); err != nil {`
	`404`	`+ if err := r.Client.List(ctx, &list, client.InNamespace(logging.Spec.ControlNamespace)); err != nil {`
`405`	`405`	`return nil, []v1beta1.SyslogNGConfig{}, err`
`406`	`406`	`}`
`407`	`407`